@dcloudio/uni-cli-shared 3.0.0-alpha-3030020211129001 → 3.0.0-alpha-3030020211201003

package/dist/json/mp/index.d.ts

@@ -1,4 +1,4 @@
 export * from './jsonFile';
 export { AppJson } from './types';
-export { parseMiniProgramPagesJson } from './pages';
+export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';

package/dist/json/mp/index.js

@@ -10,9 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = void 0;
+exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
 __exportStar(require("./jsonFile"), exports);
 var pages_1 = require("./pages");
+Object.defineProperty(exports, "mergeMiniProgramAppJson", { enumerable: true, get: function () { return pages_1.mergeMiniProgramAppJson; } });
 Object.defineProperty(exports, "parseMiniProgramPagesJson", { enumerable: true, get: function () { return pages_1.parseMiniProgramPagesJson; } });
 var project_1 = require("./project");
 Object.defineProperty(exports, "parseMiniProgramProjectJson", { enumerable: true, get: function () { return project_1.parseMiniProgramProjectJson; } });

package/dist/json/mp/jsonFile.js

@@ -46,7 +46,10 @@ function findChangedJsonFiles() {
         const usingComponents = newJson.usingComponents;
         // 格式化为相对路径，这样作为分包也可以直接运行
         Object.keys(usingComponents).forEach((name) => {
-            usingComponents[name] = (0, resolve_1.relativeFile)(filename, usingComponents[name].slice(1));
+            const componentFilename = usingComponents[name];
+            if (componentFilename.startsWith('/')) {
+                usingComponents[name] = (0, resolve_1.relativeFile)(filename, componentFilename.slice(1));
+            }
         });
         const jsonStr = JSON.stringify(newJson, null, 2);
         if (jsonFilesCache.get(filename) !== jsonStr) {

package/dist/json/mp/pages.d.ts

@@ -13,4 +13,5 @@ export declare function parseMiniProgramPagesJson(jsonStr: string, platform: Uni
     pageJsons: Record<string, PageWindowOptions>;
     nvuePages: string[];
 };
+export declare function mergeMiniProgramAppJson(appJson: Record<string, any>, platformJson?: Record<string, any>): void;
 export {};

package/dist/json/mp/pages.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.parseMiniProgramPagesJson = void 0;
+exports.mergeMiniProgramAppJson = exports.parseMiniProgramPagesJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -11,10 +11,20 @@ const json_1 = require("../json");
 const pages_1 = require("../pages");
 const utils_1 = require("./utils");
 const utils_2 = require("../../utils");
+const project_1 = require("./project");
 function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: false }) {
     return parsePagesJson(jsonStr, platform, options);
 }
 exports.parseMiniProgramPagesJson = parseMiniProgramPagesJson;
+function mergeMiniProgramAppJson(appJson, platformJson = {}) {
+    Object.keys(platformJson).forEach((name) => {
+        if (!(0, project_1.isMiniProgramProjectJsonKey)(name) &&
+            !['usingComponents', 'optimization'].includes(name)) {
+            appJson[name] = platformJson[name];
+        }
+    });
+}
+exports.mergeMiniProgramAppJson = mergeMiniProgramAppJson;
 function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
     subpackages: false,
 }) {

package/dist/json/mp/project.d.ts

@@ -4,5 +4,6 @@ interface ParseMiniProgramProjectJsonOptions {
 interface ProjectConfig {
     projectname: string;
 }
+export declare function isMiniProgramProjectJsonKey(name: string): boolean;
 export declare function parseMiniProgramProjectJson(jsonStr: string, platform: UniApp.PLATFORM, { template }: ParseMiniProgramProjectJsonOptions): ProjectConfig;
 export {};

package/dist/json/mp/project.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMiniProgramProjectJson = void 0;
+exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = void 0;
 const shared_1 = require("@vue/shared");
 const json_1 = require("../json");
 const projectKeys = [
@@ -18,6 +18,10 @@ const projectKeys = [
     'scripts',
     'cloudbaseRoot',
 ];
+function isMiniProgramProjectJsonKey(name) {
+    return projectKeys.includes(name);
+}
+exports.isMiniProgramProjectJsonKey = isMiniProgramProjectJsonKey;
 function parseMiniProgramProjectJson(jsonStr, platform, { template }) {
     const project = JSON.parse(JSON.stringify(template));
     const manifestJson = (0, json_1.parseJson)(jsonStr);

package/dist/vite/plugins/inject.js

@@ -42,6 +42,8 @@ function uniViteInjectPlugin(options) {
     const callback = options.callback;
     return {
         name: 'vite:uni-inject',
+        // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
+        enforce: 'post',
         transform(code, id) {
             if (!filter(id))
                 return null;

package/dist/vue/transforms/transformRef.js

@@ -17,11 +17,11 @@ function addVueRef(node, context) {
         return;
     }
     if (refProp.type === 6 /* ATTRIBUTE */) {
-        refProp.name = 'data-' + utils_1.VUE_REF;
+        refProp.name = 'u-' + utils_1.VUE_REF;
     }
     else {
         ;
-        refProp.arg.content = 'data-' + utils_1.VUE_REF;
+        refProp.arg.content = 'u-' + utils_1.VUE_REF;
     }
     return (0, utils_1.addStaticClass)(node, 
     // ref-in-for

package/package.json

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