@varlet/cli 1.23.4-alpha.0 → 1.23.4-alpha.4

package/lib/commands/gen.js

@@ -54,7 +54,7 @@ function syncVersion(name) {
     var pkg = JSON.parse((0, fs_extra_1.readFileSync)(file, 'utf-8'));
     var cliPkg = JSON.parse((0, fs_extra_1.readFileSync)(constant_1.CLI_PACKAGE_JSON, 'utf-8'));
     pkg.devDependencies['@varlet/cli'] = "^" + cliPkg.version;
-    pkg.files = ['es', 'umd', 'highlight', 'types', 'README.md'];
+    pkg.files = ['es', 'lib', 'umd', 'highlight', 'types', 'README.md'];
     (0, fs_extra_1.writeFileSync)(file, JSON.stringify(pkg, null, 2));
 }
 function gen(name) {

package/lib/compiler/compileModule.js

@@ -142,7 +142,7 @@ function compileModule(modules) {
                     return [4 /*yield*/, (0, fs_extra_1.copy)(constant_1.SRC_DIR, dest)];
                 case 3:
                     _a.sent();
-                    return [4 /*yield*/, (0, fs_extra_1.readdir)(constant_1.ES_DIR)];
+                    return [4 /*yield*/, (0, fs_extra_1.readdir)(dest)];
                 case 4:
                     moduleDir = _a.sent();
                     return [4 /*yield*/, Promise.all(moduleDir.map(function (filename) {

package/lib/compiler/compileScript.d.ts

@@ -2,10 +2,15 @@ export declare const IMPORT_VUE_PATH_RE: RegExp;
 export declare const IMPORT_TS_PATH_RE: RegExp;
 export declare const IMPORT_JSX_PATH_RE: RegExp;
 export declare const IMPORT_TSX_PATH_RE: RegExp;
+export declare const REQUIRE_VUE_PATH_RE: RegExp;
+export declare const REQUIRE_TS_PATH_RE: RegExp;
+export declare const REQUIRE_JSX_PATH_RE: RegExp;
+export declare const REQUIRE_TSX_PATH_RE: RegExp;
 export declare const replaceVueExt: (script: string) => string;
 export declare const replaceTSExt: (script: string) => string;
 export declare const replaceJSXExt: (script: string) => string;
 export declare const replaceTSXExt: (script: string) => string;
+export declare const moduleCompatible: (script: string) => string;
 export declare function compileScript(script: string, file: string): Promise<void>;
 export declare function compileScriptFile(file: string): Promise<void>;
 export declare function compileESEntry(dir: string, publicDirs: string[]): Promise<void>;

package/lib/compiler/compileScript.js

@@ -36,36 +36,63 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileCommonJSEntry = exports.compileESEntry = exports.compileScriptFile = exports.compileScript = exports.replaceTSXExt = exports.replaceJSXExt = exports.replaceTSExt = exports.replaceVueExt = exports.IMPORT_TSX_PATH_RE = exports.IMPORT_JSX_PATH_RE = exports.IMPORT_TS_PATH_RE = exports.IMPORT_VUE_PATH_RE = void 0;
+exports.compileCommonJSEntry = exports.compileESEntry = exports.compileScriptFile = exports.compileScript = exports.moduleCompatible = exports.replaceTSXExt = exports.replaceJSXExt = exports.replaceTSExt = exports.replaceVueExt = exports.REQUIRE_TSX_PATH_RE = exports.REQUIRE_JSX_PATH_RE = exports.REQUIRE_TS_PATH_RE = exports.REQUIRE_VUE_PATH_RE = exports.IMPORT_TSX_PATH_RE = exports.IMPORT_JSX_PATH_RE = exports.IMPORT_TS_PATH_RE = exports.IMPORT_VUE_PATH_RE = void 0;
 var core_1 = require("@babel/core");
 var fsUtils_1 = require("../shared/fsUtils");
 var fs_extra_1 = require("fs-extra");
 var compileStyle_1 = require("./compileStyle");
 var path_1 = require("path");
+var lodash_1 = require("lodash");
+var varlet_config_1 = require("../config/varlet.config");
 exports.IMPORT_VUE_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.vue(\s*['"`]);?(?!\s*['"`])/g;
 exports.IMPORT_TS_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]);?(?!\s*['"`])/g;
 exports.IMPORT_JSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]);?(?!\s*['"`])/g;
 exports.IMPORT_TSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]);?(?!\s*['"`])/g;
+exports.REQUIRE_VUE_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.vue(\s*['"`]\))(?!\s*['"`])/g;
+exports.REQUIRE_TS_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]\))(?!\s*['"`])/g;
+exports.REQUIRE_JSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]\))(?!\s*['"`])/g;
+exports.REQUIRE_TSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]\))(?!\s*['"`])/g;
 var scriptReplacer = function (_, p1, p2) { return p1 + ".js" + p2; };
-var replaceVueExt = function (script) { return script.replace(exports.IMPORT_VUE_PATH_RE, scriptReplacer); };
+var replaceVueExt = function (script) {
+    return script.replace(exports.IMPORT_VUE_PATH_RE, scriptReplacer).replace(exports.REQUIRE_VUE_PATH_RE, scriptReplacer);
+};
 exports.replaceVueExt = replaceVueExt;
-var replaceTSExt = function (script) { return script.replace(exports.IMPORT_TS_PATH_RE, scriptReplacer); };
+var replaceTSExt = function (script) {
+    return script.replace(exports.IMPORT_TS_PATH_RE, scriptReplacer).replace(exports.REQUIRE_TS_PATH_RE, scriptReplacer);
+};
 exports.replaceTSExt = replaceTSExt;
-var replaceJSXExt = function (script) { return script.replace(exports.IMPORT_JSX_PATH_RE, scriptReplacer); };
+var replaceJSXExt = function (script) {
+    return script.replace(exports.IMPORT_JSX_PATH_RE, scriptReplacer).replace(exports.REQUIRE_JSX_PATH_RE, scriptReplacer);
+};
 exports.replaceJSXExt = replaceJSXExt;
-var replaceTSXExt = function (script) { return script.replace(exports.IMPORT_TSX_PATH_RE, scriptReplacer); };
+var replaceTSXExt = function (script) {
+    return script.replace(exports.IMPORT_TSX_PATH_RE, scriptReplacer).replace(exports.REQUIRE_TSX_PATH_RE, scriptReplacer);
+};
 exports.replaceTSXExt = replaceTSXExt;
+var moduleCompatible = function (script) {
+    var moduleCompatible = (0, lodash_1.get)((0, varlet_config_1.getVarletConfig)(), 'moduleCompatible', {});
+    Object.keys(moduleCompatible).forEach(function (esm) {
+        var commonjs = moduleCompatible[esm];
+        script = script.replace(esm, commonjs);
+    });
+    return script;
+};
+exports.moduleCompatible = moduleCompatible;
 function compileScript(script, file) {
     return __awaiter(this, void 0, void 0, function () {
-        var code, modules;
+        var modules, code;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, core_1.transformAsync)(script, {
-                        filename: file,
-                    })];
+                case 0:
+                    modules = process.env.BABEL_MODULE;
+                    if (modules === 'commonjs') {
+                        script = (0, exports.moduleCompatible)(script);
+                    }
+                    return [4 /*yield*/, (0, core_1.transformAsync)(script, {
+                            filename: file,
+                        })];
                 case 1:
                     code = (_a.sent()).code;
-                    modules = process.env.BABEL_MODULE;
                     code = (0, compileStyle_1.extractStyleDependencies)(file, code, modules === 'commonjs' ? compileStyle_1.REQUIRE_CSS_RE : compileStyle_1.IMPORT_CSS_RE, 'css', false);
                     code = (0, compileStyle_1.extractStyleDependencies)(file, code, modules === 'commonjs' ? compileStyle_1.REQUIRE_LESS_RE : compileStyle_1.IMPORT_LESS_RE, 'less', false);
                     code = (0, exports.replaceVueExt)(code);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.23.4-alpha.0+4a424d4c",
+  "version": "1.23.4-alpha.4+0b1d95fc",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -31,7 +31,7 @@
     "dev": "tsc --watch",
     "build": "tsc"
   },
-  "gitHead": "4a424d4c066f7de69cbf561a5bc9279862739637",
+  "gitHead": "0b1d95fc740a225240ee3f28e06015f4538b2304",
   "dependencies": {
     "@babel/core": "^7.14.8",
     "@babel/preset-env": "^7.14.8",