@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211118001 → 3.0.0-alpha-3021320211118002

package/dist/json/manifest.d.ts

@@ -23,4 +23,5 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
     mode?: 'history' | 'hash';
     base?: string;
 };
+export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
 export {};

package/dist/json/manifest.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRouterOptions = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.isEnableTreeShaking = exports.getRouterOptions = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -52,3 +52,8 @@ function getRouterOptions(manifestJson) {
     return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.router);
 }
 exports.getRouterOptions = getRouterOptions;
+function isEnableTreeShaking(manifestJson) {
+    var _a, _b, _c;
+    return ((_c = (_b = (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.optimization) === null || _b === void 0 ? void 0 : _b.treeShaking) === null || _c === void 0 ? void 0 : _c.enable) !== false;
+}
+exports.isEnableTreeShaking = isEnableTreeShaking;

package/dist/vite/plugins/inject.js

@@ -22,6 +22,7 @@ function uniViteInjectPlugin(options) {
     delete modules.exclude;
     delete modules.sourceMap;
     delete modules.callback;
+    const reassignments = new Set();
     const modulesMap = new Map();
     const namespaceModulesMap = new Map();
     Object.keys(modules).forEach((name) => {
@@ -76,7 +77,7 @@ function uniViteInjectPlugin(options) {
             let scope = (0, pluginutils_1.attachScopes)(ast, 'scope');
             const magicString = new magic_string_1.default(code);
             const newImports = new Map();
-            function handleReference(node, name, keypath) {
+            function handleReference(node, name, keypath, parent) {
                 let mod = modulesMap.get(keypath);
                 if (!mod && hasNamespace) {
                     const mods = keypath.split('.');
@@ -104,6 +105,14 @@ function uniViteInjectPlugin(options) {
                     if (mod[0] === id)
                         return false;
                     const hash = `${keypath}:${mod[0]}:${mod[1]}`;
+                    // 当 API 被覆盖定义后，不再摇树
+                    if (reassignments.has(hash)) {
+                        return false;
+                    }
+                    if (parent && (0, utils_1.isAssignmentExpression)(parent)) {
+                        reassignments.add(hash);
+                        return false;
+                    }
                     const importLocalName = name === keypath ? name : (0, pluginutils_1.makeLegalIdentifier)(`$inject_${keypath}`);
                     if (!newImports.has(hash)) {
                         if (mod[1] === '*') {
@@ -140,7 +149,7 @@ function uniViteInjectPlugin(options) {
                     }
                     if ((0, utils_1.isReference)(node, parent)) {
                         const { name, keypath } = flatten(node);
-                        const handled = handleReference(node, name, keypath);
+                        const handled = handleReference(node, name, keypath, parent);
                         if (handled) {
                             this.skip();
                         }

package/dist/vite/utils/ast.d.ts

@@ -1,7 +1,8 @@
-import type { Literal, BaseNode, Property, Identifier, CallExpression, MemberExpression, MethodDefinition, ExportSpecifier } from 'estree';
+import type { Literal, BaseNode, Property, Identifier, CallExpression, AssignmentExpression, MemberExpression, MethodDefinition, ExportSpecifier } from 'estree';
 import { Node, ElementNode, DirectiveNode, SimpleExpressionNode } from '@vue/compiler-core';
 export declare const isProperty: (node: BaseNode) => node is Property;
 export declare const isIdentifier: (node: BaseNode) => node is Identifier;
+export declare const isAssignmentExpression: (node: BaseNode) => node is AssignmentExpression;
 export declare const isCallExpression: (node: BaseNode) => node is CallExpression;
 export declare const isMemberExpression: (node: BaseNode) => node is MemberExpression;
 export declare const isMethodDefinition: (node: BaseNode) => node is MethodDefinition;

package/dist/vite/utils/ast.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isIdentifier = exports.isProperty = void 0;
+exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isAssignmentExpression = exports.isIdentifier = exports.isProperty = void 0;
 const compiler_dom_1 = require("@vue/compiler-dom");
 const isProperty = (node) => node.type === 'Property';
 exports.isProperty = isProperty;
 const isIdentifier = (node) => node.type === 'Identifier';
 exports.isIdentifier = isIdentifier;
+const isAssignmentExpression = (node) => node.type === 'AssignmentExpression';
+exports.isAssignmentExpression = isAssignmentExpression;
 const isCallExpression = (node) => node.type === 'CallExpression';
 exports.isCallExpression = isCallExpression;
 const isMemberExpression = (node) => node.type === 'MemberExpression';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3021320211118001",
+  "version": "3.0.0-alpha-3021320211118002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@babel/parser": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211118001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211118001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211118002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211118002",
     "@rollup/pluginutils": "^4.1.1",
     "@vue/compiler-core": "3.2.22",
     "@vue/compiler-dom": "3.2.22",