@dcloudio/uni-cli-shared 3.0.0-alpha-3061620221230001 → 3.0.0-alpha-3061620230106001

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

@@ -34,7 +34,8 @@ export declare function cssPlugin(config: ResolvedConfig): Plugin;
 /**
  * Plugin applied after user plugins
  */
-export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename, chunkCssCode, }: {
+export declare function cssPostPlugin(config: ResolvedConfig, { platform, chunkCssFilename, chunkCssCode, }: {
+    platform: UniApp.PLATFORM;
     chunkCssFilename: (id: string) => string | void;
     chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
 }): Plugin;

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

@@ -39,6 +39,7 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const preprocess_1 = require("../../../../preprocess");
 const cleanString_1 = require("../cleanString");
 const shared_1 = require("@vue/shared");
+const constants_1 = require("../../../../constants");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -107,10 +108,38 @@ function cssPlugin(config) {
     };
 }
 exports.cssPlugin = cssPlugin;
+function findCssModuleIds(moduleId, cssModuleIds, seen) {
+    if (!cssModuleIds) {
+        cssModuleIds = new Set();
+    }
+    if (!seen) {
+        seen = new Set();
+    }
+    if (seen.has(moduleId)) {
+        return cssModuleIds;
+    }
+    seen.add(moduleId);
+    const moduleInfo = this.getModuleInfo(moduleId);
+    if (moduleInfo) {
+        moduleInfo.importedIds.forEach((id) => {
+            if (id.includes(constants_1.PAGES_JSON_JS)) {
+                // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
+                return;
+            }
+            if (exports.cssLangRE.test(id) && !exports.commonjsProxyRE.test(id)) {
+                cssModuleIds.add(id);
+            }
+            else {
+                findCssModuleIds.call(this, id, cssModuleIds, seen);
+            }
+        });
+    }
+    return cssModuleIds;
+}
 /**
  * Plugin applied after user plugins
  */
-function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
+function cssPostPlugin(config, { platform, chunkCssFilename, chunkCssCode, }) {
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
@@ -140,13 +169,37 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
             if (id) {
                 const filename = chunkCssFilename(id);
                 if (filename) {
-                    const ids = Object.keys(chunk.modules).filter((id) => styles.has(id));
-                    cssChunks.set(filename, ids);
+                    if (platform === 'app' && filename === 'app.css') {
+                        // 获取 unocss 的样式文件信息
+                        const ids = Object.keys(chunk.modules).filter((id) => styles.has(id) &&
+                            (id.includes('__uno.css') || id.includes('-unocss-')));
+                        cssChunks.set(filename, ids);
+                    }
+                    else {
+                        const ids = Object.keys(chunk.modules).filter((id) => styles.has(id));
+                        cssChunks.set(filename, ids);
+                    }
                 }
             }
             return null;
         },
         async generateBundle() {
+            // app 平台页面并未 chunk，所以 renderChunk 并不会处理页面的 css，需要这里再补充查找
+            if (platform === 'app') {
+                const moduleIds = Array.from(this.getModuleIds());
+                moduleIds.forEach((id) => {
+                    const filename = chunkCssFilename(id);
+                    if (filename) {
+                        const ids = findCssModuleIds.call(this, id);
+                        if (cssChunks.has(filename)) {
+                            cssChunks.get(filename).forEach((id) => {
+                                ids.add(id);
+                            });
+                        }
+                        cssChunks.set(filename, [...ids]);
+                    }
+                });
+            }
             if (!cssChunks.size) {
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3061620221230001",
+  "version": "3.0.0-alpha-3061620230106001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.20.5",
     "@babel/parser": "^7.20.5",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3061620221230001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3061620221230001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3061620230106001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3061620230106001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061620221230001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061620230106001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",