@dcloudio/uni-cli-shared 3.0.0-alpha-3040620220419002 → 3.0.0-alpha-3040720220422002

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

@@ -1,3 +1,3 @@
 export * from './pages';
 export * from './manifest';
-export { polyfillCode } from './pages/code';
+export { polyfillCode, arrayBufferCode, restoreGlobalCode } from './pages/code';

package/dist/json/app/index.js

@@ -14,8 +14,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.polyfillCode = void 0;
+exports.restoreGlobalCode = exports.arrayBufferCode = exports.polyfillCode = void 0;
 __exportStar(require("./pages"), exports);
 __exportStar(require("./manifest"), exports);
 var code_1 = require("./pages/code");
 Object.defineProperty(exports, "polyfillCode", { enumerable: true, get: function () { return code_1.polyfillCode; } });
+Object.defineProperty(exports, "arrayBufferCode", { enumerable: true, get: function () { return code_1.arrayBufferCode; } });
+Object.defineProperty(exports, "restoreGlobalCode", { enumerable: true, get: function () { return code_1.restoreGlobalCode; } });

package/dist/json/app/manifest/merge.js

@@ -12,6 +12,7 @@ function initRecursiveMerge(manifestJson, userManifestJson) {
             code: userManifestJson.versionCode,
         },
         locale: userManifestJson.locale,
+        uniStatistics: userManifestJson.uniStatistics,
     }, { plus: userManifestJson['app-plus'] });
 }
 exports.initRecursiveMerge = initRecursiveMerge;

package/dist/json/app/manifest/plus.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPlus = void 0;
+const shared_1 = require("@vue/shared");
+const merge_1 = require("merge");
 const wxPageOrientationMapping = {
     auto: [
         'portrait-primary',
@@ -13,6 +15,7 @@ const wxPageOrientationMapping = {
 };
 function initPlus(manifestJson, pagesJson) {
     var _a;
+    initUniStatistics(manifestJson);
     // 转换为老版本配置
     if (manifestJson.plus.modules) {
         manifestJson.permissions = manifestJson.plus.modules;
@@ -81,3 +84,41 @@ function initPlus(manifestJson, pagesJson) {
     }
 }
 exports.initPlus = initPlus;
+function initUniStatistics(manifestJson) {
+    var _a;
+    // 根节点配置了统计
+    if (manifestJson.uniStatistics) {
+        manifestJson.plus.uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson.plus.uniStatistics);
+        delete manifestJson.uniStatistics;
+    }
+    if (!process.env.UNI_CLOUD_SPACES) {
+        return;
+    }
+    let spaces = [];
+    try {
+        spaces = JSON.parse(process.env.UNI_CLOUD_SPACES);
+    }
+    catch (e) { }
+    if (!(0, shared_1.isArray)(spaces) || !spaces.length) {
+        return;
+    }
+    const space = spaces[0];
+    if (!space) {
+        return;
+    }
+    const uniStatistics = (_a = manifestJson.plus) === null || _a === void 0 ? void 0 : _a.uniStatistics;
+    if (!uniStatistics) {
+        return;
+    }
+    if (uniStatistics.version === 2 || uniStatistics.version === '2') {
+        if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) {
+            return;
+        }
+        uniStatistics.uniCloud = {
+            provider: space.provider,
+            spaceId: space.id,
+            clientSecret: space.clientSecret,
+            endpoint: space.apiEndpoint,
+        };
+    }
+}

package/dist/json/app/pages/code.d.ts

@@ -1,3 +1,4 @@
-export declare const polyfillCode = "\nif (typeof Promise !== 'undefined' && !Promise.prototype.finally) {\n  Promise.prototype.finally = function(callback) {\n    const promise = this.constructor\n    return this.then(\n      value => promise.resolve(callback()).then(() => value),\n      reason => promise.resolve(callback()).then(() => {\n        throw reason\n      })\n    )\n  }\n}\nif(uni&&uni.base64ToArrayBuffer){\n  ArrayBuffer = uni.base64ToArrayBuffer('').constructor\n}\n";
+export declare const arrayBufferCode = "\nif (typeof uni !== 'undefined' && uni && uni.requireGlobal) {\n  const global = uni.requireGlobal()\n  ArrayBuffer = global.ArrayBuffer\n  Int8Array = global.Int8Array\n  Uint8Array = global.Uint8Array\n  Uint8ClampedArray = global.Uint8ClampedArray\n  Int16Array = global.Int16Array\n  Uint16Array = global.Uint16Array\n  Int32Array = global.Int32Array\n  Uint32Array = global.Uint32Array\n  Float32Array = global.Float32Array\n  Float64Array = global.Float64Array\n  BigInt64Array = global.BigInt64Array\n  BigUint64Array = global.BigUint64Array\n};\n";
+export declare const polyfillCode: string;
 export declare const restoreGlobalCode = "\nif(uni.restoreGlobal){\n  uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)\n}\n";
 export declare const globalCode: string;

package/dist/json/app/pages/code.js

@@ -1,6 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalCode = exports.restoreGlobalCode = exports.polyfillCode = void 0;
+exports.globalCode = exports.restoreGlobalCode = exports.polyfillCode = exports.arrayBufferCode = void 0;
+exports.arrayBufferCode = `
+if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
+  const global = uni.requireGlobal()
+  ArrayBuffer = global.ArrayBuffer
+  Int8Array = global.Int8Array
+  Uint8Array = global.Uint8Array
+  Uint8ClampedArray = global.Uint8ClampedArray
+  Int16Array = global.Int16Array
+  Uint16Array = global.Uint16Array
+  Int32Array = global.Int32Array
+  Uint32Array = global.Uint32Array
+  Float32Array = global.Float32Array
+  Float64Array = global.Float64Array
+  BigInt64Array = global.BigInt64Array
+  BigUint64Array = global.BigUint64Array
+};
+`;
 exports.polyfillCode = `
 if (typeof Promise !== 'undefined' && !Promise.prototype.finally) {
   Promise.prototype.finally = function(callback) {
@@ -12,10 +29,8 @@ if (typeof Promise !== 'undefined' && !Promise.prototype.finally) {
       })
     )
   }
-}
-if(uni&&uni.base64ToArrayBuffer){
-  ArrayBuffer = uni.base64ToArrayBuffer('').constructor
-}
+};
+${exports.arrayBufferCode}
 `;
 exports.restoreGlobalCode = `
 if(uni.restoreGlobal){

package/dist/json/app/pages/index.js

@@ -6,7 +6,7 @@ const definePage_1 = require("./definePage");
 const uniConfig_1 = require("./uniConfig");
 const uniRoutes_1 = require("./uniRoutes");
 function normalizeAppPagesJson(pagesJson) {
-    return code_1.polyfillCode + code_1.restoreGlobalCode + (0, definePage_1.definePageCode)(pagesJson);
+    return (0, definePage_1.definePageCode)(pagesJson);
 }
 exports.normalizeAppPagesJson = normalizeAppPagesJson;
 function normalizeAppNVuePagesJson(pagesJson) {

package/dist/mp/template.d.ts

@@ -53,6 +53,10 @@ export interface MiniProgramCompilerOptions {
          * 父组件 setData 后，子组件的 properties 是否可以同步获取，目前仅 mp-weixin，mp-qq，mp-alipay 支持
          */
         getPropertySync?: boolean;
+        /**
+         * 格式化组件名称，比如 wx-btn => weixin-btn (微信不允许以 wx 命名自定义组件)
+         */
+        normalizeName?: (name: string) => string;
     };
     directive: string;
     emitFile?: (emittedFile: EmittedAsset) => string;

package/dist/mp/usingComponents.d.ts

@@ -10,15 +10,16 @@ interface MainDescriptor {
     template: string;
 }
 export declare function parseMainDescriptor(filename: string, ast: Program, resolve: ParseDescriptor['resolve']): Promise<MainDescriptor>;
-export declare function updateMiniProgramComponentsByScriptFilename(scriptFilename: string, inputDir: string): void;
-export declare function updateMiniProgramComponentsByTemplateFilename(templateFilename: string, inputDir: string): void;
-export declare function updateMiniProgramGlobalComponents(filename: string, ast: Program, { inputDir, resolve, }: {
+export declare function updateMiniProgramComponentsByScriptFilename(scriptFilename: string, inputDir: string, normalizeComponentName: (name: string) => string): void;
+export declare function updateMiniProgramComponentsByTemplateFilename(templateFilename: string, inputDir: string, normalizeComponentName: (name: string) => string): void;
+export declare function updateMiniProgramGlobalComponents(filename: string, ast: Program, { inputDir, resolve, normalizeComponentName, }: {
     inputDir: string;
     resolve: ParseDescriptor['resolve'];
+    normalizeComponentName: (name: string) => string;
 }): Promise<{
     imports: ImportDeclaration[];
 }>;
-export declare function updateMiniProgramComponentsByMainFilename(mainFilename: string, inputDir: string): void;
+export declare function updateMiniProgramComponentsByMainFilename(mainFilename: string, inputDir: string, normalizeComponentName: (name: string) => string): void;
 export interface TemplateDescriptor {
     bindingComponents: BindingComponents;
     imports: ImportDeclaration[];

package/dist/mp/usingComponents.js

@@ -60,17 +60,17 @@ async function parseMainDescriptor(filename, ast, resolve) {
     return descriptor;
 }
 exports.parseMainDescriptor = parseMainDescriptor;
-function updateMiniProgramComponentsByScriptFilename(scriptFilename, inputDir) {
+function updateMiniProgramComponentsByScriptFilename(scriptFilename, inputDir, normalizeComponentName) {
     const mainFilename = findMainFilenameByScriptFilename(scriptFilename);
     if (mainFilename) {
-        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir);
+        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName);
     }
 }
 exports.updateMiniProgramComponentsByScriptFilename = updateMiniProgramComponentsByScriptFilename;
-function updateMiniProgramComponentsByTemplateFilename(templateFilename, inputDir) {
+function updateMiniProgramComponentsByTemplateFilename(templateFilename, inputDir, normalizeComponentName) {
     const mainFilename = findMainFilenameByTemplateFilename(templateFilename);
     if (mainFilename) {
-        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir);
+        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName);
     }
 }
 exports.updateMiniProgramComponentsByTemplateFilename = updateMiniProgramComponentsByTemplateFilename;
@@ -82,29 +82,29 @@ function findMainFilenameByTemplateFilename(templateFilename) {
     const keys = [...mainDescriptors.keys()];
     return keys.find((key) => mainDescriptors.get(key).template === templateFilename);
 }
-async function updateMiniProgramGlobalComponents(filename, ast, { inputDir, resolve, }) {
+async function updateMiniProgramGlobalComponents(filename, ast, { inputDir, resolve, normalizeComponentName, }) {
     const { bindingComponents, imports } = await parseGlobalDescriptor(filename, ast, resolve);
-    (0, jsonFile_1.addMiniProgramUsingComponents)('app', createUsingComponents(bindingComponents, imports, inputDir));
+    (0, jsonFile_1.addMiniProgramUsingComponents)('app', createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
     return {
         imports,
     };
 }
 exports.updateMiniProgramGlobalComponents = updateMiniProgramGlobalComponents;
-function createUsingComponents(bindingComponents, imports, inputDir) {
+function createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName) {
     const usingComponents = {};
     imports.forEach(({ source: { value }, specifiers: [specifier] }) => {
         const { name } = specifier.local;
         if (!bindingComponents[name]) {
             return;
         }
-        const componentName = (0, shared_1.hyphenate)(bindingComponents[name].tag);
+        const componentName = normalizeComponentName((0, shared_1.hyphenate)(bindingComponents[name].tag));
         if (!usingComponents[componentName]) {
             usingComponents[componentName] = (0, uni_shared_1.addLeadingSlash)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(value, inputDir)));
         }
     });
     return usingComponents;
 }
-function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir) {
+function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName) {
     const mainDescriptor = mainDescriptors.get(mainFilename);
     if (!mainDescriptor) {
         return;
@@ -119,7 +119,7 @@ function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir) {
     }
     const bindingComponents = parseBindingComponents(templateDescriptor.bindingComponents, scriptDescriptor.bindingComponents);
     const imports = parseImports(mainDescriptor.imports, scriptDescriptor.imports, templateDescriptor.imports);
-    (0, jsonFile_1.addMiniProgramUsingComponents)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(mainFilename, inputDir)), createUsingComponents(bindingComponents, imports, inputDir));
+    (0, jsonFile_1.addMiniProgramUsingComponents)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(mainFilename, inputDir)), createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
 }
 exports.updateMiniProgramComponentsByMainFilename = updateMiniProgramComponentsByMainFilename;
 function findBindingComponent(tag, bindingComponents) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3040620220419002",
+  "version": "3.0.0-alpha-3040720220422002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3040620220419002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3040620220419002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3040720220422002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3040720220422002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",