diff --git a/packages/chameleon-loader/src/interface-check/mvvm.js b/packages/chameleon-loader/src/interface-check/mvvm.js deleted file mode 100644 index 130ad14203b23f50fe04cb6cbe1f207bc9f82b9f..0000000000000000000000000000000000000000 --- a/packages/chameleon-loader/src/interface-check/mvvm.js +++ /dev/null @@ -1,3 +0,0 @@ -const getInterfaceCode = require('mvvm-interface-parser/lib/getInterfaceCode.js'); - -console.log(typeof getInterfaceCode) \ No newline at end of file diff --git a/packages/chameleon-tool/configs/utils.js b/packages/chameleon-tool/configs/utils.js index 4cd6ae7c9765f1f893453407b0b634d9a80c430d..d58ad4e5598ff8e85562504fbf6c5d40b296e3e9 100644 --- a/packages/chameleon-tool/configs/utils.js +++ b/packages/chameleon-tool/configs/utils.js @@ -211,7 +211,6 @@ exports.updateEntry = function (updateEntryConfig) { source = parts.template[0].content; options = analyzeTemplate(source, options) } - } }); let usedBuildInTagMap = options.usedBuildInTagMap; diff --git a/packages/mvvm-babel-generator/lib/buffer.js b/packages/mvvm-babel-generator/lib/buffer.js index 8a800148c201a5f2ca775a72daf2e989f488468d..3e90905e0ac4c8a106f3e7c171af3645b848b1ae 100644 --- a/packages/mvvm-babel-generator/lib/buffer.js +++ b/packages/mvvm-babel-generator/lib/buffer.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _trimRight() { - const data = _interopRequireDefault(require("trim-right")); + const data = _interopRequireDefault(require("../node_modules/trim-right")); _trimRight = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/classes.js b/packages/mvvm-babel-generator/lib/generators/classes.js index 7f54632ad012e12a9318a610c0dd706ce1afd8de..281e30b7d6a0d5e2116ed53994b9c0372ae9c7c8 100644 --- a/packages/mvvm-babel-generator/lib/generators/classes.js +++ b/packages/mvvm-babel-generator/lib/generators/classes.js @@ -12,7 +12,7 @@ exports.ClassPrivateMethod = ClassPrivateMethod; exports._classMethodHead = _classMethodHead; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/expressions.js b/packages/mvvm-babel-generator/lib/generators/expressions.js index 45efa98efa1632b5da0ad5df4ea9fd0a653ab57c..3f81bdb74c5de3b0fe820cccce1b8a6f8a24f841 100644 --- a/packages/mvvm-babel-generator/lib/generators/expressions.js +++ b/packages/mvvm-babel-generator/lib/generators/expressions.js @@ -28,7 +28,7 @@ exports.PrivateName = PrivateName; exports.AwaitExpression = exports.YieldExpression = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/flow.js b/packages/mvvm-babel-generator/lib/generators/flow.js index 0b24d2ccad1ee6a4408096f7376b50696d6e55b4..aca68e66c0ad6e41324057f8777163fa02fb454f 100644 --- a/packages/mvvm-babel-generator/lib/generators/flow.js +++ b/packages/mvvm-babel-generator/lib/generators/flow.js @@ -67,7 +67,7 @@ Object.defineProperty(exports, "StringLiteralTypeAnnotation", { }); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/methods.js b/packages/mvvm-babel-generator/lib/generators/methods.js index 39965bacc19f460c0037901c33b944cd9086fbb8..b70d07a6585b2fb527228a6d183cef67892baa51 100644 --- a/packages/mvvm-babel-generator/lib/generators/methods.js +++ b/packages/mvvm-babel-generator/lib/generators/methods.js @@ -13,7 +13,7 @@ exports.FunctionDeclaration = exports.FunctionExpression = FunctionExpression; exports.ArrowFunctionExpression = ArrowFunctionExpression; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/modules.js b/packages/mvvm-babel-generator/lib/generators/modules.js index af87bd586e68f0a37607fdb42911e86822ec55f3..68a56d971e3b5e58a77e405369ed8ddcb46c7927 100644 --- a/packages/mvvm-babel-generator/lib/generators/modules.js +++ b/packages/mvvm-babel-generator/lib/generators/modules.js @@ -15,7 +15,7 @@ exports.ImportDeclaration = ImportDeclaration; exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/statements.js b/packages/mvvm-babel-generator/lib/generators/statements.js index c74363de5944590e19b258f943adeea9cd41bca9..b14900c5d48065a0d3361f09a67524315efe21dd 100644 --- a/packages/mvvm-babel-generator/lib/generators/statements.js +++ b/packages/mvvm-babel-generator/lib/generators/statements.js @@ -19,7 +19,7 @@ exports.VariableDeclarator = VariableDeclarator; exports.ThrowStatement = exports.BreakStatement = exports.ReturnStatement = exports.ContinueStatement = exports.ForOfStatement = exports.ForInStatement = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/types.js b/packages/mvvm-babel-generator/lib/generators/types.js index 04a8a2fed8979a7460462ce4c8e8b102a9537cb4..5bce8a8bc92bf6a3090769a292ac6000746826a7 100644 --- a/packages/mvvm-babel-generator/lib/generators/types.js +++ b/packages/mvvm-babel-generator/lib/generators/types.js @@ -20,7 +20,7 @@ exports.PipelineBareFunction = PipelineBareFunction; exports.PipelinePrimaryTopicReference = PipelinePrimaryTopicReference; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; @@ -30,7 +30,7 @@ function t() { } function _jsesc() { - const data = _interopRequireDefault(require("jsesc")); + const data = _interopRequireDefault(require("../../node_modules/jsesc/jsesc")); _jsesc = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/index.js b/packages/mvvm-babel-generator/lib/node/index.js index bef46f0eede721cc2a078723f64232d71365f639..a99f090cdd77eec9f876705e7a95d41f2504245e 100644 --- a/packages/mvvm-babel-generator/lib/node/index.js +++ b/packages/mvvm-babel-generator/lib/node/index.js @@ -13,7 +13,7 @@ var whitespace = _interopRequireWildcard(require("./whitespace")); var parens = _interopRequireWildcard(require("./parentheses")); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/parentheses.js b/packages/mvvm-babel-generator/lib/node/parentheses.js index 3f98dc18f8e3aba76e3dc5f9c02829403bc1c093..06ad580757130179c575574d9a4be8ecfddd8b42 100644 --- a/packages/mvvm-babel-generator/lib/node/parentheses.js +++ b/packages/mvvm-babel-generator/lib/node/parentheses.js @@ -26,7 +26,7 @@ exports.AssignmentExpression = AssignmentExpression; exports.NewExpression = NewExpression; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/whitespace.js b/packages/mvvm-babel-generator/lib/node/whitespace.js index 061218601cbbed67ac527bf7e58023c27e02202b..23efa9cdb64444140cb88b35e04f61f2c8e8d2ba 100644 --- a/packages/mvvm-babel-generator/lib/node/whitespace.js +++ b/packages/mvvm-babel-generator/lib/node/whitespace.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.list = exports.nodes = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/printer.js b/packages/mvvm-babel-generator/lib/printer.js index f32a4a99f47d97408559b76b85123be2471aa53d..78ef3cd6a4b79b4052ce84ab064bb4ddd62799e1 100644 --- a/packages/mvvm-babel-generator/lib/printer.js +++ b/packages/mvvm-babel-generator/lib/printer.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _isInteger() { - const data = _interopRequireDefault(require("lodash/isInteger")); + const data = _interopRequireDefault(require("../node_modules/lodash/isInteger")); _isInteger = function () { return data; @@ -16,7 +16,7 @@ function _isInteger() { } function _repeat() { - const data = _interopRequireDefault(require("lodash/repeat")); + const data = _interopRequireDefault(require("../node_modules/lodash/repeat")); _repeat = function () { return data; @@ -30,7 +30,7 @@ var _buffer = _interopRequireDefault(require("./buffer")); var n = _interopRequireWildcard(require("./node")); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/source-map.js b/packages/mvvm-babel-generator/lib/source-map.js index 12b70308db4b730cc8c1da4dc93f818c0ab915a0..5fc10e0beff2fe09429bf0457a045c098d141651 100644 --- a/packages/mvvm-babel-generator/lib/source-map.js +++ b/packages/mvvm-babel-generator/lib/source-map.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _sourceMap() { - const data = _interopRequireDefault(require("source-map")); + const data = _interopRequireDefault(require("../node_modules/source-map/source-map")); _sourceMap = function () { return data; diff --git a/packages/mvvm-interface-parser/README.md b/packages/mvvm-interface-parser/README.md index 6148d84dac0c6f669aae0030f7107a4a073b1ceb..5d731596822b8ae9b4a3eb49f4e4792be4341d49 100644 --- a/packages/mvvm-interface-parser/README.md +++ b/packages/mvvm-interface-parser/README.md @@ -1 +1,2 @@ -#### mvvm协议标准中处理interface文件 \ No newline at end of file +#### 使用 +chameleon-loader和interface-loader中获取interface文件内容时使用 diff --git a/packages/mvvm-pack/compiler.js b/packages/mvvm-pack/compiler.js index 14aaad1d4a9c356479fb25c779d51bce7abf3727..e924474114e33e8e24aba6270c64e24949ee19c6 100644 --- a/packages/mvvm-pack/compiler.js +++ b/packages/mvvm-pack/compiler.js @@ -3,7 +3,7 @@ const path = require('path'); const Log = require('./log.js'); const EventEmitter = require('events'); const cmlUtils = require('chameleon-tool-utils'); -const parser = require('mvvm-babel-parser'); +const parser = require('../mvvm-babel-parser/lib'); class Compiler { constructor(webpackCompiler) { this.moduleRule = [ // 文件后缀对应module信息 diff --git a/packages/mvvm-template-parser/common/index.js b/packages/mvvm-template-parser/common/index.js index f4eb6d3a3d8a0ea23651901cf97652ee5c73a0ab..93109a86644d803772c37cb730f406d8bf5ec261 100644 --- a/packages/mvvm-template-parser/common/index.js +++ b/packages/mvvm-template-parser/common/index.js @@ -23,7 +23,7 @@ let source = `` let options = {lang: 'cml', diff --git a/packages/mvvm-template-parser/common/process-template.js b/packages/mvvm-template-parser/common/process-template.js index 89f4b28e778355a7c5a68c53a5c67c3e24ec28c1..8978ece5a952bfa000e2f53c17874ff897d945c8 100644 --- a/packages/mvvm-template-parser/common/process-template.js +++ b/packages/mvvm-template-parser/common/process-template.js @@ -1,7 +1,7 @@ const parser = require('mvvm-babel-parser'); const t = require('@babel/types'); const traverse = require('@babel/traverse')["default"]; -const generate = require('mvvm-babel-generator')["default"]; +const generate = require('mvvm-babel-generator/lib')["default"]; const _ = module.exports = {}; /* 将vue语法的模板转化为cml语法 diff --git a/packages/mvvm-template-parser/index.js b/packages/mvvm-template-parser/index.js index 2ffccea70b27175d6db2848298e127d8f77166b9..aaa8c65e91ccc4afa85106ce07e59370e3f9082c 100644 --- a/packages/mvvm-template-parser/index.js +++ b/packages/mvvm-template-parser/index.js @@ -1,8 +1,13 @@ -const standardParser = require('./lib/standardParser'); -const generator = require('@babel/generator'); +const {vueToCml} = require('./common/process-template.js'); +const parser = require('mvvm-babel-parser'); +const generator = require('mvvm-babel-generator/lib') + const types = require('@babel/types'); const traverse = require('@babel/traverse'); -exports.standardParser = standardParser; + + +exports.vueToCml = vueToCml; +exports.parser = parser; exports.generator = generator["default"]; exports.types = types; exports.traverse = traverse["default"]; diff --git a/packages/mvvm-template-parser/lib/standardParser.js b/packages/mvvm-template-parser/lib/standardParser.js deleted file mode 100644 index b4b5710fea3abf37198a3b545e9a5ebaa4f57c84..0000000000000000000000000000000000000000 --- a/packages/mvvm-template-parser/lib/standardParser.js +++ /dev/null @@ -1,12 +0,0 @@ -const parser = require('mvvm-babel-parser'); - -module.exports = function({source, lang = "cml"}) { - const ast = parser.parse(source, { - sourceType: 'module', - plugins: ['jsx'] - }); - return { - convert: ast, - output: source - } -}