@varlet/cli 2.7.0-alpha.1673633577294 → 2.7.0-alpha.1673640473187

package/lib/node/commands/compile.js

@@ -27,9 +27,6 @@ export async function compile() {
     process.env.TARGET_MODULE = 'module';
     process.env.BABEL_MODULE = 'module';
     await runTask('module', compileModule);
-    process.env.TARGET_MODULE = 'commonjs';
-    process.env.BABEL_MODULE = 'commonjs';
-    await runTask('commonjs', compileModule);
     process.env.BABEL_MODULE = '';
     process.env.TARGET_MODULE = 'bundle';
     await runTask('bundle', compileModule);

package/lib/node/compiler/compileModule.js

@@ -4,7 +4,7 @@ import { resolve } from 'path';
 import { EXAMPLE_DIR_NAME, TESTS_DIR_NAME, DOCS_DIR_NAME, SRC_DIR, ES_DIR, STYLE_DIR_NAME, LIB_DIR, UMD_DIR, } from '../shared/constant.js';
 import { getPublicDirs, isDir, isDTS, isLess, isScript, isSFC } from '../shared/fsUtils.js';
 import { compileSFC } from './compileSFC.js';
-import { compileESEntry, compileCommonJSEntry, compileScriptFile, getScriptExtname } from './compileScript.js';
+import { compileESEntry, compileScriptFile, getScriptExtname } from './compileScript.js';
 import { clearLessFiles, compileLess } from './compileStyle.js';
 import { getBundleConfig } from '../config/vite.config.js';
 import { getVarletConfig } from '../config/varlet.config.js';
@@ -61,7 +61,7 @@ export async function compileModule() {
         await compileBundle();
         return;
     }
-    const dest = targetModule === 'commonjs' ? LIB_DIR : ES_DIR;
+    const dest = ES_DIR;
     await copy(SRC_DIR, dest);
     const moduleDir = await readdir(dest);
     await Promise.all(moduleDir.map((filename) => {
@@ -70,12 +70,7 @@ export async function compileModule() {
         return isDir(file) ? compileDir(file) : null;
     }));
     const publicDirs = await getPublicDirs();
-    if (targetModule === 'commonjs') {
-        await compileCommonJSEntry(dest, publicDirs);
-    }
-    else {
-        await compileESEntry(dest, publicDirs);
-    }
+    await compileESEntry(dest, publicDirs);
     clearLessFiles(dest);
     generateReference(dest);
 }

package/lib/node/compiler/compileScript.d.ts

@@ -1,7 +1,6 @@
 export declare const IMPORT_FROM_DEPENDENCE_RE: RegExp;
 export declare const EXPORT_FROM_DEPENDENCE_RE: RegExp;
 export declare const IMPORT_DEPENDENCE_RE: RegExp;
-export declare const REQUIRE_DEPENDENCE_RE: RegExp;
 export declare const scriptExtNames: string[];
 export declare const styleExtNames: string[];
 export declare const scriptIndexes: string[];
@@ -11,6 +10,5 @@ export declare const resolveDependence: (file: string, script: string) => string
 export declare const moduleCompatible: (script: string) => Promise<string>;
 export declare function compileScript(script: string, file: string): Promise<void>;
 export declare function compileScriptFile(file: string): Promise<void>;
-export declare function getScriptExtname(): ".js" | ".mjs";
+export declare function getScriptExtname(): string;
 export declare function compileESEntry(dir: string, publicDirs: string[]): Promise<void>;
-export declare function compileCommonJSEntry(dir: string, publicDirs: string[]): Promise<void>;

package/lib/node/compiler/compileScript.js

@@ -13,8 +13,6 @@ export const IMPORT_FROM_DEPENDENCE_RE = /import\s+?[\w\s{},$*]+\s+from\s+?(".*?
 export const EXPORT_FROM_DEPENDENCE_RE = /export\s+?[\w\s{},$*]+\s+from\s+?(".*?"|'.*?')/g;
 // https://regexr.com/764ve
 export const IMPORT_DEPENDENCE_RE = /import\s+(".*?"|'.*?')/g;
-// https://regexr.com/764vn
-export const REQUIRE_DEPENDENCE_RE = /require\((".*?"|'.*?')\)/g;
 export const scriptExtNames = ['.vue', '.ts', '.tsx', '.mjs', '.js', '.jsx'];
 export const styleExtNames = ['.less', '.css'];
 export const scriptIndexes = ['index.mjs', 'index.vue', 'index.ts', 'index.tsx', 'index.js', 'index.jsx'];
@@ -80,8 +78,7 @@ export const resolveDependence = (file, script) => {
     return script
         .replace(IMPORT_FROM_DEPENDENCE_RE, replacer)
         .replace(EXPORT_FROM_DEPENDENCE_RE, replacer)
-        .replace(IMPORT_DEPENDENCE_RE, replacer)
-        .replace(REQUIRE_DEPENDENCE_RE, replacer);
+        .replace(IMPORT_DEPENDENCE_RE, replacer);
 };
 export const moduleCompatible = async (script) => {
     const moduleCompatible = get(await getVarletConfig(), 'moduleCompatible', {});
@@ -112,10 +109,7 @@ export async function compileScriptFile(file) {
     await compileScript(sources, file);
 }
 export function getScriptExtname() {
-    if (process.env.TARGET_MODULE === 'module') {
-        return '.mjs';
-    }
-    return '.js';
+    return '.mjs';
 }
 export async function compileESEntry(dir, publicDirs) {
     const imports = [];
@@ -183,54 +177,3 @@ export default {
         writeFile(resolve(dir, 'style.mjs'), styleTemplate, 'utf-8'),
     ]);
 }
-export async function compileCommonJSEntry(dir, publicDirs) {
-    const requires = [];
-    const plugins = [];
-    const cssRequires = [];
-    const publicComponents = [];
-    const exports = [];
-    publicDirs.forEach((dirname) => {
-        const publicComponent = bigCamelize(dirname);
-        const module = `'./${dirname}/index.js'`;
-        publicComponents.push(publicComponent);
-        requires.push(`var ${publicComponent} = require(${module})['default']`);
-        exports.push(`...ignoreDefault(require(${module}))`);
-        plugins.push(`${publicComponent}.install && app.use(${publicComponent})`);
-        cssRequires.push(`require('./${dirname}/style/index.js')`);
-    });
-    const version = `const version = '${getVersion()}'`;
-    const install = `
-function install(app) {
-  ${plugins.join('\n  ')}
-}
-`;
-    const indexTemplate = `\
-${requires.join('\n')}\n
-${version}
-${install}
-
-function ignoreDefault(module) {
-  return Object.keys(module).reduce((exports, key) => {
-    if (key !== 'default') {
-      exports[key] = module[key]
-    }
-
-    return exports
-  }, {})
-}
-
-module.exports = {
-  version,
-  install,
-  ${exports.join(',\n  ')},
-  ${publicComponents.join(',\n  ')}
-}
-`;
-    const styleTemplate = `\
-${cssRequires.join('\n')}
-`;
-    await Promise.all([
-        writeFile(resolve(dir, 'index.js'), indexTemplate, 'utf-8'),
-        writeFile(resolve(dir, 'style.js'), styleTemplate, 'utf-8'),
-    ]);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.7.0-alpha.1673633577294",
+  "version": "2.7.0-alpha.1673640473187",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -66,8 +66,8 @@
     "vite": "4.0.4",
     "vue": "3.2.25",
     "vue-jest": "^5.0.0-alpha.8",
-    "@varlet/vite-plugins": "2.7.0-alpha.1673633577294",
-    "@varlet/shared": "2.7.0-alpha.1673633577294"
+    "@varlet/vite-plugins": "2.7.0-alpha.1673640473187",
+    "@varlet/shared": "2.7.0-alpha.1673640473187"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.12",
@@ -79,8 +79,8 @@
     "@types/node": "^18.7.20",
     "@types/semver": "^7.3.9",
     "@types/inquirer": "^9.0.2",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673633577294",
-    "@varlet/icons": "2.7.0-alpha.1673633577294"
+    "@varlet/touch-emulator": "2.7.0-alpha.1673640473187",
+    "@varlet/icons": "2.7.0-alpha.1673640473187"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.2.16",
@@ -90,8 +90,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.2.25",
     "vue-router": "4.0.12",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673633577294",
-    "@varlet/icons": "2.7.0-alpha.1673633577294"
+    "@varlet/icons": "2.7.0-alpha.1673640473187",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673640473187"
   },
   "scripts": {
     "dev": "tsc --watch",