@dcloudio/uni-cli-shared 3.0.0-alpha-3060320220919006 → 3.0.0-alpha-3060420220922002

package/dist/constants.d.ts

@@ -7,6 +7,7 @@ export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
 export declare const extensions: string[];
+export declare const UNI_MODULES_EXPORTS = "\0uni-modules-exports";
 export declare const PAGES_JSON_JS = "pages-json-js";
 export declare const MANIFEST_JSON_JS = "manifest-json-js";
 export declare const JSON_JS_MAP: {

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.UNI_MODULES_EXPORTS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -18,6 +18,7 @@ exports.extensions = [
     '.tsx',
     '.json',
 ].concat(exports.EXTNAME_VUE);
+exports.UNI_MODULES_EXPORTS = '\0uni-modules-exports';
 exports.PAGES_JSON_JS = 'pages-json-js';
 exports.MANIFEST_JSON_JS = 'manifest-json-js';
 exports.JSON_JS_MAP = {

package/dist/vite/plugins/index.d.ts

@@ -5,6 +5,7 @@ export * from './mainJs';
 export * from './jsonJs';
 export * from './console';
 export * from './dynamicImportPolyfill';
+export { uniModulesExportsPlugin } from './uniModules';
 export { assetPlugin, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, } from './vitejs/plugins/css';
 export { generateCodeFrame } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -14,7 +14,7 @@ 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.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.assetPlugin = void 0;
+exports.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.assetPlugin = exports.uniModulesExportsPlugin = void 0;
 __exportStar(require("./cssScoped"), exports);
 __exportStar(require("./copy"), exports);
 __exportStar(require("./inject"), exports);
@@ -22,6 +22,8 @@ __exportStar(require("./mainJs"), exports);
 __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), exports);
 __exportStar(require("./dynamicImportPolyfill"), exports);
+var uniModules_1 = require("./uniModules");
+Object.defineProperty(exports, "uniModulesExportsPlugin", { enumerable: true, get: function () { return uniModules_1.uniModulesExportsPlugin; } });
 var asset_1 = require("./vitejs/plugins/asset");
 Object.defineProperty(exports, "assetPlugin", { enumerable: true, get: function () { return asset_1.assetPlugin; } });
 Object.defineProperty(exports, "getAssetHash", { enumerable: true, get: function () { return asset_1.getAssetHash; } });

package/dist/vite/plugins/inject.js

@@ -11,6 +11,7 @@ const estree_walker_1 = require("estree-walker");
 const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
+const constants_1 = require("../../constants");
 const debugInject = (0, debug_1.default)('uni:inject');
 const debugInjectTry = (0, debug_1.default)('uni:inject-try');
 function uniViteInjectPlugin(name, options) {
@@ -45,10 +46,13 @@ function uniViteInjectPlugin(name, options) {
         // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
         enforce: 'post',
         transform(code, id) {
-            if (!filter(id))
-                return null;
-            if (!(0, utils_1.isJsFile)(id))
-                return null;
+            // 硬编码支持了uni_modules_exports
+            if (id !== constants_1.UNI_MODULES_EXPORTS) {
+                if (!filter(id))
+                    return null;
+                if (!(0, utils_1.isJsFile)(id))
+                    return null;
+            }
             debugInjectTry(id);
             if (code.search(firstpass) === -1)
                 return null;

package/dist/vite/plugins/uniModules.d.ts

@@ -0,0 +1,14 @@
+import type { Plugin } from 'vite';
+export declare function uniModulesExportsPlugin({ enable, }: {
+    enable: boolean;
+}): Plugin;
+declare type Define = string | string[] | Record<string, string>;
+declare type Defines = {
+    [name: string]: Define;
+};
+interface Exports {
+    [name: string]: Define | Defines | false;
+}
+export declare function parseExports(platform: UniApp.PLATFORM, source: string, exports?: Exports): [string[], string[]];
+export declare function parseDefines(source: string, defines?: Defines): [string[], string[]];
+export {};

package/dist/vite/plugins/uniModules.js

@@ -0,0 +1,134 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDefines = exports.parseExports = exports.uniModulesExportsPlugin = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const merge_1 = require("merge");
+const shared_1 = require("@vue/shared");
+const constants_1 = require("../../constants");
+const json_1 = require("../../json");
+function uniModulesExportsPlugin({ enable, }) {
+    return {
+        name: 'uni:modules:exports',
+        resolveId(id) {
+            if (id === constants_1.UNI_MODULES_EXPORTS) {
+                return constants_1.UNI_MODULES_EXPORTS;
+            }
+        },
+        load(id) {
+            if (id !== constants_1.UNI_MODULES_EXPORTS) {
+                return;
+            }
+            // 未启用
+            if (!enable) {
+                return '';
+            }
+            const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
+            if (!fs_extra_1.default.existsSync(uniModulesDir)) {
+                return '';
+            }
+            const importCodes = [];
+            const assignCodes = [];
+            fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
+                var _a, _b;
+                const pkgPath = path_1.default.resolve(uniModulesDir, uniModuleDir, 'package.json');
+                if (!fs_extra_1.default.existsSync(pkgPath)) {
+                    return;
+                }
+                const exports = (_b = (_a = (0, json_1.parseJson)(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b.exports;
+                if (exports) {
+                    const [exportsImportCodes, exportsAssignCodes] = parseExports(process.env.UNI_PLATFORM === 'h5'
+                        ? 'web'
+                        : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports);
+                    importCodes.push(...exportsImportCodes);
+                    assignCodes.push(...exportsAssignCodes);
+                }
+            });
+            if (!importCodes.length) {
+                return '';
+            }
+            return `${importCodes.join('\n')}
+${assignCodes.join('\n')}`;
+        },
+    };
+}
+exports.uniModulesExportsPlugin = uniModulesExportsPlugin;
+function parseExports(platform, source, exports = {}) {
+    const rootDefines = {};
+    Object.keys(exports).forEach((name) => {
+        if (name.startsWith('uni')) {
+            rootDefines[name] = exports[name];
+        }
+    });
+    const platformDefines = exports[platform];
+    // 该平台不支持
+    if (platformDefines === false) {
+        return [[], []];
+    }
+    return parseDefines(source, (0, merge_1.recursive)(true, rootDefines, platformDefines));
+}
+exports.parseExports = parseExports;
+function parseDefines(source, defines = {}) {
+    const importCodes = [];
+    const assignCodes = [];
+    Object.keys(defines).forEach((name) => {
+        const [defineImportCodes, defineAssignCodes] = parseDefine(source, name, defines[name]);
+        importCodes.push(...defineImportCodes);
+        assignCodes.push(...defineAssignCodes);
+    });
+    return [importCodes, assignCodes];
+}
+exports.parseDefines = parseDefines;
+/**
+ *  uni:'getBatteryInfo'
+ * import getBatteryInfo from '..'
+ *
+ * uni:['getBatteryInfo']
+ * import { getBatteryInfo } from '..'
+ *
+ * uni:['openLocation','chooseLocation']
+ * import { openLocation, chooseLocation } from '..'
+ *
+ * uni:{
+ *  onUserCaptureScreen: "onCaptureScreen"
+ *  offUserCaptureScreen: "offCaptureScreen"
+ * }
+ *
+ * uni.getBatteryInfo = getBatteryInfo
+ * @param source
+ * @param globalObject
+ * @param define
+ * @returns
+ */
+function parseDefine(source, globalObject, define) {
+    const importCodes = [];
+    const assignCodes = [];
+    if ((0, shared_1.isString)(define)) {
+        importCodes.push(`import ${define} from '${source}'`);
+        assignCodes.push(`${globalObject}.${define} = ${define}`);
+    }
+    else if ((0, shared_1.isArray)(define)) {
+        importCodes.push(`import { ${define.join(', ')} } from '${source}'`);
+        define.forEach((d) => {
+            assignCodes.push(`${globalObject}.${d} = ${d}`);
+        });
+    }
+    else if ((0, shared_1.isPlainObject)(define)) {
+        const keys = Object.keys(define);
+        const specifiers = [];
+        keys.forEach((d) => {
+            if (d !== define[d]) {
+                specifiers.push(`${define[d]} as ${d}`);
+            }
+            else {
+                specifiers.push(d);
+            }
+            assignCodes.push(`${globalObject}.${d} = ${d}`);
+        });
+        importCodes.push(`import { ${specifiers.join(', ')} } from '${source}'`);
+    }
+    return [importCodes, assignCodes];
+}

package/dist/vite/utils/url.js

@@ -54,6 +54,10 @@ exports.hashRE = /#.*$/;
 const cleanUrl = (url) => url.replace(exports.hashRE, '').replace(exports.queryRE, '');
 exports.cleanUrl = cleanUrl;
 function isJsFile(id) {
+    // inject 使用了isJsFile 判断。uni_modules_exports 中注入使用了 uni，在小程序平台，inject 需要注入 uni 对象
+    if (id === constants_1.UNI_MODULES_EXPORTS) {
+        return true;
+    }
     const isJs = constants_1.EXTNAME_JS_RE.test(id);
     if (isJs) {
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060320220919006",
+  "version": "3.0.0-alpha-3060420220922002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
-    "@babel/core": "^7.17.9",
-    "@babel/parser": "^7.17.9",
+    "@babel/core": "^7.18.13",
+    "@babel/parser": "^7.18.13",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060320220919006",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060320220919006",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060420220922002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060420220922002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -42,13 +42,13 @@
     "compare-versions": "^3.6.0",
     "debug": "^4.3.3",
     "es-module-lexer": "^0.9.3",
-    "esbuild": "^0.14.27",
+    "esbuild": "^0.15.9",
     "estree-walker": "^2.0.2",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.0.0",
-    "magic-string": "^0.26.1",
+    "magic-string": "^0.26.3",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
     "module-alias": "^2.2.2",
@@ -58,7 +58,7 @@
     "postcss-load-config": "^3.1.1",
     "postcss-modules": "^4.3.0",
     "postcss-selector-parser": "^6.0.6",
-    "resolve": "^1.22.0",
+    "resolve": "^1.22.1",
     "tapable": "^2.2.0",
     "xregexp": "3.1.0"
   },
@@ -75,7 +75,7 @@
     "@types/resolve": "^1.20.2",
     "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
-    "postcss": "^8.4.13",
+    "postcss": "^8.4.16",
     "vue": "3.2.39"
   }
 }