@varlet/cli 1.23.3 → 1.23.4-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/generators/sfc/.gitignore +1 -0
  2. package/generators/sfc/package.json +3 -0
  3. package/generators/tsx/.gitignore +1 -0
  4. package/generators/tsx/package.json +3 -0
  5. package/lib/commands/compile.d.ts +1 -1
  6. package/lib/commands/compile.js +12 -10
  7. package/lib/commands/gen.js +1 -1
  8. package/lib/compiler/compileModule.d.ts +1 -1
  9. package/lib/compiler/compileModule.js +17 -14
  10. package/lib/compiler/compileScript.d.ts +6 -1
  11. package/lib/compiler/compileScript.js +59 -10
  12. package/lib/compiler/compileStyle.d.ts +2 -0
  13. package/lib/compiler/compileStyle.js +12 -5
  14. package/lib/config/babel.config.js +2 -2
  15. package/lib/shared/constant.d.ts +1 -0
  16. package/lib/shared/constant.js +2 -1
  17. package/package.json +2 -2
package/generators/sfc/.gitignore CHANGED
@@ -7,6 +7,7 @@ node_modules
7
7
  .DS_Store
8
8
 
9
9
  site
10
+ lib
10
11
  es
11
12
  umd
12
13
  coverage
package/generators/sfc/package.json CHANGED
@@ -2,6 +2,7 @@
2
2
  "name": "basic-ui",
3
3
  "version": "0.0.0",
4
4
  "description": "A basic components library",
5
+ "main": "lib/index.js",
5
6
  "module": "es/index.js",
6
7
  "typings": "types/index.d.ts",
7
8
  "vetur": {
@@ -64,6 +65,7 @@
64
65
  "eslintConfig": {
65
66
  "root": true,
66
67
  "ignorePatterns": [
68
+ "lib/**",
67
69
  "es/**",
68
70
  "umd/**",
69
71
  "site/**",
@@ -80,6 +82,7 @@
80
82
  "@varlet/stylelint-config"
81
83
  ],
82
84
  "ignoreFiles": [
85
+ "lib/**",
83
86
  "es/**",
84
87
  "umd/**",
85
88
  "site/**",
package/generators/tsx/.gitignore CHANGED
@@ -7,6 +7,7 @@ node_modules
7
7
  .DS_Store
8
8
 
9
9
  site
10
+ lib
10
11
  es
11
12
  umd
12
13
  coverage
package/generators/tsx/package.json CHANGED
@@ -2,6 +2,7 @@
2
2
  "name": "basic-ui",
3
3
  "version": "0.0.0",
4
4
  "description": "A basic components library",
5
+ "main": "lib/index.js",
5
6
  "module": "es/index.js",
6
7
  "typings": "types/index.d.ts",
7
8
  "vetur": {
@@ -64,6 +65,7 @@
64
65
  "eslintConfig": {
65
66
  "root": true,
66
67
  "ignorePatterns": [
68
+ "lib/**",
67
69
  "es/**",
68
70
  "umd/**",
69
71
  "site/**",
@@ -80,6 +82,7 @@
80
82
  "@varlet/stylelint-config"
81
83
  ],
82
84
  "ignoreFiles": [
85
+ "lib/**",
83
86
  "es/**",
84
87
  "umd/**",
85
88
  "site/**",
package/lib/commands/compile.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare function removeDir(): Promise<[void, void, void]>;
1
+ export declare function removeDir(): Promise<[void, void, void, void]>;
2
2
  export declare function runTask(taskName: string, task: () => any): Promise<void>;
3
3
  export declare function compile(cmd: {
4
4
  noUmd: boolean;
package/lib/commands/compile.js CHANGED
@@ -48,7 +48,7 @@ var compileModule_1 = require("../compiler/compileModule");
48
48
  var compileTemplateHighlight_1 = require("../compiler/compileTemplateHighlight");
49
49
  var compileTypes_1 = require("../compiler/compileTypes");
50
50
  function removeDir() {
51
- 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)]);
51
+ 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)]);
52
52
  }
53
53
  exports.removeDir = removeDir;
54
54
  function runTask(taskName, task) {
@@ -87,20 +87,22 @@ function compile(cmd) {
87
87
  return [4 /*yield*/, removeDir()];
88
88
  case 1:
89
89
  _b.sent();
90
- return [4 /*yield*/, Promise.all([
91
- runTask('types', compileTypes_1.compileTypes),
92
- runTask('template highlight', compileTemplateHighlight_1.compileTemplateHighlight),
93
- runTask('module', compileModule_1.compileModule),
94
- ])];
90
+ return [4 /*yield*/, Promise.all([runTask('types', compileTypes_1.compileTypes), runTask('template highlight', compileTemplateHighlight_1.compileTemplateHighlight)])];
95
91
  case 2:
92
+ _b.sent();
93
+ return [4 /*yield*/, runTask('module', compileModule_1.compileModule)];
94
+ case 3:
95
+ _b.sent();
96
+ return [4 /*yield*/, runTask('commonjs', function () { return (0, compileModule_1.compileModule)('commonjs'); })];
97
+ case 4:
96
98
  _b.sent();
97
99
  _a = !cmd.noUmd;
98
- if (!_a) return [3 /*break*/, 4];
100
+ if (!_a) return [3 /*break*/, 6];
99
101
  return [4 /*yield*/, runTask('umd', function () { return (0, compileModule_1.compileModule)('umd'); })];
100
- case 3:
102
+ case 5:
101
103
  _a = (_b.sent());
102
- _b.label = 4;
103
- case 4:
104
+ _b.label = 6;
105
+ case 6:
104
106
  _a;
105
107
  return [2 /*return*/];
106
108
  }
package/lib/commands/gen.js CHANGED
@@ -54,7 +54,7 @@ function syncVersion(name) {
54
54
  var pkg = JSON.parse((0, fs_extra_1.readFileSync)(file, 'utf-8'));
55
55
  var cliPkg = JSON.parse((0, fs_extra_1.readFileSync)(constant_1.CLI_PACKAGE_JSON, 'utf-8'));
56
56
  pkg.devDependencies['@varlet/cli'] = "^" + cliPkg.version;
57
- pkg.files = ['es', 'umd', 'highlight', 'types', 'README.md'];
57
+ pkg.files = ['es', 'lib', 'umd', 'highlight', 'types', 'README.md'];
58
58
  (0, fs_extra_1.writeFileSync)(file, JSON.stringify(pkg, null, 2));
59
59
  }
60
60
  function gen(name) {
package/lib/compiler/compileModule.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export declare function compileUMD(): Promise<void>;
2
2
  export declare function compileDir(dir: string): Promise<void>;
3
3
  export declare function compileFile(file: string): Promise<void>;
4
- export declare function compileModule(modules?: string | boolean): Promise<void>;
4
+ export declare function compileModule(modules?: 'umd' | 'commonjs' | boolean): Promise<void>;
package/lib/compiler/compileModule.js CHANGED
@@ -127,23 +127,26 @@ exports.compileFile = compileFile;
127
127
  function compileModule(modules) {
128
128
  if (modules === void 0) { modules = false; }
129
129
  return __awaiter(this, void 0, void 0, function () {
130
- var moduleDir, _a, _b;
131
- return __generator(this, function (_c) {
132
- switch (_c.label) {
130
+ var dest, moduleDir, publicDirs;
131
+ return __generator(this, function (_a) {
132
+ switch (_a.label) {
133
133
  case 0:
134
134
  if (!(modules === 'umd')) return [3 /*break*/, 2];
135
135
  return [4 /*yield*/, compileUMD()];
136
136
  case 1:
137
- _c.sent();
137
+ _a.sent();
138
138
  return [2 /*return*/];
139
- case 2: return [4 /*yield*/, (0, fs_extra_1.copy)(constant_1.SRC_DIR, constant_1.ES_DIR)];
139
+ case 2:
140
+ process.env.BABEL_MODULE = modules === 'commonjs' ? 'commonjs' : 'module';
141
+ dest = modules === 'commonjs' ? constant_1.LIB_DIR : constant_1.ES_DIR;
142
+ return [4 /*yield*/, (0, fs_extra_1.copy)(constant_1.SRC_DIR, dest)];
140
143
  case 3:
141
- _c.sent();
142
- return [4 /*yield*/, (0, fs_extra_1.readdir)(constant_1.ES_DIR)];
144
+ _a.sent();
145
+ return [4 /*yield*/, (0, fs_extra_1.readdir)(dest)];
143
146
  case 4:
144
- moduleDir = _c.sent();
147
+ moduleDir = _a.sent();
145
148
  return [4 /*yield*/, Promise.all(moduleDir.map(function (filename) {
146
- var file = (0, path_1.resolve)(constant_1.ES_DIR, filename);
149
+ var file = (0, path_1.resolve)(dest, filename);
147
150
  if ((0, fsUtils_1.isDir)(file)) {
148
151
  (0, fs_extra_1.ensureFileSync)((0, path_1.resolve)(file, './style/index.js'));
149
152
  (0, fs_extra_1.ensureFileSync)((0, path_1.resolve)(file, './style/less.js'));
@@ -151,13 +154,13 @@ function compileModule(modules) {
151
154
  return (0, fsUtils_1.isDir)(file) ? compileDir(file) : null;
152
155
  }))];
153
156
  case 5:
154
- _c.sent();
155
- _a = compileScript_1.compileLibraryEntry;
156
- _b = [constant_1.ES_DIR];
157
+ _a.sent();
157
158
  return [4 /*yield*/, (0, fsUtils_1.getPublicDirs)()];
158
- case 6: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent()]))];
159
+ case 6:
160
+ publicDirs = _a.sent();
161
+ return [4 /*yield*/, (modules === 'commonjs' ? (0, compileScript_1.compileCommonJSEntry)(dest, publicDirs) : (0, compileScript_1.compileESEntry)(dest, publicDirs))];
159
162
  case 7:
160
- _c.sent();
163
+ _a.sent();
161
164
  return [2 /*return*/];
162
165
  }
163
166
  });
package/lib/compiler/compileScript.d.ts CHANGED
@@ -2,10 +2,15 @@ export declare const IMPORT_VUE_PATH_RE: RegExp;
2
2
  export declare const IMPORT_TS_PATH_RE: RegExp;
3
3
  export declare const IMPORT_JSX_PATH_RE: RegExp;
4
4
  export declare const IMPORT_TSX_PATH_RE: RegExp;
5
+ export declare const REQUIRE_VUE_PATH_RE: RegExp;
6
+ export declare const REQUIRE_TS_PATH_RE: RegExp;
7
+ export declare const REQUIRE_JSX_PATH_RE: RegExp;
8
+ export declare const REQUIRE_TSX_PATH_RE: RegExp;
5
9
  export declare const replaceVueExt: (script: string) => string;
6
10
  export declare const replaceTSExt: (script: string) => string;
7
11
  export declare const replaceJSXExt: (script: string) => string;
8
12
  export declare const replaceTSXExt: (script: string) => string;
9
13
  export declare function compileScript(script: string, file: string): Promise<void>;
10
14
  export declare function compileScriptFile(file: string): Promise<void>;
11
- export declare function compileLibraryEntry(dir: string, publicDirs: string[]): Promise<void>;
15
+ export declare function compileESEntry(dir: string, publicDirs: string[]): Promise<void>;
16
+ export declare function compileCommonJSEntry(dir: string, publicDirs: string[]): Promise<void>;
package/lib/compiler/compileScript.js CHANGED
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- 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;
39
+ exports.compileCommonJSEntry = exports.compileESEntry = exports.compileScriptFile = exports.compileScript = 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;
40
40
  var core_1 = require("@babel/core");
41
41
  var fsUtils_1 = require("../shared/fsUtils");
42
42
  var fs_extra_1 = require("fs-extra");
@@ -46,18 +46,30 @@ exports.IMPORT_VUE_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.
46
46
  exports.IMPORT_TS_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]);?(?!\s*['"`])/g;
47
47
  exports.IMPORT_JSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]);?(?!\s*['"`])/g;
48
48
  exports.IMPORT_TSX_PATH_RE = /((?<!['"`])import\s+.+from\s+['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]);?(?!\s*['"`])/g;
49
+ exports.REQUIRE_VUE_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.vue(\s*['"`]\))(?!\s*['"`])/g;
50
+ exports.REQUIRE_TS_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.ts(\s*['"`]\))(?!\s*['"`])/g;
51
+ exports.REQUIRE_JSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.jsx(\s*['"`]\))(?!\s*['"`])/g;
52
+ exports.REQUIRE_TSX_PATH_RE = /(?<!['"`]\s*)(require\s*\(\s*['"]\s*\.{1,2}\/.+)\.tsx(\s*['"`]\))(?!\s*['"`])/g;
49
53
  var scriptReplacer = function (_, p1, p2) { return p1 + ".js" + p2; };
50
- var replaceVueExt = function (script) { return script.replace(exports.IMPORT_VUE_PATH_RE, scriptReplacer); };
54
+ var replaceVueExt = function (script) {
55
+ return script.replace(exports.IMPORT_VUE_PATH_RE, scriptReplacer).replace(exports.REQUIRE_VUE_PATH_RE, scriptReplacer);
56
+ };
51
57
  exports.replaceVueExt = replaceVueExt;
52
- var replaceTSExt = function (script) { return script.replace(exports.IMPORT_TS_PATH_RE, scriptReplacer); };
58
+ var replaceTSExt = function (script) {
59
+ return script.replace(exports.IMPORT_TS_PATH_RE, scriptReplacer).replace(exports.REQUIRE_TS_PATH_RE, scriptReplacer);
60
+ };
53
61
  exports.replaceTSExt = replaceTSExt;
54
- var replaceJSXExt = function (script) { return script.replace(exports.IMPORT_JSX_PATH_RE, scriptReplacer); };
62
+ var replaceJSXExt = function (script) {
63
+ return script.replace(exports.IMPORT_JSX_PATH_RE, scriptReplacer).replace(exports.REQUIRE_JSX_PATH_RE, scriptReplacer);
64
+ };
55
65
  exports.replaceJSXExt = replaceJSXExt;
56
- var replaceTSXExt = function (script) { return script.replace(exports.IMPORT_TSX_PATH_RE, scriptReplacer); };
66
+ var replaceTSXExt = function (script) {
67
+ return script.replace(exports.IMPORT_TSX_PATH_RE, scriptReplacer).replace(exports.REQUIRE_TSX_PATH_RE, scriptReplacer);
68
+ };
57
69
  exports.replaceTSXExt = replaceTSXExt;
58
70
  function compileScript(script, file) {
59
71
  return __awaiter(this, void 0, void 0, function () {
60
- var code;
72
+ var code, modules;
61
73
  return __generator(this, function (_a) {
62
74
  switch (_a.label) {
63
75
  case 0: return [4 /*yield*/, (0, core_1.transformAsync)(script, {
@@ -65,8 +77,9 @@ function compileScript(script, file) {
65
77
  })];
66
78
  case 1:
67
79
  code = (_a.sent()).code;
68
- code = (0, compileStyle_1.extractStyleDependencies)(file, code, compileStyle_1.IMPORT_CSS_RE, 'css', false);
69
- code = (0, compileStyle_1.extractStyleDependencies)(file, code, compileStyle_1.IMPORT_LESS_RE, 'less', false);
80
+ modules = process.env.BABEL_MODULE;
81
+ code = (0, compileStyle_1.extractStyleDependencies)(file, code, modules === 'commonjs' ? compileStyle_1.REQUIRE_CSS_RE : compileStyle_1.IMPORT_CSS_RE, 'css', false);
82
+ code = (0, compileStyle_1.extractStyleDependencies)(file, code, modules === 'commonjs' ? compileStyle_1.REQUIRE_LESS_RE : compileStyle_1.IMPORT_LESS_RE, 'less', false);
70
83
  code = (0, exports.replaceVueExt)(code);
71
84
  code = (0, exports.replaceTSXExt)(code);
72
85
  code = (0, exports.replaceJSXExt)(code);
@@ -95,7 +108,7 @@ function compileScriptFile(file) {
95
108
  });
96
109
  }
97
110
  exports.compileScriptFile = compileScriptFile;
98
- function compileLibraryEntry(dir, publicDirs) {
111
+ function compileESEntry(dir, publicDirs) {
99
112
  return __awaiter(this, void 0, void 0, function () {
100
113
  var imports, plugins, constInternalComponents, cssImports, lessImports, publicComponents, install, indexTemplate, styleTemplate, umdTemplate, lessTemplate;
101
114
  return __generator(this, function (_a) {
@@ -134,4 +147,40 @@ function compileLibraryEntry(dir, publicDirs) {
134
147
  });
135
148
  });
136
149
  }
137
- exports.compileLibraryEntry = compileLibraryEntry;
150
+ exports.compileESEntry = compileESEntry;
151
+ function compileCommonJSEntry(dir, publicDirs) {
152
+ return __awaiter(this, void 0, void 0, function () {
153
+ var requires, plugins, cssRequires, lessRequires, publicComponents, install, indexTemplate, styleTemplate, lessTemplate;
154
+ return __generator(this, function (_a) {
155
+ switch (_a.label) {
156
+ case 0:
157
+ requires = [];
158
+ plugins = [];
159
+ cssRequires = [];
160
+ lessRequires = [];
161
+ publicComponents = [];
162
+ publicDirs.forEach(function (dirname) {
163
+ var publicComponent = (0, fsUtils_1.bigCamelize)(dirname);
164
+ publicComponents.push(publicComponent);
165
+ requires.push("const " + publicComponent + " = require('./" + dirname + "')");
166
+ plugins.push(publicComponent + ".install && app.use(" + publicComponent + ")");
167
+ cssRequires.push("require('./" + dirname + "/style')");
168
+ lessRequires.push("require('./" + dirname + "/style/less')");
169
+ });
170
+ install = "\nfunction install(app) {\n " + plugins.join('\n ') + "\n}\n";
171
+ indexTemplate = requires.join('\n') + "\n\n" + install + "\n\nmodule.exports = {\n install,\n " + publicComponents.join(',\n ') + "\n}\n";
172
+ styleTemplate = cssRequires.join('\n') + "\n";
173
+ lessTemplate = lessRequires.join('\n') + "\n";
174
+ return [4 /*yield*/, Promise.all([
175
+ (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'index.js'), indexTemplate, 'utf-8'),
176
+ (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'style.js'), styleTemplate, 'utf-8'),
177
+ (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, 'less.js'), lessTemplate, 'utf-8'),
178
+ ])];
179
+ case 1:
180
+ _a.sent();
181
+ return [2 /*return*/];
182
+ }
183
+ });
184
+ });
185
+ }
186
+ exports.compileCommonJSEntry = compileCommonJSEntry;
package/lib/compiler/compileStyle.d.ts CHANGED
@@ -2,6 +2,8 @@ export declare const EMPTY_SPACE_RE: RegExp;
2
2
  export declare const EMPTY_LINE_RE: RegExp;
3
3
  export declare const IMPORT_CSS_RE: RegExp;
4
4
  export declare const IMPORT_LESS_RE: RegExp;
5
+ export declare const REQUIRE_CSS_RE: RegExp;
6
+ export declare const REQUIRE_LESS_RE: RegExp;
5
7
  export declare const STYLE_IMPORT_RE: RegExp;
6
8
  export declare const clearEmptyLine: (s: string) => string;
7
9
  export declare function normalizeStyleDependency(styleImport: string, reg: RegExp): string;
package/lib/compiler/compileStyle.js CHANGED
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- 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;
39
+ 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;
40
40
  var fs_extra_1 = require("fs-extra");
41
41
  var less_1 = require("less");
42
42
  var fsUtils_1 = require("../shared/fsUtils");
@@ -45,6 +45,8 @@ exports.EMPTY_SPACE_RE = /[\s]+/g;
45
45
  exports.EMPTY_LINE_RE = /[\n\r]*/g;
46
46
  exports.IMPORT_CSS_RE = /(?<!['"`])import\s+['"](\.{1,2}\/.+\.css)['"]\s*;?(?!\s*['"`])/g;
47
47
  exports.IMPORT_LESS_RE = /(?<!['"`])import\s+['"](\.{1,2}\/.+\.less)['"]\s*;?(?!\s*['"`])/g;
48
+ exports.REQUIRE_CSS_RE = /(?<!['"`])require\(\s*['"](\.{1,2}\/.+\.css)['"]\s*\);?(?!\s*['"`])/g;
49
+ exports.REQUIRE_LESS_RE = /(?<!['"`])require\(\s*['"](\.{1,2}\/.+\.less)['"]\s*\);?(?!\s*['"`])/g;
48
50
  exports.STYLE_IMPORT_RE = /@import\s+['"](.+)['"]\s*;/g;
49
51
  var clearEmptyLine = function (s) { return s.replace(exports.EMPTY_LINE_RE, '').replace(exports.EMPTY_SPACE_RE, ' '); };
50
52
  exports.clearEmptyLine = clearEmptyLine;
@@ -63,14 +65,19 @@ function extractStyleDependencies(file, code, reg, expect, self) {
63
65
  var styleImports = (_a = code.match(reg)) !== null && _a !== void 0 ? _a : [];
64
66
  var cssFile = (0, path_1.resolve)(dir, './style/index.js');
65
67
  var lessFile = (0, path_1.resolve)(dir, './style/less.js');
68
+ var modules = process.env.BABEL_MODULE;
66
69
  styleImports.forEach(function (styleImport) {
67
70
  var normalizedPath = normalizeStyleDependency(styleImport, reg);
68
- (0, fsUtils_1.smartAppendFileSync)(cssFile, "import '" + normalizedPath + ".css'\n");
69
- (0, fsUtils_1.smartAppendFileSync)(lessFile, "import '" + normalizedPath + "." + expect + "'\n");
71
+ (0, fsUtils_1.smartAppendFileSync)(cssFile, modules === 'commonjs' ? "require('" + normalizedPath + ".css')\n" : "import '" + normalizedPath + ".css'\n");
72
+ (0, fsUtils_1.smartAppendFileSync)(lessFile, modules === 'commonjs' ? "require('" + normalizedPath + "." + expect + "')\n" : "import '" + normalizedPath + "." + expect + "'\n");
70
73
  });
71
74
  if (self) {
72
- (0, fsUtils_1.smartAppendFileSync)(cssFile, "import '" + normalizeStyleDependency(base, reg) + ".css'\n");
73
- (0, fsUtils_1.smartAppendFileSync)(lessFile, "import '" + normalizeStyleDependency(base, reg) + "." + expect + "'\n");
75
+ (0, fsUtils_1.smartAppendFileSync)(cssFile, modules === 'commonjs'
76
+ ? "require('" + normalizeStyleDependency(base, reg) + ".css')\n"
77
+ : "import '" + normalizeStyleDependency(base, reg) + ".css'\n");
78
+ (0, fsUtils_1.smartAppendFileSync)(lessFile, modules === 'commonjs'
79
+ ? "require('" + normalizeStyleDependency(base, reg) + "." + expect + "')\n"
80
+ : "import '" + normalizeStyleDependency(base, reg) + "." + expect + "'\n");
74
81
  }
75
82
  return code.replace(reg, '');
76
83
  }
package/lib/config/babel.config.js CHANGED
@@ -5,13 +5,13 @@ module.exports = function (api, options) {
5
5
  if (api) {
6
6
  api.cache.never();
7
7
  }
8
- var isTest = process.env.NODE_ENV === 'test';
8
+ var isCommonJS = process.env.NODE_ENV === 'test' || process.env.BABEL_MODULE === 'commonjs';
9
9
  return {
10
10
  presets: [
11
11
  [
12
12
  require.resolve('@babel/preset-env'),
13
13
  {
14
- modules: isTest ? 'commonjs' : false,
14
+ modules: isCommonJS ? 'commonjs' : false,
15
15
  loose: options.loose,
16
16
  },
17
17
  ],
package/lib/shared/constant.d.ts CHANGED
@@ -2,6 +2,7 @@ export declare const CWD: string;
2
2
  export declare const VARLET_CONFIG: string;
3
3
  export declare const SRC_DIR: string;
4
4
  export declare const ES_DIR: string;
5
+ export declare const LIB_DIR: string;
5
6
  export declare const UMD_DIR: string;
6
7
  export declare const TYPES_DIR: string;
7
8
  export declare const ROOT_DOCS_DIR: string;
package/lib/shared/constant.js CHANGED
@@ -1,11 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- 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;
3
+ 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;
4
4
  var path_1 = require("path");
5
5
  exports.CWD = process.cwd();
6
6
  exports.VARLET_CONFIG = (0, path_1.resolve)(exports.CWD, 'varlet.config.js');
7
7
  exports.SRC_DIR = (0, path_1.resolve)(exports.CWD, 'src');
8
8
  exports.ES_DIR = (0, path_1.resolve)(exports.CWD, 'es');
9
+ exports.LIB_DIR = (0, path_1.resolve)(exports.CWD, 'lib');
9
10
  exports.UMD_DIR = (0, path_1.resolve)(exports.CWD, 'umd');
10
11
  exports.TYPES_DIR = (0, path_1.resolve)(exports.CWD, 'types');
11
12
  exports.ROOT_DOCS_DIR = (0, path_1.resolve)(exports.CWD, 'docs');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@varlet/cli",
3
- "version": "1.23.3",
3
+ "version": "1.23.4-alpha.3+2b5b1bde",
4
4
  "description": "cli of varlet",
5
5
  "bin": {
6
6
  "varlet-cli": "./lib/index.js"
@@ -31,7 +31,7 @@
31
31
  "dev": "tsc --watch",
32
32
  "build": "tsc"
33
33
  },
34
- "gitHead": "9c3f547600e2e75489bb025c1a5525f946f375a5",
34
+ "gitHead": "2b5b1bde5e1c16d4e58ce2a100ae4a1a3cc428ce",
35
35
  "dependencies": {
36
36
  "@babel/core": "^7.14.8",
37
37
  "@babel/preset-env": "^7.14.8",