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

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/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 utils_2 = require("../../vite/utils/utils");
 const debugConsole = (0, debug_1.default)('vite:uni:console');
 function uniConsolePlugin(options) {
     const filter = (0, pluginutils_1.createFilter)(options.include, options.exclude);
+    let resolvedConfig;
     return {
         name: 'vite: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/inject.js

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030520211229003",
+  "version": "3.0.0-alpha-3030520211229004",
   "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-3030520211229004",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030520211229004",
     "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.26",
     "@vue/compiler-dom": "3.2.26",