@dcloudio/uni-cli-shared 3.0.0-alpha-4000320240308002 → 3.0.0-alpha-4000320240309001

package/dist/json/uni-x/index.js

@@ -14,6 +14,7 @@ const utils_1 = require("../../utils");
 const uniRoutes_1 = require("../app/pages/uniRoutes");
 const uniConfig_1 = require("./uniConfig");
 const utils_2 = require("../../vite/plugins/vitejs/utils");
+const preprocess_1 = require("../../preprocess");
 var manifest_1 = require("./manifest");
 Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
 Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
@@ -133,6 +134,8 @@ function walkNode(node, pagePathNodes) {
     }
 }
 function normalizeUniAppXAppPagesJson(jsonStr) {
+    // 先条件编译
+    jsonStr = (0, preprocess_1.preUVueJson)(jsonStr);
     checkPagesJson(jsonStr, process.env.UNI_INPUT_DIR);
     const pagesJson = {
         pages: [],
@@ -142,9 +145,9 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
         pages: [],
         globalStyle: {},
     };
-    // preprocess
     try {
-        userPagesJson = (0, json_1.parseJson)(jsonStr, true);
+        // 此处不需要条件编译了
+        userPagesJson = (0, json_1.parseJson)(jsonStr, false);
     }
     catch (e) {
         console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);

package/dist/preprocess/context.js

@@ -70,7 +70,7 @@ function initPreContext(platform, userPreContext, utsPlatform, isX) {
     }
     if (platform === 'app' || platform === 'app-plus') {
         defaultContext.APP = true;
-        defaultContext.APP_PLUS = true;
+        defaultContext.APP_PLUS = isX ? false : true;
         vueContext.APP_VUE = true;
         nvueContext.APP_NVUE = true;
         nvueContext.APP_PLUS_NVUE = true;

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

@@ -1116,15 +1116,22 @@ const preCssExtNames = ['.scss', '.sass', '.styl', '.stylus'];
  * 目前主要解决 scss 文件被 @import 的条件编译
  */
 function rewriteScssReadFileSync() {
+    // 目前 1.0 App 端，只要包含了APP-NVUE条件编译，就不pre，因为区分不出来APP-NVUE
+    const ignoreAppNVue = process.env.UNI_APP_X !== 'true' &&
+        (process.env.UNI_PLATFORM === 'app' ||
+            process.env.UNI_PLATFORM === 'app-plus');
     const { readFileSync } = fs_1.default;
     fs_1.default.readFileSync = ((filepath, options) => {
         const content = readFileSync(filepath, options);
         if ((0, shared_1.isString)(filepath) &&
             (0, shared_1.isString)(content) &&
             preCssExtNames.includes(path_1.default.extname(filepath)) &&
-            content.includes('#endif') &&
-            // 目前无法区分app-nvue
-            !content.includes('APP-NVUE')) {
+            content.includes('#endif')
+        // 目前无法区分app-nvue
+        ) {
+            if (ignoreAppNVue && content.includes('APP-NVUE')) {
+                return content;
+            }
             return (0, preprocess_1.preCss)(content);
         }
         return content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4000320240308002",
+  "version": "3.0.0-alpha-4000320240309001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4000320240308002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4000320240308002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4000320240309001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4000320240309001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -67,7 +67,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000320240308002",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000320240309001",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",