@dcloudio/uni-cli-shared 3.0.0-4010420240430002 → 3.0.0-4020320240708001

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

@@ -37,6 +37,7 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
 const utils_3 = require("../../../../utils");
+const static_1 = require("./static");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -91,11 +92,11 @@ function assetPlugin(config, options) {
                         fs_extra_1.default.outputFileSync(path_1.default.resolve(process.env.UNI_OUTPUT_DIR, emittedFile.fileName), emittedFile.source);
                     },
                 }
-                : this);
+                : this, false, (0, static_1.getIsStaticFile)());
             if (options?.isAndroidX) {
                 this.emitFile({
                     type: 'asset',
-                    fileName: (0, utils_3.normalizeNodeModules)(path_1.default.relative(process.env.UNI_INPUT_DIR, id) + '.uts'),
+                    fileName: (0, utils_3.normalizeEmitAssetFileName)((0, utils_3.normalizeNodeModules)(path_1.default.relative(process.env.UNI_INPUT_DIR, id))),
                     source: `export default ${JSON.stringify(parseAssets(config, url))}`,
                 });
             }
@@ -176,8 +177,8 @@ function checkPublicFile(url, { publicDir }) {
     }
 }
 exports.checkPublicFile = checkPublicFile;
-function fileToUrl(id, config, ctx, canInline = false) {
-    return fileToBuiltUrl(id, config, ctx, false, canInline);
+function fileToUrl(id, config, ctx, canInline = false, isStaticFile) {
+    return fileToBuiltUrl(id, config, ctx, false, canInline, isStaticFile);
 }
 exports.fileToUrl = fileToUrl;
 function getAssetFilename(hash, config) {
@@ -261,7 +262,7 @@ function sanitizeFileName(name) {
  * Register an asset to be emitted as part of the bundle (if necessary)
  * and returns the resolved public URL
  */
-function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canInline = false) {
+function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canInline = false, isStaticFile) {
     if (!skipPublicCheck && checkPublicFile(id, config)) {
         return config.base + id.slice(1);
     }
@@ -294,14 +295,15 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
             assetFileNames = output[0].assetFileNames ?? assetFileNames;
         }
         const inputDir = (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR);
-        let fileName = file.startsWith(inputDir) && file.includes('/static/')
+        const isStatic = isStaticFile(file);
+        let fileName = file.startsWith(inputDir) && isStatic
             ? // 需要处理 HBuilderX 项目中的 node_modules 目录
                 (0, utils_3.normalizeNodeModules)(path_1.default.posix.relative(inputDir, file))
             : assetFileNamesToFileName(assetFileNames, file, contentHash, content);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);
         }
-        if (!fileName.includes('/static/')) {
+        if (!isStatic) {
             const emittedSet = emittedHashMap.get(config);
             if (!emittedSet.has(contentHash)) {
                 pluginContext.emitFile({
@@ -322,7 +324,7 @@ function getAssetHash(content) {
     return (0, crypto_1.createHash)('sha256').update(content).digest('hex').slice(0, 8);
 }
 exports.getAssetHash = getAssetHash;
-function urlToBuiltUrl(url, importer, config, pluginContext) {
+function urlToBuiltUrl(url, importer, config, pluginContext, isStaticFile) {
     if (checkPublicFile(url, config)) {
         return config.base + url.slice(1);
     }
@@ -331,6 +333,6 @@ function urlToBuiltUrl(url, importer, config, pluginContext) {
         : path_1.default.join(path_1.default.dirname(importer), url);
     return fileToBuiltUrl(file, config, pluginContext, 
     // skip public check since we just did it above
-    true);
+    true, false, isStaticFile);
 }
 exports.urlToBuiltUrl = urlToBuiltUrl;

package/dist/vite/plugins/vitejs/plugins/css.d.ts

@@ -1,7 +1,9 @@
 import type { SFCDescriptor } from '@vue/compiler-sfc';
 import type { ExistingRawSourceMap, RollupError } from 'rollup';
+import type * as PostCSS from 'postcss';
 import type { Plugin } from '../plugin';
 import type { ResolvedConfig } from '../config';
+import type { ResolveFn } from '../';
 import * as Postcss from 'postcss';
 export interface CSSOptions {
     /**
@@ -34,18 +36,21 @@ export declare const isDirectCSSRequest: (request: string) => boolean;
 export declare function cssPlugin(config: ResolvedConfig, options?: {
     isAndroidX: boolean;
     getDescriptor?(filename: string): SFCDescriptor | undefined;
+    createUrlReplacer?: (resolve: ResolveFn) => CssUrlReplacer;
 }): Plugin;
 /**
  * Plugin applied after user plugins
  */
-export declare function cssPostPlugin(config: ResolvedConfig, { platform, isJsCode, chunkCssFilename, chunkCssCode, includeComponentCss, }: {
+export declare function cssPostPlugin(config: ResolvedConfig, { platform, isJsCode, preserveModules, chunkCssFilename, chunkCssCode, includeComponentCss, }: {
     platform: UniApp.PLATFORM;
     isJsCode?: boolean;
+    preserveModules?: boolean;
     chunkCssFilename: (id: string) => string | void;
     chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
     includeComponentCss?: boolean;
 }): Plugin;
 export declare function formatPostcssSourceMap(rawMap: ExistingRawSourceMap, file: string): ExistingRawSourceMap;
+export type CssUrlReplacer = (url: string, importer?: string, source?: PostCSS.Source) => string | Promise<string>;
 export declare const cssUrlRE: RegExp;
 export declare const cssDataUriRE: RegExp;
 export declare const importCssRE: RegExp;

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

@@ -47,6 +47,7 @@ const utils_2 = require("../../../utils/utils");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_3 = require("../../../../utils");
 const utils_4 = require("../../../utils");
+const static_1 = require("./static");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -121,29 +122,30 @@ function cssPlugin(config, options = { isAndroidX: false }) {
             if (!exports.cssLangRE.test(id) || exports.commonjsProxyRE.test(id)) {
                 return;
             }
-            const urlReplacer = async (url, importer, source) => {
-                if (url.startsWith('/') && !url.startsWith('//')) {
-                    // /static/logo.png => @/static/logo.png
-                    url = '@' + url;
-                }
-                const resolved = await wrapResolve(resolveUrl, source?.input.css || raw, source, options.getDescriptor)(url, importer);
-                if (resolved) {
-                    return (0, asset_1.fileToUrl)(resolved, config, options?.isAndroidX
-                        ? {
-                            emitFile(emittedFile) {
-                                const fileName = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, emittedFile.fileName);
-                                // 忽略static（可能有只读文件，写入覆盖只读会报错权限）
-                                if ((0, utils_1.normalizePath)(fileName).includes('/static/')) {
-                                    return;
-                                }
-                                // 直接写入目标目录
-                                fs_extra_1.default.outputFileSync(fileName, emittedFile.source);
-                            },
-                        }
-                        : this, true);
-                }
-                return url;
-            };
+            const urlReplacer = (options.createUrlReplacer && options.createUrlReplacer(resolveUrl)) ||
+                (async (url, importer, source) => {
+                    if (url.startsWith('/') && !url.startsWith('//')) {
+                        // /static/logo.png => @/static/logo.png
+                        url = '@' + url;
+                    }
+                    const resolved = await wrapResolve(resolveUrl, source?.input.css || raw, source, options.getDescriptor)(url, importer);
+                    if (resolved) {
+                        return (0, asset_1.fileToUrl)(resolved, config, options?.isAndroidX
+                            ? {
+                                emitFile(emittedFile) {
+                                    const fileName = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, emittedFile.fileName);
+                                    // 忽略static（可能有只读文件，写入覆盖只读会报错权限）
+                                    if ((0, static_1.getIsStaticFile)()((0, utils_1.normalizePath)(emittedFile.fileName))) {
+                                        return;
+                                    }
+                                    // 直接写入目标目录
+                                    fs_extra_1.default.outputFileSync(fileName, emittedFile.source);
+                                },
+                            }
+                            : this, true, (0, static_1.getIsStaticFile)());
+                    }
+                    return url;
+                });
             const { code: css, modules, deps, } = await compileCSS(id, raw, config, urlReplacer, atImportResolvers, server);
             if (modules) {
                 moduleCache.set(id, modules);
@@ -199,7 +201,7 @@ function findCssModuleIds(moduleId, includeComponentCss = true, cssModuleIds, se
 /**
  * Plugin applied after user plugins
  */
-function cssPostPlugin(config, { platform, isJsCode, chunkCssFilename, chunkCssCode, includeComponentCss, }) {
+function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFilename, chunkCssCode, includeComponentCss, }) {
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
@@ -251,7 +253,7 @@ function cssPostPlugin(config, { platform, isJsCode, chunkCssFilename, chunkCssC
         },
         async generateBundle() {
             // app 平台页面并未 chunk，所以 renderChunk 并不会处理页面的 css，需要这里再补充查找
-            if (platform === 'app') {
+            if (platform === 'app' || preserveModules) {
                 const moduleIds = Array.from(this.getModuleIds());
                 moduleIds.forEach((id) => {
                     const filename = chunkCssFilename(id);

package/dist/vite/plugins/vitejs/plugins/static.d.ts

@@ -0,0 +1,2 @@
+export declare function createIsStaticFile(): (relativeFile: string) => boolean;
+export declare function getIsStaticFile(): (file: string) => boolean;

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

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIsStaticFile = exports.createIsStaticFile = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("../utils");
+const json_1 = require("../../../../json/json");
+const uniModulesStaticRe = /^uni_modules\/[^/]+\/static\//;
+function createIsStaticFile() {
+    let subPackageStatics = [];
+    const pagesFilename = path_1.default.join(process.env.UNI_INPUT_DIR, 'pages.json');
+    if (fs_1.default.existsSync(pagesFilename)) {
+        const pagesJson = (0, json_1.parseJson)(fs_1.default.readFileSync(pagesFilename, 'utf8'), true);
+        subPackageStatics = (pagesJson.subPackages || pagesJson.subpackages || [])
+            .filter((subPackage) => subPackage.root)
+            .map((subPackage) => {
+            return (0, utils_1.normalizePath)(path_1.default.join(subPackage.root, 'static')) + '/';
+        });
+    }
+    return function isStaticFile(relativeFile) {
+        if (path_1.default.isAbsolute(relativeFile)) {
+            relativeFile = (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, relativeFile));
+        }
+        return (relativeFile.startsWith('static/') ||
+            uniModulesStaticRe.test(relativeFile) ||
+            subPackageStatics.some((s) => relativeFile.startsWith(s)));
+    };
+}
+exports.createIsStaticFile = createIsStaticFile;
+let isStaticFile;
+function getIsStaticFile() {
+    if (!isStaticFile) {
+        isStaticFile = createIsStaticFile();
+    }
+    return isStaticFile;
+}
+exports.getIsStaticFile = getIsStaticFile;

package/dist/vite/utils/index.js

@@ -22,6 +22,9 @@ __exportStar(require("./utils"), exports);
 // 内置组件css列表，h5平台需要合并进去首页css中
 exports.buildInCssSet = new Set();
 function isCombineBuiltInCss(config) {
+    if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        return false;
+    }
     return config.command === 'build' && config.build.cssCodeSplit;
 }
 exports.isCombineBuiltInCss = isCombineBuiltInCss;

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

@@ -1,4 +1,5 @@
-import type { Plugin, ResolvedConfig } from 'vite';
+import type { Plugin, ResolveFn, ResolvedConfig } from 'vite';
+import { type CssUrlReplacer } from '../plugins/vitejs/plugins/css';
 export type CreateUniViteFilterPlugin = (opts: UniViteFilterPluginOptions) => Plugin;
 export interface UniViteFilterPluginOptions {
     resolvedConfig: ResolvedConfig;
@@ -7,7 +8,9 @@ export interface UniViteFilterPluginOptions {
 export declare function injectAssetPlugin(config: ResolvedConfig, options?: {
     isAndroidX: boolean;
 }): void;
-export declare function injectCssPlugin(config: ResolvedConfig): void;
+export declare function injectCssPlugin(config: ResolvedConfig, options?: {
+    createUrlReplacer?: (resolve: ResolveFn) => CssUrlReplacer;
+}): void;
 export declare function injectCssPostPlugin(config: ResolvedConfig, newCssPostPlugin: Plugin): void;
 export declare function replacePlugins(plugins: Plugin[], config: ResolvedConfig): void;
 export declare function removePlugins(plugins: string | string[], config: ResolvedConfig): void;

package/dist/vite/utils/plugin.js

@@ -8,8 +8,13 @@ function injectAssetPlugin(config, options) {
     replacePlugins([(0, asset_1.assetPlugin)(config, options)], config);
 }
 exports.injectAssetPlugin = injectAssetPlugin;
-function injectCssPlugin(config) {
-    replacePlugins([(0, css_1.cssPlugin)(config)], config);
+function injectCssPlugin(config, options) {
+    replacePlugins([
+        (0, css_1.cssPlugin)(config, {
+            isAndroidX: false,
+            ...options,
+        }),
+    ], config);
 }
 exports.injectCssPlugin = injectCssPlugin;
 function injectCssPostPlugin(config, newCssPostPlugin) {

package/dist/vite/utils/utils.js

@@ -5,6 +5,9 @@ const shared_1 = require("@vue/shared");
 const code_frame_1 = require("@babel/code-frame");
 const utils_1 = require("../plugins/vitejs/utils");
 function withSourcemap(config) {
+    if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        return false;
+    }
     if (config.command === 'serve') {
         return true;
     }

package/dist/vue/transforms/transformPageHead.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPageHead = void 0;
+const compiler_core_1 = require("@vue/compiler-core");
 const utils_1 = require("../../utils");
 const transformPageHead = (node, context) => {
     // 发现是page-meta下的head,直接remove该节点
-    (0, utils_1.checkElementNodeTag)(node, 'head') &&
-        (0, utils_1.checkElementNodeTag)(context.parent, 'page-meta') &&
-        context.removeNode(node);
+    if ((0, utils_1.checkElementNodeTag)(node, 'head') &&
+        (0, utils_1.checkElementNodeTag)(context.parent, 'page-meta')) {
+        ;
+        node.tag = 'page-meta-head';
+        node.tagType = compiler_core_1.ElementTypes.COMPONENT;
+    }
 };
 exports.transformPageHead = transformPageHead;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-4010420240430002",
+  "version": "3.0.0-4020320240708001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-4010420240430002",
-    "@dcloudio/uni-shared": "3.0.0-4010420240430002",
+    "@dcloudio/uni-i18n": "3.0.0-4020320240708001",
+    "@dcloudio/uni-shared": "3.0.0-4020320240708001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -38,6 +38,7 @@
     "@vue/compiler-ssr": "3.4.21",
     "@vue/server-renderer": "3.4.21",
     "@vue/shared": "3.4.21",
+    "adm-zip": "^0.5.12",
     "autoprefixer": "^10.4.19",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
@@ -49,6 +50,7 @@
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
+    "isbinaryfile": "^5.0.2",
     "jsonc-parser": "^3.2.0",
     "lines-and-columns": "^2.0.4",
     "magic-string": "^0.30.7",
@@ -69,7 +71,8 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-4010420240430002",
+    "@dcloudio/uni-uts-v1": "3.0.0-4020320240708001",
+    "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",