@dcloudio/uni-cli-shared 3.0.0-alpha-3030520211229003 → 3.0.0-alpha-3030720220111003

package/dist/checkUpdate.js

@@ -14,7 +14,7 @@ const compare_versions_1 = __importDefault(require("compare-versions"));
 const shared_1 = require("@vue/shared");
 const json_1 = require("./json");
 const hbx_1 = require("./hbx");
-const debugCheckUpdate = (0, debug_1.default)('vite:uni:check-update');
+const debugCheckUpdate = (0, debug_1.default)('uni:check-update');
 const INTERVAL = 1000 * 60 * 60 * 24;
 async function checkUpdate(options) {
     if (process.env.CI) {

package/dist/easycom.js

@@ -13,7 +13,7 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
-const debugEasycom = (0, debug_1.default)('vite:uni:easycom');
+const debugEasycom = (0, debug_1.default)('uni:easycom');
 const easycoms = [];
 const easycomsCache = new Map();
 const easycomsInvalidCache = new Set();

package/dist/logs/console.d.ts

@@ -1 +1,4 @@
-export declare function rewriteConsoleExpr(filename: string, code: string): string;
+export declare function rewriteConsoleExpr(id: string, filename: string, code: string, sourceMap?: boolean): {
+    code: string;
+    map: import("magic-string").SourceMap | null;
+};

package/dist/logs/console.js

@@ -7,7 +7,7 @@ exports.rewriteConsoleExpr = void 0;
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const F = '__f__';
-function rewriteConsoleExpr(filename, code) {
+function rewriteConsoleExpr(id, filename, code, sourceMap = false) {
     filename = (0, utils_1.normalizePath)(filename);
     const re = /(console\.(log|info|debug|warn|error))\(([^)]+)\)/g;
     const locate = getLocator(code);
@@ -17,7 +17,10 @@ function rewriteConsoleExpr(filename, code) {
         const [, expr, type] = match;
         s.overwrite(match.index, match.index + expr.length + 1, F + `('${type}','at ${filename}:${locate(match.index).line + 1}',`);
     }
-    return s.toString();
+    return {
+        code: s.toString(),
+        map: sourceMap ? s.generateMap({ source: id, hires: true }) : null,
+    };
 }
 exports.rewriteConsoleExpr = rewriteConsoleExpr;
 function getLocator(source) {

package/dist/mp/ast.d.ts

@@ -0,0 +1,4 @@
+import { ParserPlugin } from '@babel/parser';
+export declare function parseProgram(code: string, importer: string, { babelParserPlugins }: {
+    babelParserPlugins?: ParserPlugin[];
+}): import("@babel/types").Program;

package/dist/mp/ast.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseProgram = void 0;
+const parser_1 = require("@babel/parser");
+const utils_1 = require("../utils");
+function parseProgram(code, importer, { babelParserPlugins }) {
+    return (0, parser_1.parse)(code, {
+        plugins: (0, utils_1.normalizeParsePlugins)(importer, babelParserPlugins),
+        sourceType: 'module',
+    }).program;
+}
+exports.parseProgram = parseProgram;

package/dist/mp/externalClasses.d.ts

@@ -0,0 +1,5 @@
+import { Program } from '@babel/types';
+export declare function hasExternalClasses(code: string): boolean;
+export declare function findMiniProgramComponentExternalClasses(filename: string): string[] | undefined;
+export declare function updateMiniProgramComponentExternalClasses(filename: string, classes: string[]): void;
+export declare function parseExternalClasses(ast: Program): string[];

package/dist/mp/externalClasses.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseExternalClasses = exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.hasExternalClasses = void 0;
+const types_1 = require("@babel/types");
+const estree_walker_1 = require("estree-walker");
+const externalClassesCache = new Map();
+function hasExternalClasses(code) {
+    return code.includes('externalClasses');
+}
+exports.hasExternalClasses = hasExternalClasses;
+function findMiniProgramComponentExternalClasses(filename) {
+    return externalClassesCache.get(filename);
+}
+exports.findMiniProgramComponentExternalClasses = findMiniProgramComponentExternalClasses;
+function updateMiniProgramComponentExternalClasses(filename, classes) {
+    externalClassesCache.set(filename, classes);
+}
+exports.updateMiniProgramComponentExternalClasses = updateMiniProgramComponentExternalClasses;
+function parseExternalClasses(ast) {
+    const classes = [];
+    estree_walker_1.walk(ast, {
+        enter(child, parent) {
+            if (!(0, types_1.isIdentifier)(child) || child.name !== 'externalClasses') {
+                return;
+            }
+            // export default { externalClasses: ['my-class'] }
+            if (!(0, types_1.isObjectProperty)(parent)) {
+                return;
+            }
+            if (!(0, types_1.isArrayExpression)(parent.value)) {
+                return;
+            }
+            parent.value.elements.forEach((element) => {
+                if ((0, types_1.isStringLiteral)(element)) {
+                    classes.push(element.value);
+                }
+            });
+        },
+    });
+    return classes;
+}
+exports.parseExternalClasses = parseExternalClasses;

package/dist/mp/index.d.ts

@@ -1,3 +1,4 @@
+export * from './ast';
 export * from './nvue';
 export * from './event';
 export * from './style';
@@ -5,4 +6,5 @@ export * from './template';
 export * from './constants';
 export { HTML_TO_MINI_PROGRAM_TAGS } from './tags';
 export { copyMiniProgramPluginJson } from './plugin';
-export { parseProgram, parseMainDescriptor, parseScriptDescriptor, parseTemplateDescriptor, transformDynamicImports, updateMiniProgramGlobalComponents, updateMiniProgramComponentsByMainFilename, updateMiniProgramComponentsByScriptFilename, updateMiniProgramComponentsByTemplateFilename, } from './usingComponents';
+export { parseMainDescriptor, parseScriptDescriptor, parseTemplateDescriptor, transformDynamicImports, updateMiniProgramGlobalComponents, updateMiniProgramComponentsByMainFilename, updateMiniProgramComponentsByScriptFilename, updateMiniProgramComponentsByTemplateFilename, } from './usingComponents';
+export { hasExternalClasses, parseExternalClasses, findMiniProgramComponentExternalClasses, updateMiniProgramComponentExternalClasses, } from './externalClasses';

package/dist/mp/index.js

@@ -10,7 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.parseProgram = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
+exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.parseExternalClasses = exports.hasExternalClasses = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
+__exportStar(require("./ast"), exports);
 __exportStar(require("./nvue"), exports);
 __exportStar(require("./event"), exports);
 __exportStar(require("./style"), exports);
@@ -21,7 +22,6 @@ Object.defineProperty(exports, "HTML_TO_MINI_PROGRAM_TAGS", { enumerable: true,
 var plugin_1 = require("./plugin");
 Object.defineProperty(exports, "copyMiniProgramPluginJson", { enumerable: true, get: function () { return plugin_1.copyMiniProgramPluginJson; } });
 var usingComponents_1 = require("./usingComponents");
-Object.defineProperty(exports, "parseProgram", { enumerable: true, get: function () { return usingComponents_1.parseProgram; } });
 Object.defineProperty(exports, "parseMainDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseMainDescriptor; } });
 Object.defineProperty(exports, "parseScriptDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseScriptDescriptor; } });
 Object.defineProperty(exports, "parseTemplateDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseTemplateDescriptor; } });
@@ -30,3 +30,8 @@ Object.defineProperty(exports, "updateMiniProgramGlobalComponents", { enumerable
 Object.defineProperty(exports, "updateMiniProgramComponentsByMainFilename", { enumerable: true, get: function () { return usingComponents_1.updateMiniProgramComponentsByMainFilename; } });
 Object.defineProperty(exports, "updateMiniProgramComponentsByScriptFilename", { enumerable: true, get: function () { return usingComponents_1.updateMiniProgramComponentsByScriptFilename; } });
 Object.defineProperty(exports, "updateMiniProgramComponentsByTemplateFilename", { enumerable: true, get: function () { return usingComponents_1.updateMiniProgramComponentsByTemplateFilename; } });
+var externalClasses_1 = require("./externalClasses");
+Object.defineProperty(exports, "hasExternalClasses", { enumerable: true, get: function () { return externalClasses_1.hasExternalClasses; } });
+Object.defineProperty(exports, "parseExternalClasses", { enumerable: true, get: function () { return externalClasses_1.parseExternalClasses; } });
+Object.defineProperty(exports, "findMiniProgramComponentExternalClasses", { enumerable: true, get: function () { return externalClasses_1.findMiniProgramComponentExternalClasses; } });
+Object.defineProperty(exports, "updateMiniProgramComponentExternalClasses", { enumerable: true, get: function () { return externalClasses_1.updateMiniProgramComponentExternalClasses; } });

package/dist/mp/usingComponents.d.ts

@@ -1,13 +1,9 @@
 import { ImportDeclaration, Program } from '@babel/types';
-import { ParserPlugin } from '@babel/parser';
 import type { PluginContext } from 'rollup';
 declare type BindingComponents = Record<string, {
     tag: string;
     type: 'unknown' | 'setup' | 'self';
 }>;
-export declare function parseProgram(code: string, importer: string, { babelParserPlugins }: {
-    babelParserPlugins?: ParserPlugin[];
-}): Program;
 interface MainDescriptor {
     imports: ImportDeclaration[];
     script: string;

package/dist/mp/usingComponents.js

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformDynamicImports = exports.parseScriptDescriptor = exports.parseTemplateDescriptor = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.parseMainDescriptor = exports.parseProgram = void 0;
+exports.transformDynamicImports = exports.parseScriptDescriptor = exports.parseTemplateDescriptor = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.parseMainDescriptor = void 0;
 const types_1 = require("@babel/types");
-const parser_1 = require("@babel/parser");
 const estree_walker_1 = require("estree-walker");
 const magic_string_1 = __importDefault(require("magic-string"));
 const shared_1 = require("@vue/shared");
@@ -15,13 +14,6 @@ const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const utils_2 = require("../vite/utils");
 const jsonFile_1 = require("../json/mp/jsonFile");
-function parseProgram(code, importer, { babelParserPlugins }) {
-    return (0, parser_1.parse)(code, {
-        plugins: (0, utils_1.normalizeParsePlugins)(importer, babelParserPlugins),
-        sourceType: 'module',
-    }).program;
-}
-exports.parseProgram = parseProgram;
 const mainDescriptors = new Map();
 const scriptDescriptors = new Map();
 const templateDescriptors = new Map();

package/dist/scripts.js

@@ -4,27 +4,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScripts = void 0;
+const shared_1 = require("@vue/shared");
 const fs_1 = __importDefault(require("fs"));
 function parseScripts(name, pkgPath) {
-    var _a, _b, _c;
+    var _a, _b;
     if (!fs_1.default.existsSync(pkgPath)) {
         return;
     }
     const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf8'));
-    const options = (_b = (_a = pkg['uni-app']) === null || _a === void 0 ? void 0 : _a.scripts) === null || _b === void 0 ? void 0 : _b[name];
+    const scripts = ((_a = pkg['uni-app']) === null || _a === void 0 ? void 0 : _a.scripts) || {};
+    const options = scripts[name];
     if (!options) {
         return;
     }
-    if (!((_c = options.env) === null || _c === void 0 ? void 0 : _c.UNI_PLATFORM)) {
+    if (!((_b = options.env) === null || _b === void 0 ? void 0 : _b.UNI_PLATFORM)) {
         console.error(`package.json->uni-app->scripts->${name}->env->UNI_PLATFORM is required`);
         process.exit(0);
     }
     const { UNI_PLATFORM, ...define } = options.env;
+    const context = options.define || {};
+    // 补充当前编译环境未定义的其他编译环境 define
+    Object.keys(scripts).forEach((scriptName) => {
+        if (scriptName !== name) {
+            const scriptDefine = scripts[scriptName].define || {};
+            Object.keys(scriptDefine).forEach((key) => {
+                if (!(0, shared_1.hasOwn)(context, key)) {
+                    context[key] = false;
+                }
+            });
+        }
+    });
     return {
         name: name,
         platform: UNI_PLATFORM,
         define,
-        context: options.define || {},
+        context,
     };
 }
 exports.parseScripts = parseScripts;

package/dist/vite/plugins/console.js

@@ -8,12 +8,17 @@ const debug_1 = __importDefault(require("debug"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
 const console_1 = require("../../logs/console");
-const debugConsole = (0, debug_1.default)('vite:uni:console');
+const utils_2 = require("../../vite/utils/utils");
+const debugConsole = (0, debug_1.default)('uni:console');
 function uniConsolePlugin(options) {
     const filter = (0, pluginutils_1.createFilter)(options.include, options.exclude);
+    let resolvedConfig;
     return {
-        name: 'vite:uni-console',
+        name: 'uni:console',
         enforce: 'pre',
+        configResolved(config) {
+            resolvedConfig = config;
+        },
         transform(code, id) {
             if (!filter(id))
                 return null;
@@ -30,10 +35,7 @@ function uniConsolePlugin(options) {
                 return null;
             }
             debugConsole(id);
-            return {
-                code: (0, console_1.rewriteConsoleExpr)(filename, code),
-                map: null,
-            };
+            return (0, console_1.rewriteConsoleExpr)(id, filename, code, (0, utils_2.withSourcemap)(resolvedConfig));
         },
     };
 }

package/dist/vite/plugins/copy.js

@@ -7,7 +7,7 @@ function uniViteCopyPlugin({ targets, verbose, }) {
     let resolvedConfig;
     let inited = false;
     return {
-        name: 'vite:uni-copy',
+        name: 'uni:copy',
         apply: 'build',
         configResolved(config) {
             resolvedConfig = config;

package/dist/vite/plugins/cssScoped.js

@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const constants_1 = require("../../constants");
 const preprocess_1 = require("../../preprocess");
-const debugScoped = (0, debug_1.default)('vite:uni:scoped');
+const debugScoped = (0, debug_1.default)('uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
 function addScoped(code) {
     if (SCOPED_RE.test(code)) {
@@ -18,7 +18,7 @@ function addScoped(code) {
 }
 function uniCssScopedPlugin({ filter } = { filter: () => false }) {
     return {
-        name: 'vite:uni-css-scoped',
+        name: 'uni:css-scoped',
         enforce: 'pre',
         transform(code, id) {
             if (!filter(id))

package/dist/vite/plugins/inject.js

@@ -11,8 +11,8 @@ const estree_walker_1 = require("estree-walker");
 const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
-const debugInject = (0, debug_1.default)('vite:uni:inject');
-const debugInjectTry = (0, debug_1.default)('vite:uni:inject-try');
+const debugInject = (0, debug_1.default)('uni:inject');
+const debugInjectTry = (0, debug_1.default)('uni:inject-try');
 function uniViteInjectPlugin(options) {
     if (!options)
         throw new Error('Missing options');
@@ -41,7 +41,7 @@ function uniViteInjectPlugin(options) {
     const sourceMap = options.sourceMap !== false;
     const callback = options.callback;
     return {
-        name: 'vite:uni-inject',
+        name: 'uni:inject',
         // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
         enforce: 'post',
         transform(code, id) {
@@ -111,7 +111,9 @@ function uniViteInjectPlugin(options) {
                     if (reassignments.has(hash)) {
                         return false;
                     }
-                    if (parent && (0, utils_1.isAssignmentExpression)(parent)) {
+                    if (parent &&
+                        (0, utils_1.isAssignmentExpression)(parent) &&
+                        parent.left === node) {
                         reassignments.add(hash);
                         return false;
                     }

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -501,6 +501,7 @@ async function minifyCSS(css, config) {
     const { code, warnings } = await (0, esbuild_1.transform)(css, {
         loader: 'css',
         minify: true,
+        target: config.build.cssTarget || undefined,
     });
     if (warnings.length) {
         const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });

package/dist/vite/utils/plugin.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removePlugins = exports.replacePlugins = exports.injectCssPostPlugin = exports.injectCssPlugin = exports.injectAssetPlugin = void 0;
+const shared_1 = require("@vue/shared");
 const asset_1 = require("../plugins/vitejs/plugins/asset");
 const css_1 = require("../plugins/vitejs/plugins/css");
 function injectAssetPlugin(config) {
@@ -12,7 +13,15 @@ function injectCssPlugin(config) {
 }
 exports.injectCssPlugin = injectCssPlugin;
 function injectCssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
-    replacePlugins([(0, css_1.cssPostPlugin)(config, { chunkCssFilename, chunkCssCode })], config);
+    const newCssPostPlugin = (0, css_1.cssPostPlugin)(config, {
+        chunkCssFilename,
+        chunkCssCode,
+    });
+    const oldCssPostPlugin = config.plugins.find((p) => p.name === newCssPostPlugin.name);
+    // 直接覆盖原有方法，不能删除，替换，因为 unocss 在 pre 阶段已经获取到了旧的 css-post 插件对象
+    if (oldCssPostPlugin) {
+        (0, shared_1.extend)(oldCssPostPlugin, newCssPostPlugin);
+    }
 }
 exports.injectCssPostPlugin = injectCssPostPlugin;
 function replacePlugins(plugins, config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030520211229003",
+  "version": "3.0.0-alpha-3030720220111003",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.16.5",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030520211229003",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030520211229003",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030720220111003",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030720220111003",
     "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.26",
     "@vue/compiler-dom": "3.2.26",