@dcloudio/uni-cli-shared 3.0.0-alpha-3030520211229001 → 3.0.0-alpha-3030720220111001

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export * from './filter';
 export * from './esbuild';
 export * from './resolve';
 export * from './scripts';
+export * from './platform';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./filter"), exports);
 __exportStar(require("./esbuild"), exports);
 __exportStar(require("./resolve"), exports);
 __exportStar(require("./scripts"), exports);
+__exportStar(require("./platform"), exports);
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/manifest.d.ts

@@ -24,4 +24,5 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
     base?: string;
 };
 export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
+export declare function getDevServerOptions(manifestJson: Record<string, any>): any;
 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.isEnableTreeShaking = exports.getRouterOptions = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.getDevServerOptions = 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");
@@ -57,3 +57,8 @@ function isEnableTreeShaking(manifestJson) {
     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;
+function getDevServerOptions(manifestJson) {
+    var _a;
+    return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.devServer);
+}
+exports.getDevServerOptions = getDevServerOptions;

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/template.d.ts

@@ -10,7 +10,8 @@ export interface MiniProgramCompilerOptions {
         }[];
     };
     event?: {
-        format(name: string, opts: {
+        key?: boolean;
+        format?(name: string, opts: {
             isCatch?: boolean;
             isCapture?: boolean;
             isComponent?: boolean;

package/dist/mp/usingComponents.d.ts

@@ -58,5 +58,12 @@ export declare function parseScriptDescriptor(filename: string, ast: Program, op
  * @param dynamicImport
  * @returns
  */
-export declare function transformDynamicImports(code: string, imports: ImportDeclaration[], dynamicImport: (name: string, source: string) => string): Promise<string>;
+export declare function transformDynamicImports(code: string, imports: ImportDeclaration[], { id, sourceMap, dynamicImport, }: {
+    id?: string;
+    sourceMap?: boolean;
+    dynamicImport: (name: string, source: string) => string;
+}): Promise<{
+    code: string;
+    map: null;
+}>;
 export {};

package/dist/mp/usingComponents.js

@@ -376,15 +376,21 @@ async function parseVueComponentImports(importer, imports, resolve) {
  * @param dynamicImport
  * @returns
  */
-async function transformDynamicImports(code, imports, dynamicImport) {
+async function transformDynamicImports(code, imports, { id, sourceMap, dynamicImport, }) {
     if (!imports.length) {
-        return code;
+        return {
+            code,
+            map: null,
+        };
     }
     const s = new magic_string_1.default(code);
     for (let i = 0; i < imports.length; i++) {
         const { start, end, specifiers: [specifier], source, } = imports[i];
         s.overwrite(start, end, dynamicImport(specifier.local.name, source.value) + ';');
     }
-    return s.toString();
+    return {
+        code: s.toString(),
+        map: null,
+    };
 }
 exports.transformDynamicImports = transformDynamicImports;

package/dist/platform.d.ts

@@ -0,0 +1,2 @@
+export declare function registerPlatform(platform: string): void;
+export declare function getPlatforms(): string[];

package/dist/platform.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPlatforms = exports.registerPlatform = void 0;
+const BUILT_IN_PLATFORMS = [
+    'app',
+    'app-plus',
+    'h5',
+    'mp-360',
+    'mp-alipay',
+    'mp-baidu',
+    'mp-jd',
+    'mp-kuaishou',
+    'mp-lark',
+    'mp-qq',
+    'mp-toutiao',
+    'mp-weixin',
+    'quickapp-webview',
+    'quickapp-webview-huawei',
+    'quickapp-webview-union',
+];
+const platforms = [...BUILT_IN_PLATFORMS];
+function registerPlatform(platform) {
+    if (!platforms.includes(platform)) {
+        platforms.push(platform);
+    }
+}
+exports.registerPlatform = registerPlatform;
+function getPlatforms() {
+    return platforms;
+}
+exports.getPlatforms = getPlatforms;

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/copy.d.ts

@@ -1,6 +1,9 @@
+import type { WatchOptions } from 'chokidar';
 import type { Plugin } from 'vite';
 import { FileWatcherOptions } from '../../watcher';
-export declare type UniViteCopyPluginTarget = Omit<FileWatcherOptions, 'verbose'>;
+export declare type UniViteCopyPluginTarget = Omit<FileWatcherOptions, 'verbose'> & {
+    watchOptions?: WatchOptions;
+};
 export interface UniViteCopyPluginOptions {
     targets: UniViteCopyPluginTarget[];
     verbose: boolean;

package/dist/vite/plugins/copy.js

@@ -21,13 +21,14 @@ function uniViteCopyPlugin({ targets, verbose, }) {
             }
             inited = true;
             return new Promise((resolve) => {
-                Promise.all(targets.map((target) => {
+                Promise.all(targets.map(({ watchOptions, ...target }) => {
                     return new Promise((resolve) => {
                         new watcher_1.FileWatcher({
                             verbose,
                             ...target,
                         }).watch({
                             cwd: process.env.UNI_INPUT_DIR,
+                            ...watchOptions,
                         }, (watcher) => {
                             if (process.env.NODE_ENV !== 'development') {
                                 // 生产模式下，延迟 close，否则会影响 chokidar 初始化的 add 等事件

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/dist/vite/plugins/vitejs/plugins/asset.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
+import type { OutputOptions, PluginContext, RenderedChunk } from 'rollup';
 import { Plugin } from '../plugin';
 import { ResolvedConfig } from '../config';
-import type { OutputOptions, PluginContext, RenderedChunk } from 'rollup';
 export declare const assetUrlRE: RegExp;
 export declare const chunkToEmittedAssetsMap: WeakMap<RenderedChunk, Set<string>>;
 /**

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

@@ -27,9 +27,10 @@ const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const lite_1 = __importDefault(require("mime/lite"));
 const fs_1 = __importStar(require("fs"));
-const utils_1 = require("../utils");
 const magic_string_1 = __importDefault(require("magic-string"));
 const crypto_1 = require("crypto");
+const utils_1 = require("../utils");
+const utils_2 = require("../../../../vite/utils/utils");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
 // urls in JS must be quoted as strings, so when replacing them we need
 // a different regex
@@ -99,7 +100,7 @@ function assetPlugin(config) {
             if (s) {
                 return {
                     code: s.toString(),
-                    map: config.build.sourcemap ? s.generateMap({ hires: true }) : null,
+                    map: (0, utils_2.withSourcemap)(config) ? s.generateMap({ hires: true }) : null,
                 };
             }
             else {

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/index.d.ts

@@ -2,5 +2,6 @@ import type { ResolvedConfig } from 'vite';
 export * from './ast';
 export * from './url';
 export * from './plugin';
+export * from './utils';
 export declare const buildInCssSet: Set<string>;
 export declare function isCombineBuiltInCss(config: ResolvedConfig): boolean;

package/dist/vite/utils/index.js

@@ -14,6 +14,7 @@ exports.isCombineBuiltInCss = exports.buildInCssSet = void 0;
 __exportStar(require("./ast"), exports);
 __exportStar(require("./url"), exports);
 __exportStar(require("./plugin"), exports);
+__exportStar(require("./utils"), exports);
 // 内置组件css列表，h5平台需要合并进去首页css中
 exports.buildInCssSet = new Set();
 function isCombineBuiltInCss(config) {

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

@@ -0,0 +1,2 @@
+import type { ResolvedConfig } from 'vite';
+export declare function withSourcemap(config: ResolvedConfig): boolean;

package/dist/vite/utils/utils.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withSourcemap = void 0;
+function withSourcemap(config) {
+    if (config.command === 'serve') {
+        return true;
+    }
+    return !!config.build.sourcemap;
+}
+exports.withSourcemap = withSourcemap;

package/dist/watcher.js

@@ -57,14 +57,14 @@ class FileWatcher {
         if (content) {
             return fs_extra_1.default
                 .outputFile(to, content)
-                .catch((e) => {
+                .catch(() => {
                 // this.info('copy', e)
             })
                 .then(() => this.onChange && this.onChange());
         }
         return fs_extra_1.default
             .copy(this.from(from), to, { overwrite: true })
-            .catch((e) => {
+            .catch(() => {
             // this.info('copy', e)
         })
             .then(() => this.onChange && this.onChange());
@@ -74,7 +74,7 @@ class FileWatcher {
         this.info('remove', from + '=>' + to);
         return fs_extra_1.default
             .remove(to)
-            .catch((e) => {
+            .catch(() => {
             // this.info('remove', e)
         })
             .then(() => this.onChange && this.onChange());

package/package.json

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