@varlet/cli 2.7.0-alpha.1673623558342 → 2.7.0-alpha.1673624403817

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

@@ -1,4 +1,5 @@
 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[];

package/lib/node/compiler/compileScript.js

@@ -9,6 +9,8 @@ import { getVarletConfig } from '../config/varlet.config.js';
 const { writeFileSync, readdirSync, readFileSync, removeSync, writeFile, pathExistsSync } = fse;
 // https://regexr.com/765a4
 export const IMPORT_FROM_DEPENDENCE_RE = /import\s+?[\w\s{},$*]+\s+from\s+?(".*?"|'.*?')/g;
+// https://regexr.com/767e6
+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
@@ -77,6 +79,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);
 };
@@ -156,7 +159,7 @@ export default {
     const styleTemplate = `\
 ${cssImports.join('\n')}
 `;
-    const umdTemplate = `\
+    const bundleTemplate = `\
 ${imports.join('\n')}\n
 ${cssImports.join('\n')}\n
 ${version}
@@ -175,7 +178,7 @@ export default {
 `;
     await Promise.all([
         writeFile(resolve(dir, 'index.mjs'), indexTemplate, 'utf-8'),
-        writeFile(resolve(dir, 'index.umd.mjs'), umdTemplate, 'utf-8'),
+        writeFile(resolve(dir, 'index.bundle.mjs'), bundleTemplate, 'utf-8'),
         writeFile(resolve(dir, 'style.mjs'), styleTemplate, 'utf-8'),
     ]);
 }

package/lib/node/config/vite.config.js

@@ -1,11 +1,9 @@
-import fse from 'fs-extra';
 import vue from '@vitejs/plugin-vue';
 import jsx from '@vitejs/plugin-vue-jsx';
 import { markdown, html, inlineCss } from '@varlet/vite-plugins';
 import { ES_DIR, SITE_CONFIG, SITE_DIR, SITE_MOBILE_ROUTES, SITE_OUTPUT_PATH, SITE_PC_ROUTES, SITE_PUBLIC_PATH, VITE_RESOLVE_EXTENSIONS, } from '../shared/constant.js';
 import { get } from 'lodash-es';
 import { resolve } from 'path';
-const { copyFileSync, removeSync } = fse;
 export function getDevConfig(varletConfig) {
     const defaultLanguage = get(varletConfig, 'defaultLanguage');
     const host = get(varletConfig, 'host');
@@ -76,7 +74,7 @@ export function getBundleConfig(varletConfig, buildOptions) {
                 name,
                 formats: [format],
                 fileName: () => fileName,
-                entry: resolve(ES_DIR, 'index.umd.mjs'),
+                entry: resolve(ES_DIR, 'index.bundle.mjs'),
             },
             rollupOptions: {
                 external: ['vue'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.7.0-alpha.1673623558342",
+  "version": "2.7.0-alpha.1673624403817",
   "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.1673623558342",
-    "@varlet/shared": "2.7.0-alpha.1673623558342"
+    "@varlet/vite-plugins": "2.7.0-alpha.1673624403817",
+    "@varlet/shared": "2.7.0-alpha.1673624403817"
   },
   "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/icons": "2.7.0-alpha.1673623558342",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673623558342"
+    "@varlet/touch-emulator": "2.7.0-alpha.1673624403817",
+    "@varlet/icons": "2.7.0-alpha.1673624403817"
   },
   "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/icons": "2.7.0-alpha.1673623558342",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673623558342"
+    "@varlet/icons": "2.7.0-alpha.1673624403817",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673624403817"
   },
   "scripts": {
     "dev": "tsc --watch",