@varlet/cli 1.23.3-alpha.1 → 1.23.4-alpha.16

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.23.3](https://github.com/haoziqaq/varlet/compare/v1.23.2...v1.23.3) (2021-11-20)
+
+
+### Bug Fixes
+
+* **cli/jest:** add watchAll mode ([84ebb4e](https://github.com/haoziqaq/varlet/commit/84ebb4efe823cb9d7f22995d429b82d8fc3e05c8))
+
+
+
+
+
 # [1.23.0](https://github.com/haoziqaq/varlet/compare/v1.22.10...v1.23.0) (2021-11-19)
 
 

package/README.en-US.md

@@ -55,6 +55,32 @@ The `varlet.config.js` in the project root directory is used to manage the speci
 | `analysis` | Document statistics related | _SiteAnalysis_ | `-` |
 | `pc` | PC-side document structure configuration | _SitePC_ | `-` |
 | `mobile` | Mobile document structure configuration | _SiteMobile_ | `-` |
+| `moduleCompatible` | Module compatible config | _Record<string, string>_ | `-` |
+
+#### Module Compatible
+
+Some external dependencies may need to be compatible with module syntax to achieve the purpose of compiling correctly to `commonjs` and `esmodule`. For example, the wording of `esmodule` of `dayjs` is
+
+```js
+import dayjs from 'dayjs/esm'
+```
+
+In order to build `commonjs`, the writing method is
+
+```js
+import * as dayjs from 'dayjs'
+```
+
+In the project, we embrace the first way of writing the `esmodule` module, and make the following configuration for adaptation
+
+```js
+// varlet.config.js
+module.exports = {
+  moduleCompatible: {
+    "import dayjs from 'dayjs/esm'\n": "import * as dayjs from 'dayjs'\n"
+  }
+}
+```
 
 #### SiteThemes
 
@@ -93,7 +119,7 @@ Code snippets are highlighted, based on [highlight.js](https://highlightjs.org/)
 
 | Parameter | Description | Type | Default |
 | ----- | -------------- | -------- | ---------- |
-| `style` | highlight的css地址 | _string_ | `-` |
+| `style` | highlight css link | _string_ | `-` |
 
 #### SiteAnalysis
 
@@ -101,7 +127,7 @@ Statistics related to buried points
 
 | Parameter | Description | Type | Default |
 | ----- | -------------- | -------- | ---------- |
-| `baidu` | 百度统计脚本地址 | _string_ | `-` |
+| `baidu` | Baidu statistics script address | _string_ | `-` |
 
 #### SitePC, SiteMobile
 

package/README.md

@@ -53,6 +53,32 @@ yarn dev
 | `analysis` | 文档统计相关 | _SiteAnalysis_ | `-` |
 | `pc` | pc端文档结构配置 | _SitePC_ | `-` |
 | `mobile` | mobile端文档结构配置 | _SiteMobile_ | `-` |
+| `moduleCompatible` | 模块兼容配置 | _Record<string, string>_ | `-` |
+
+#### 模块适配对象
+
+一些外部依赖可能需要进行模块语法的适配，以达到可以正确编译到`commonjs`和`esmodule`的目的，例如`dayjs`的`esmodule`写法是
+
+```js
+import dayjs from 'dayjs/esm'
+```
+
+而为了构建`commonjs`时的写法是
+
+```js
+import * as dayjs from 'dayjs'
+```
+
+在项目中我们拥抱`esmodule`模块使用第一种写法，并做如下配置进行适配
+
+```js
+// varlet.config.js
+module.exports = {
+  moduleCompatible: {
+    "import dayjs from 'dayjs/esm'\n": "import * as dayjs from 'dayjs'\n"
+  }
+}
+```
 
 #### SiteThemes
 

package/generators/sfc/.gitignore

@@ -7,6 +7,7 @@ node_modules
 .DS_Store
 
 site
+lib
 es
 umd
 coverage

package/generators/sfc/package.json

@@ -2,6 +2,7 @@
   "name": "basic-ui",
   "version": "0.0.0",
   "description": "A basic components library",
+  "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "types/index.d.ts",
   "vetur": {
@@ -64,6 +65,7 @@
   "eslintConfig": {
     "root": true,
     "ignorePatterns": [
+      "lib/**",
       "es/**",
       "umd/**",
       "site/**",
@@ -80,6 +82,7 @@
       "@varlet/stylelint-config"
     ],
     "ignoreFiles": [
+      "lib/**",
       "es/**",
       "umd/**",
       "site/**",

package/generators/tsx/.gitignore

@@ -7,6 +7,7 @@ node_modules
 .DS_Store
 
 site
+lib
 es
 umd
 coverage

package/generators/tsx/package.json

@@ -2,6 +2,7 @@
   "name": "basic-ui",
   "version": "0.0.0",
   "description": "A basic components library",
+  "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "types/index.d.ts",
   "vetur": {
@@ -64,6 +65,7 @@
   "eslintConfig": {
     "root": true,
     "ignorePatterns": [
+      "lib/**",
       "es/**",
       "umd/**",
       "site/**",
@@ -80,6 +82,7 @@
       "@varlet/stylelint-config"
     ],
     "ignoreFiles": [
+      "lib/**",
       "es/**",
       "umd/**",
       "site/**",

package/lib/commands/compile.d.ts

@@ -1,4 +1,4 @@
-export declare function removeDir(): Promise<[void, void, void]>;
+export declare function removeDir(): Promise<[void, void, void, void]>;
 export declare function runTask(taskName: string, task: () => any): Promise<void>;
 export declare function compile(cmd: {
     noUmd: boolean;

package/lib/commands/compile.js

@@ -48,7 +48,7 @@ var compileModule_1 = require("../compiler/compileModule");
 var compileTemplateHighlight_1 = require("../compiler/compileTemplateHighlight");
 var compileTypes_1 = require("../compiler/compileTypes");
 function removeDir() {
-    return Promise.all([(0, fs_extra_1.remove)(constant_1.ES_DIR), (0, fs_extra_1.remove)(constant_1.HL_DIR), (0, fs_extra_1.remove)(constant_1.UMD_DIR)]);
+    return Promise.all([(0, fs_extra_1.remove)(constant_1.ES_DIR), (0, fs_extra_1.remove)(constant_1.LIB_DIR), (0, fs_extra_1.remove)(constant_1.HL_DIR), (0, fs_extra_1.remove)(constant_1.UMD_DIR)]);
 }
 exports.removeDir = removeDir;
 function runTask(taskName, task) {
@@ -87,20 +87,22 @@ function compile(cmd) {
                     return [4 /*yield*/, removeDir()];
                 case 1:
                     _b.sent();
-                    return [4 /*yield*/, Promise.all([
-                            runTask('types', compileTypes_1.compileTypes),
-                            runTask('template highlight', compileTemplateHighlight_1.compileTemplateHighlight),
-                            runTask('module', compileModule_1.compileModule),
-                        ])];
+                    return [4 /*yield*/, Promise.all([runTask('types', compileTypes_1.compileTypes), runTask('template highlight', compileTemplateHighlight_1.compileTemplateHighlight)])];
                 case 2:
+                    _b.sent();
+                    return [4 /*yield*/, runTask('module', compileModule_1.compileModule)];
+                case 3:
+                    _b.sent();
+                    return [4 /*yield*/, runTask('commonjs', function () { return (0, compileModule_1.compileModule)('commonjs'); })];
+                case 4:
                     _b.sent();
                     _a = !cmd.noUmd;
-                    if (!_a) return [3 /*break*/, 4];
+                    if (!_a) return [3 /*break*/, 6];
                     return [4 /*yield*/, runTask('umd', function () { return (0, compileModule_1.compileModule)('umd'); })];
-                case 3:
+                case 5:
                     _a = (_b.sent());
-                    _b.label = 4;
-                case 4:
+                    _b.label = 6;
+                case 6:
                     _a;
                     return [2 /*return*/];
             }

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.d.ts

@@ -1,4 +1,4 @@
 export declare function compileUMD(): Promise<void>;
 export declare function compileDir(dir: string): Promise<void>;
 export declare function compileFile(file: string): Promise<void>;
-export declare function compileModule(modules?: string | boolean): Promise<void>;
+export declare function compileModule(modules?: 'umd' | 'commonjs' | boolean): Promise<void>;

package/lib/compiler/compileModule.js

@@ -47,6 +47,7 @@ var compileScript_1 = require("./compileScript");
 var compileStyle_1 = require("./compileStyle");
 var vite_config_1 = require("../config/vite.config");
 var varlet_config_1 = require("../config/varlet.config");
+var compileTypes_1 = require("./compileTypes");
 function compileUMD() {
     return new Promise(function (resolve, reject) {
         var config = (0, vite_config_1.getUMDConfig)((0, varlet_config_1.getVarletConfig)());
@@ -127,23 +128,26 @@ exports.compileFile = compileFile;
 function compileModule(modules) {
     if (modules === void 0) { modules = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var moduleDir, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var dest, moduleDir, publicDirs;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     if (!(modules === 'umd')) return [3 /*break*/, 2];
                     return [4 /*yield*/, compileUMD()];
                 case 1:
-                    _c.sent();
+                    _a.sent();
                     return [2 /*return*/];
-                case 2: return [4 /*yield*/, (0, fs_extra_1.copy)(constant_1.SRC_DIR, constant_1.ES_DIR)];
+                case 2:
+                    process.env.BABEL_MODULE = modules === 'commonjs' ? 'commonjs' : 'module';
+                    dest = modules === 'commonjs' ? constant_1.LIB_DIR : constant_1.ES_DIR;
+                    return [4 /*yield*/, (0, fs_extra_1.copy)(constant_1.SRC_DIR, dest)];
                 case 3:
-                    _c.sent();
-                    return [4 /*yield*/, (0, fs_extra_1.readdir)(constant_1.ES_DIR)];
+                    _a.sent();
+                    return [4 /*yield*/, (0, fs_extra_1.readdir)(dest)];
                 case 4:
-                    moduleDir = _c.sent();
+                    moduleDir = _a.sent();
                     return [4 /*yield*/, Promise.all(moduleDir.map(function (filename) {
-                            var file = (0, path_1.resolve)(constant_1.ES_DIR, filename);
+                            var file = (0, path_1.resolve)(dest, filename);
                             if ((0, fsUtils_1.isDir)(file)) {
                                 (0, fs_extra_1.ensureFileSync)((0, path_1.resolve)(file, './style/index.js'));
                                 (0, fs_extra_1.ensureFileSync)((0, path_1.resolve)(file, './style/less.js'));
@@ -151,13 +155,14 @@ function compileModule(modules) {
                             return (0, fsUtils_1.isDir)(file) ? compileDir(file) : null;
                         }))];
                 case 5:
-                    _c.sent();
-                    _a = compileScript_1.compileLibraryEntry;
-                    _b = [constant_1.ES_DIR];
+                    _a.sent();
                     return [4 /*yield*/, (0, fsUtils_1.getPublicDirs)()];
-                case 6: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent()]))];
+                case 6:
+                    publicDirs = _a.sent();
+                    return [4 /*yield*/, (modules === 'commonjs' ? (0, compileScript_1.compileCommonJSEntry)(dest, publicDirs) : (0, compileScript_1.compileESEntry)(dest, publicDirs))];
                 case 7:
-                    _c.sent();
+                    _a.sent();
+                    (0, compileTypes_1.generateReference)(dest);
                     return [2 /*return*/];
             }
         });

package/lib/compiler/compileScript.d.ts

@@ -2,10 +2,16 @@ 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 compileLibraryEntry(dir: string, publicDirs: string[]): Promise<void>;
+export declare function compileESEntry(dir: string, publicDirs: string[]): Promise<void>;
+export declare function compileCommonJSEntry(dir: string, publicDirs: string[]): Promise<void>;

package/lib/compiler/compileScript.js

@@ -36,37 +36,65 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileLibraryEntry = 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;
+        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;
-                    code = (0, compileStyle_1.extractStyleDependencies)(file, code, compileStyle_1.IMPORT_CSS_RE, 'css', false);
-                    code = (0, compileStyle_1.extractStyleDependencies)(file, code, compileStyle_1.IMPORT_LESS_RE, 'less', false);
+                    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);
                     code = (0, exports.replaceTSXExt)(code);
                     code = (0, exports.replaceJSXExt)(code);
@@ -95,7 +123,7 @@ function compileScriptFile(file) {
     });
 }
 exports.compileScriptFile = compileScriptFile;
-function compileLibraryEntry(dir, publicDirs) {
+function compileESEntry(dir, publicDirs) {
     return __awaiter(this, void 0, void 0, function () {
         var imports, plugins, constInternalComponents, cssImports, lessImports, publicComponents, install, indexTemplate, styleTemplate, umdTemplate, lessTemplate;
         return __generator(this, function (_a) {
@@ -134,4 +162,40 @@ function compileLibraryEntry(dir, publicDirs) {
         });
     });
 }
-exports.compileLibraryEntry = compileLibraryEntry;
+exports.compileESEntry = compileESEntry;
+function compileCommonJSEntry(dir, publicDirs) {
+    return __awaiter(this, void 0, void 0, function () {
+        var requires, plugins, cssRequires, lessRequires, publicComponents, install, indexTemplate, styleTemplate, lessTemplate;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    requires = [];
+                    plugins = [];
+                    cssRequires = [];
+                    lessRequires = [];
+                    publicComponents = [];
+                    publicDirs.forEach(function (dirname) {
+                        var publicComponent = (0, fsUtils_1.bigCamelize)(dirname);
+                        publicComponents.push(publicComponent);
+                        requires.push("var " + publicComponent + " = require('./" + dirname + "')['default']");
+                        plugins.push(publicComponent + ".install && app.use(" + publicComponent + ")");
+                        cssRequires.push("require('./" + dirname + "/style')");
+                        lessRequires.push("require('./" + dirname + "/style/less')");
+                    });
+                    install = "\nfunction install(app) {\n  " + plugins.join('\n  ') + "\n}\n";
+                    indexTemplate = requires.join('\n') + "\n\n" + install + "\n\nmodule.exports = {\n  install,\n  " + publicComponents.join(',\n  ') + "\n}\n";
+                    styleTemplate = cssRequires.join('\n') + "\n";
+                    lessTemplate = lessRequires.join('\n') + "\n";
+                    return [4 /*yield*/, Promise.all([
+                            (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'index.js'), indexTemplate, 'utf-8'),
+                            (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'style.js'), styleTemplate, 'utf-8'),
+                            (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'less.js'), lessTemplate, 'utf-8'),
+                        ])];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.compileCommonJSEntry = compileCommonJSEntry;

package/lib/compiler/compileStyle.d.ts

@@ -2,6 +2,8 @@ export declare const EMPTY_SPACE_RE: RegExp;
 export declare const EMPTY_LINE_RE: RegExp;
 export declare const IMPORT_CSS_RE: RegExp;
 export declare const IMPORT_LESS_RE: RegExp;
+export declare const REQUIRE_CSS_RE: RegExp;
+export declare const REQUIRE_LESS_RE: RegExp;
 export declare const STYLE_IMPORT_RE: RegExp;
 export declare const clearEmptyLine: (s: string) => string;
 export declare function normalizeStyleDependency(styleImport: string, reg: RegExp): string;

package/lib/compiler/compileStyle.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileLess = exports.extractStyleDependencies = exports.normalizeStyleDependency = exports.clearEmptyLine = exports.STYLE_IMPORT_RE = exports.IMPORT_LESS_RE = exports.IMPORT_CSS_RE = exports.EMPTY_LINE_RE = exports.EMPTY_SPACE_RE = void 0;
+exports.compileLess = exports.extractStyleDependencies = exports.normalizeStyleDependency = exports.clearEmptyLine = exports.STYLE_IMPORT_RE = exports.REQUIRE_LESS_RE = exports.REQUIRE_CSS_RE = exports.IMPORT_LESS_RE = exports.IMPORT_CSS_RE = exports.EMPTY_LINE_RE = exports.EMPTY_SPACE_RE = void 0;
 var fs_extra_1 = require("fs-extra");
 var less_1 = require("less");
 var fsUtils_1 = require("../shared/fsUtils");
@@ -45,6 +45,8 @@ exports.EMPTY_SPACE_RE = /[\s]+/g;
 exports.EMPTY_LINE_RE = /[\n\r]*/g;
 exports.IMPORT_CSS_RE = /(?<!['"`])import\s+['"](\.{1,2}\/.+\.css)['"]\s*;?(?!\s*['"`])/g;
 exports.IMPORT_LESS_RE = /(?<!['"`])import\s+['"](\.{1,2}\/.+\.less)['"]\s*;?(?!\s*['"`])/g;
+exports.REQUIRE_CSS_RE = /(?<!['"`])require\(\s*['"](\.{1,2}\/.+\.css)['"]\s*\);?(?!\s*['"`])/g;
+exports.REQUIRE_LESS_RE = /(?<!['"`])require\(\s*['"](\.{1,2}\/.+\.less)['"]\s*\);?(?!\s*['"`])/g;
 exports.STYLE_IMPORT_RE = /@import\s+['"](.+)['"]\s*;/g;
 var clearEmptyLine = function (s) { return s.replace(exports.EMPTY_LINE_RE, '').replace(exports.EMPTY_SPACE_RE, ' '); };
 exports.clearEmptyLine = clearEmptyLine;
@@ -63,14 +65,19 @@ function extractStyleDependencies(file, code, reg, expect, self) {
     var styleImports = (_a = code.match(reg)) !== null && _a !== void 0 ? _a : [];
     var cssFile = (0, path_1.resolve)(dir, './style/index.js');
     var lessFile = (0, path_1.resolve)(dir, './style/less.js');
+    var modules = process.env.BABEL_MODULE;
     styleImports.forEach(function (styleImport) {
         var normalizedPath = normalizeStyleDependency(styleImport, reg);
-        (0, fsUtils_1.smartAppendFileSync)(cssFile, "import '" + normalizedPath + ".css'\n");
-        (0, fsUtils_1.smartAppendFileSync)(lessFile, "import '" + normalizedPath + "." + expect + "'\n");
+        (0, fsUtils_1.smartAppendFileSync)(cssFile, modules === 'commonjs' ? "require('" + normalizedPath + ".css')\n" : "import '" + normalizedPath + ".css'\n");
+        (0, fsUtils_1.smartAppendFileSync)(lessFile, modules === 'commonjs' ? "require('" + normalizedPath + "." + expect + "')\n" : "import '" + normalizedPath + "." + expect + "'\n");
     });
     if (self) {
-        (0, fsUtils_1.smartAppendFileSync)(cssFile, "import '" + normalizeStyleDependency(base, reg) + ".css'\n");
-        (0, fsUtils_1.smartAppendFileSync)(lessFile, "import '" + normalizeStyleDependency(base, reg) + "." + expect + "'\n");
+        (0, fsUtils_1.smartAppendFileSync)(cssFile, modules === 'commonjs'
+            ? "require('" + normalizeStyleDependency(base, reg) + ".css')\n"
+            : "import '" + normalizeStyleDependency(base, reg) + ".css'\n");
+        (0, fsUtils_1.smartAppendFileSync)(lessFile, modules === 'commonjs'
+            ? "require('" + normalizeStyleDependency(base, reg) + "." + expect + "')\n"
+            : "import '" + normalizeStyleDependency(base, reg) + "." + expect + "'\n");
     }
     return code.replace(reg, '');
 }

package/lib/compiler/compileTypes.d.ts

@@ -1 +1,2 @@
+export declare function generateReference(moduleDir: string): void;
 export declare function compileTypes(): Promise<void>;

package/lib/compiler/compileTypes.js

@@ -36,13 +36,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileTypes = void 0;
+exports.compileTypes = exports.generateReference = void 0;
 var fs_extra_1 = require("fs-extra");
 var constant_1 = require("../shared/constant");
 var fsUtils_1 = require("../shared/fsUtils");
 var path_1 = require("path");
 var varlet_config_1 = require("../config/varlet.config");
 var lodash_1 = require("lodash");
+function generateReference(moduleDir) {
+    (0, fs_extra_1.writeFileSync)((0, path_1.resolve)(moduleDir, 'index.d.ts'), "export * from '" + (0, path_1.relative)(moduleDir, constant_1.TYPES_DIR) + "'\n");
+}
+exports.generateReference = generateReference;
 function compileTypes() {
     return __awaiter(this, void 0, void 0, function () {
         var varletConfig, namespace, name, dir, ignoreEntryDir, exports, declares, template, globalTemplate;

package/lib/config/babel.config.js

@@ -5,13 +5,13 @@ module.exports = function (api, options) {
     if (api) {
         api.cache.never();
     }
-    var isTest = process.env.NODE_ENV === 'test';
+    var isCommonJS = process.env.NODE_ENV === 'test' || process.env.BABEL_MODULE === 'commonjs';
     return {
         presets: [
             [
                 require.resolve('@babel/preset-env'),
                 {
-                    modules: isTest ? 'commonjs' : false,
+                    modules: isCommonJS ? 'commonjs' : false,
                     loose: options.loose,
                 },
             ],

package/lib/config/vite.config.js

@@ -80,12 +80,16 @@ function inlineCSS(fileName, dir) {
         apply: 'build',
         closeBundle: function () {
             var cssFile = (0, path_1.resolve)(dir, 'style.css');
+            if (!(0, fs_extra_1.pathExistsSync)(cssFile)) {
+                return;
+            }
             var jsFile = (0, path_1.resolve)(dir, fileName);
             var cssCode = (0, fs_extra_1.readFileSync)(cssFile, 'utf-8');
             var jsCode = (0, fs_extra_1.readFileSync)(jsFile, 'utf-8');
             var injectCode = ";(function(){var style=document.createElement('style');style.type='text/css';style.rel='stylesheet';style.appendChild(document.createTextNode(`" + cssCode.replace(/\\/g, '\\\\') + "`));var head=document.querySelector('head');head.appendChild(style)})();";
-            (0, fs_extra_1.removeSync)(cssFile);
             (0, fs_extra_1.writeFileSync)(jsFile, "" + injectCode + jsCode);
+            (0, fs_extra_1.copyFileSync)(cssFile, (0, path_1.resolve)(constant_1.LIB_DIR, 'style.css'));
+            (0, fs_extra_1.removeSync)(cssFile);
         },
     };
 }

package/lib/shared/constant.d.ts

@@ -2,6 +2,7 @@ export declare const CWD: string;
 export declare const VARLET_CONFIG: string;
 export declare const SRC_DIR: string;
 export declare const ES_DIR: string;
+export declare const LIB_DIR: string;
 export declare const UMD_DIR: string;
 export declare const TYPES_DIR: string;
 export declare const ROOT_DOCS_DIR: string;

package/lib/shared/constant.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JEST_STYLE_MOCK = exports.JEST_MEDIA_MOCK = exports.JEST_CONFIG = exports.HL_WEB_TYPES_JSON = exports.HL_ATTRIBUTES_JSON = exports.HL_TAGS_JSON = exports.HL_DIR = exports.HL_MD = exports.HL_TITLE_SLOTS_RE = exports.HL_TITLE_EVENTS_RE = exports.HL_TITLE_ATTRIBUTES_RE = exports.HL_API_RE = exports.HL_COMPONENT_NAME_RE = exports.SITE_CONFIG = exports.SITE_MOBILE_ROUTES = exports.SITE_PC_ROUTES = exports.SITE_DIR = exports.SITE_PUBLIC_PATH = exports.SITE_OUTPUT_PATH = exports.SITE = exports.CLI_PACKAGE_JSON = exports.UI_PACKAGE_JSON = exports.GENERATORS_DIR = exports.TESTS_DIR_NAME = exports.EXAMPLE_DIR_INDEX = exports.DOCS_DIR_NAME = exports.EXAMPLE_LOCALE_DIR_NAME = exports.EXAMPLE_DIR_NAME = exports.STYLE_DIR_NAME = exports.PUBLIC_DIR_INDEXES = exports.SCRIPTS_EXTENSIONS = exports.VITE_RESOLVE_EXTENSIONS = exports.ESLINT_EXTENSIONS = exports.ROOT_DOCS_DIR = exports.TYPES_DIR = exports.UMD_DIR = exports.ES_DIR = exports.SRC_DIR = exports.VARLET_CONFIG = exports.CWD = void 0;
+exports.JEST_STYLE_MOCK = exports.JEST_MEDIA_MOCK = exports.JEST_CONFIG = exports.HL_WEB_TYPES_JSON = exports.HL_ATTRIBUTES_JSON = exports.HL_TAGS_JSON = exports.HL_DIR = exports.HL_MD = exports.HL_TITLE_SLOTS_RE = exports.HL_TITLE_EVENTS_RE = exports.HL_TITLE_ATTRIBUTES_RE = exports.HL_API_RE = exports.HL_COMPONENT_NAME_RE = exports.SITE_CONFIG = exports.SITE_MOBILE_ROUTES = exports.SITE_PC_ROUTES = exports.SITE_DIR = exports.SITE_PUBLIC_PATH = exports.SITE_OUTPUT_PATH = exports.SITE = exports.CLI_PACKAGE_JSON = exports.UI_PACKAGE_JSON = exports.GENERATORS_DIR = exports.TESTS_DIR_NAME = exports.EXAMPLE_DIR_INDEX = exports.DOCS_DIR_NAME = exports.EXAMPLE_LOCALE_DIR_NAME = exports.EXAMPLE_DIR_NAME = exports.STYLE_DIR_NAME = exports.PUBLIC_DIR_INDEXES = exports.SCRIPTS_EXTENSIONS = exports.VITE_RESOLVE_EXTENSIONS = exports.ESLINT_EXTENSIONS = exports.ROOT_DOCS_DIR = exports.TYPES_DIR = exports.UMD_DIR = exports.LIB_DIR = exports.ES_DIR = exports.SRC_DIR = exports.VARLET_CONFIG = exports.CWD = void 0;
 var path_1 = require("path");
 exports.CWD = process.cwd();
 exports.VARLET_CONFIG = (0, path_1.resolve)(exports.CWD, 'varlet.config.js');
 exports.SRC_DIR = (0, path_1.resolve)(exports.CWD, 'src');
 exports.ES_DIR = (0, path_1.resolve)(exports.CWD, 'es');
+exports.LIB_DIR = (0, path_1.resolve)(exports.CWD, 'lib');
 exports.UMD_DIR = (0, path_1.resolve)(exports.CWD, 'umd');
 exports.TYPES_DIR = (0, path_1.resolve)(exports.CWD, 'types');
 exports.ROOT_DOCS_DIR = (0, path_1.resolve)(exports.CWD, 'docs');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.23.3-alpha.1+84ebb4ef",
+  "version": "1.23.4-alpha.16+3e8b7b4e",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -31,7 +31,7 @@
     "dev": "tsc --watch",
     "build": "tsc"
   },
-  "gitHead": "84ebb4efe823cb9d7f22995d429b82d8fc3e05c8",
+  "gitHead": "3e8b7b4e5489bc67dd38f8787477f07e2a13e7ac",
   "dependencies": {
     "@babel/core": "^7.14.8",
     "@babel/preset-env": "^7.14.8",
@@ -47,7 +47,7 @@
     "@vitejs/plugin-vue": "1.9.2",
     "@vitejs/plugin-vue-jsx": "1.1.8",
     "@vue/babel-plugin-jsx": "^1.0.7",
-    "@vue/compiler-sfc": "3.2.16",
+    "@vue/compiler-sfc": "3.2.22",
     "@vue/test-utils": "^2.0.0-rc.6",
     "babel-jest": "26.6.3",
     "chalk": "^4.1.0",