@dcloudio/uni-cli-shared 3.0.0-alpha-3030220211217005 → 3.0.0-alpha-3030220211217009

package/dist/env/define.js

@@ -8,6 +8,7 @@ function initDefine(stringifyBoolean = false) {
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
     const isDebug = !!manifestJson.debug;
     return {
+        ...initCustomDefine(),
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
         'process.env.UNI_DEBUG': stringifyBoolean
             ? JSON.stringify(isDebug)
@@ -29,3 +30,16 @@ function initDefine(stringifyBoolean = false) {
     };
 }
 exports.initDefine = initDefine;
+function initCustomDefine() {
+    let define = {};
+    if (process.env.UNI_CUSTOM_DEFINE) {
+        try {
+            define = JSON.parse(process.env.UNI_CUSTOM_DEFINE);
+        }
+        catch (e) { }
+    }
+    return Object.keys(define).reduce((res, name) => {
+        res['process.env.' + name] = JSON.stringify(define[name]);
+        return res;
+    }, {});
+}

package/dist/index.d.ts

@@ -18,6 +18,7 @@ export * from './postcss';
 export * from './filter';
 export * from './esbuild';
 export * from './resolve';
+export * from './scripts';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./postcss"), exports);
 __exportStar(require("./filter"), exports);
 __exportStar(require("./esbuild"), exports);
 __exportStar(require("./resolve"), exports);
+__exportStar(require("./scripts"), exports);
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/preprocess/context.d.ts

@@ -1,3 +1,3 @@
 export declare function getPreVueContext(): any;
 export declare function getPreNVueContext(): any;
-export declare function initPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean>): void;
+export declare function initPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean> | string): void;

package/dist/preprocess/context.js

@@ -60,9 +60,17 @@ function initPreContext(platform, userPreContext) {
         defaultContext.QUICKAPP_WEBVIEW = true;
     }
     if (userPreContext) {
-        Object.keys(userPreContext).forEach((key) => {
-            defaultContext[normalizeKey(key)] = !!userPreContext[key];
-        });
+        if ((0, shared_1.isString)(userPreContext)) {
+            try {
+                userPreContext = JSON.parse(userPreContext);
+            }
+            catch (e) { }
+        }
+        if ((0, shared_1.isPlainObject)(userPreContext)) {
+            Object.keys(userPreContext).forEach((key) => {
+                defaultContext[normalizeKey(key)] = !!userPreContext[key];
+            });
+        }
     }
     (0, shared_1.extend)(preVueContext, defaultContext, vueContext);
     (0, shared_1.extend)(preNVueContext, defaultContext, nvueContext);

package/dist/scripts.d.ts

@@ -0,0 +1,10 @@
+export declare function parseScripts(name: string, pkgPath: string): {
+    name: string;
+    platform: keyof UniApp.PagesJsonPagePlatformStyle;
+    define: {
+        [name: string]: string;
+    };
+    context: {
+        [name: string]: boolean;
+    };
+} | undefined;

package/dist/scripts.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseScripts = void 0;
+const fs_1 = __importDefault(require("fs"));
+function parseScripts(name, pkgPath) {
+    var _a, _b, _c;
+    if (!fs_1.default.existsSync(pkgPath)) {
+        return;
+    }
+    const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf8'));
+    const options = (_b = (_a = pkg['uni-app']) === null || _a === void 0 ? void 0 : _a.scripts) === null || _b === void 0 ? void 0 : _b[name];
+    if (!options) {
+        return;
+    }
+    if (!((_c = options.env) === null || _c === void 0 ? void 0 : _c.UNI_PLATFORM)) {
+        console.error(`package.json->uni-app->scripts->${name}->env->UNI_PLATFORM is required`);
+        process.exit(0);
+    }
+    const { UNI_PLATFORM, ...define } = options.env;
+    return {
+        name: name,
+        platform: UNI_PLATFORM,
+        define,
+        context: options.define || {},
+    };
+}
+exports.parseScripts = parseScripts;

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Plugin } from '../plugin';
 import { ResolvedConfig } from '../config';
-import { PluginContext, RenderedChunk } from 'rollup';
+import type { OutputOptions, PluginContext, RenderedChunk } from 'rollup';
 export declare const assetUrlRE: RegExp;
 export declare const chunkToEmittedAssetsMap: WeakMap<RenderedChunk, Set<string>>;
 /**
@@ -12,5 +12,29 @@ export declare function registerAssetToChunk(chunk: RenderedChunk, file: string)
 export declare function checkPublicFile(url: string, { publicDir }: ResolvedConfig): string | undefined;
 export declare function fileToUrl(id: string, config: ResolvedConfig, ctx: PluginContext, canInline?: boolean): string;
 export declare function getAssetFilename(hash: string, config: ResolvedConfig): string | undefined;
+/**
+ * converts the source filepath of the asset to the output filename based on the assetFileNames option. \
+ * this function imitates the behavior of rollup.js. \
+ * https://rollupjs.org/guide/en/#outputassetfilenames
+ *
+ * @example
+ * ```ts
+ * const content = Buffer.from('text');
+ * const fileName = assetFileNamesToFileName(
+ *   'assets/[name].[hash][extname]',
+ *   '/path/to/file.txt',
+ *   getAssetHash(content),
+ *   content
+ * )
+ * // fileName: 'assets/file.982d9e3e.txt'
+ * ```
+ *
+ * @param assetFileNames filename pattern. e.g. `'assets/[name].[hash][extname]'`
+ * @param file filepath of the asset
+ * @param contentHash hash of the asset. used for `'[hash]'` placeholder
+ * @param content content of the asset. passed to `assetFileNames` if `assetFileNames` is a function
+ * @returns output filename
+ */
+export declare function assetFileNamesToFileName(assetFileNames: Exclude<OutputOptions['assetFileNames'], undefined>, file: string, contentHash: string, content: string | Buffer): string;
 export declare function getAssetHash(content: Buffer): string;
 export declare function urlToBuiltUrl(url: string, importer: string, config: ResolvedConfig, pluginContext: PluginContext): string;

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

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlToBuiltUrl = exports.getAssetHash = exports.getAssetFilename = exports.fileToUrl = exports.checkPublicFile = exports.registerAssetToChunk = exports.assetPlugin = exports.chunkToEmittedAssetsMap = exports.assetUrlRE = void 0;
+exports.urlToBuiltUrl = exports.getAssetHash = exports.assetFileNamesToFileName = exports.getAssetFilename = exports.fileToUrl = exports.checkPublicFile = exports.registerAssetToChunk = exports.assetPlugin = exports.chunkToEmittedAssetsMap = exports.assetUrlRE = void 0;
 const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const lite_1 = __importDefault(require("mime/lite"));
@@ -142,6 +142,66 @@ function getAssetFilename(hash, config) {
     return (_a = assetHashToFilenameMap.get(config)) === null || _a === void 0 ? void 0 : _a.get(hash);
 }
 exports.getAssetFilename = getAssetFilename;
+/**
+ * converts the source filepath of the asset to the output filename based on the assetFileNames option. \
+ * this function imitates the behavior of rollup.js. \
+ * https://rollupjs.org/guide/en/#outputassetfilenames
+ *
+ * @example
+ * ```ts
+ * const content = Buffer.from('text');
+ * const fileName = assetFileNamesToFileName(
+ *   'assets/[name].[hash][extname]',
+ *   '/path/to/file.txt',
+ *   getAssetHash(content),
+ *   content
+ * )
+ * // fileName: 'assets/file.982d9e3e.txt'
+ * ```
+ *
+ * @param assetFileNames filename pattern. e.g. `'assets/[name].[hash][extname]'`
+ * @param file filepath of the asset
+ * @param contentHash hash of the asset. used for `'[hash]'` placeholder
+ * @param content content of the asset. passed to `assetFileNames` if `assetFileNames` is a function
+ * @returns output filename
+ */
+function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
+    const basename = path_1.default.basename(file);
+    // placeholders for `assetFileNames`
+    // `hash` is slightly different from the rollup's one
+    const extname = path_1.default.extname(basename);
+    const ext = extname.substring(1);
+    const name = basename.slice(0, -extname.length);
+    const hash = contentHash;
+    if (typeof assetFileNames === 'function') {
+        assetFileNames = assetFileNames({
+            name: file,
+            source: content,
+            type: 'asset',
+        });
+        if (typeof assetFileNames !== 'string') {
+            throw new TypeError('assetFileNames must return a string');
+        }
+    }
+    else if (typeof assetFileNames !== 'string') {
+        throw new TypeError('assetFileNames must be a string or a function');
+    }
+    const fileName = assetFileNames.replace(/\[\w+\]/g, (placeholder) => {
+        switch (placeholder) {
+            case '[ext]':
+                return ext;
+            case '[extname]':
+                return extname;
+            case '[hash]':
+                return hash;
+            case '[name]':
+                return name;
+        }
+        throw new Error(`invalid placeholder ${placeholder} in assetFileNames "${assetFileNames}"`);
+    });
+    return fileName;
+}
+exports.assetFileNamesToFileName = assetFileNamesToFileName;
 /**
  * Register an asset to be emitted as part of the bundle (if necessary)
  * and returns the resolved public URL
@@ -167,7 +227,10 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
         const contentHash = getAssetHash(content);
         const { search, hash } = (0, url_1.parse)(id);
         const postfix = (search || '') + (hash || '');
-        const fileName = path_1.default.posix.relative((0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR), file);
+        const inputDir = (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR);
+        let fileName = file.startsWith(inputDir)
+            ? path_1.default.posix.relative(inputDir, file)
+            : assetFileNamesToFileName(path_1.default.posix.join(config.build.assetsDir, '[name].[hash][extname]'), file, contentHash, content);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);
         }

package/dist/vue/utils.d.ts

@@ -7,7 +7,7 @@ export declare function isUserComponent(node: RootNode | TemplateChildNode, cont
 }): node is ComponentNode;
 export declare function createAttributeNode(name: string, content: string): AttributeNode;
 export declare function addStaticClass(node: ElementNode, clazz: string): string | number | undefined;
-export declare function createDirectiveNode(name: string, arg: string, exp: string | ExpressionNode): DirectiveNode;
+export declare function createDirectiveNode(name: string, arg: string, exp?: string | ExpressionNode): DirectiveNode;
 export declare function createOnDirectiveNode(name: string, value: string): DirectiveNode;
 export declare function createBindDirectiveNode(name: string, value: string | ExpressionNode): DirectiveNode;
 export declare function createUniVueTransformAssetUrls(base: string): {

package/lib/preprocess/lib/preprocess.js

@@ -381,9 +381,13 @@ function getTestTemplate(test) {
   return new Function("context", "with (context||{}){ return ( " + test + " ); }");
 }
 
-function testPasses(test,context) {
-  var testFn = getTestTemplate(test);
-  return testFn(context, getDeepPropFromObj);
+// fixed by xxxxxx
+function testPasses(test, context) {
+  var testFn = getTestTemplate(test)
+  try {
+    return testFn(context, getDeepPropFromObj)
+  } catch (e) {}
+  return false
 }
 
 function getFileContents(path, failSilent, requesterPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030220211217005",
+  "version": "3.0.0-alpha-3030220211217009",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,9 +20,9 @@
   "dependencies": {
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030220211217005",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030220211217005",
-    "@rollup/pluginutils": "^4.1.1",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030220211217009",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030220211217009",
+    "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.26",
     "@vue/compiler-dom": "3.2.26",
     "@vue/compiler-sfc": "3.2.26",
@@ -61,6 +61,6 @@
     "@types/mime": "^2.0.3",
     "@types/module-alias": "^2.0.1",
     "@types/stylus": "^0.48.36",
-    "postcss": "^8.3.8"
+    "postcss": "^8.4.5"
   }
 }