@dcloudio/uni-cli-shared 3.0.0-alpha-4010820240520001 → 3.0.0-alpha-4010820240529001

package/dist/json/theme.d.ts

@@ -2,3 +2,22 @@ export declare function hasThemeJson(themeLocation: string): boolean;
 export declare const parseThemeJson: (themeLocation?: string) => UniApp.ThemeJson;
 export declare const normalizeThemeConfigOnce: (manifestJsonPlatform?: Record<string, any>) => UniApp.ThemeJson;
 export declare function initTheme<T extends object>(manifestJson: Record<string, any>, pagesJson: T): T;
+export declare class ThemeSassParser {
+    _index: number;
+    _input: string;
+    _theme: Record<string, Record<string, any>>;
+    constructor();
+    parse(input: string): Record<string, Record<string, any>>;
+    parseVariable(): void;
+    parseVariableValue(): any;
+    parseFunction(): void | string[];
+    skipOtherValue(): void;
+    parseString(): string;
+    pushThemeValue(key: string, valuePair: string[]): void;
+    consume(expected: string): void;
+    get currentChar(): string;
+    skipWhiteSpaceAndComments(): void;
+    skipComment(): void;
+    skipWhiteSpace(): void;
+    isspace(str: string): boolean;
+}

package/dist/json/theme.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.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
+exports.ThemeSassParser = exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
@@ -35,3 +35,187 @@ function initTheme(manifestJson, pagesJson) {
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }
 exports.initTheme = initTheme;
+// TODO
+class ThemeSassParser {
+    constructor() {
+        this._index = 0;
+        this._input = '';
+        this._theme = {};
+    }
+    parse(input) {
+        this._index = 0;
+        this._input = input;
+        this._theme = {};
+        this._theme['light'] = {};
+        this._theme['dark'] = {};
+        this.parseVariable();
+        return this._theme;
+    }
+    parseVariable() {
+        this.skipWhiteSpaceAndComments();
+        this.consume('$');
+        this.skipWhiteSpaceAndComments();
+        let key = this.parseString();
+        this.skipWhiteSpaceAndComments();
+        this.consume(':');
+        this.skipWhiteSpace();
+        const value = this.parseVariableValue();
+        if (Array.isArray(value)) {
+            this.pushThemeValue(key, value);
+        }
+        this.consume(';');
+        this.skipWhiteSpaceAndComments();
+        if (this._index < this._input.length) {
+            this.parseVariable();
+        }
+    }
+    parseVariableValue() {
+        switch (this.currentChar) {
+            case 'l':
+                return this.parseFunction();
+            default:
+                return this.skipOtherValue();
+        }
+    }
+    parseFunction() {
+        let functionName = '';
+        while (this.currentChar != '(') {
+            functionName += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        if (functionName != 'light-dark') {
+            return this.skipOtherValue();
+        }
+        let valuePair = new Array(2);
+        valuePair[0] = '';
+        valuePair[1] = '';
+        this.consume('(');
+        let index = 0;
+        // TODO rgb?
+        while (this.currentChar != ')') {
+            valuePair[index] += this.currentChar;
+            if (this.currentChar === ',') {
+                index++;
+            }
+            ++this._index;
+        }
+        this.consume(')');
+        valuePair[0] = valuePair[0].trim();
+        valuePair[1] = valuePair[1].trim();
+        return valuePair;
+    }
+    skipOtherValue() {
+        while (this.currentChar != ';') {
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    parseString() {
+        let str = '';
+        while (this.currentChar != ':') {
+            if (this.currentChar == '\\') {
+                str += this.currentChar;
+                if (this._index + 1 < this._input.length) {
+                    str += this._input[++this._index];
+                }
+            }
+            str += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        return str;
+    }
+    pushThemeValue(key, valuePair) {
+        this._theme['light'][key] = valuePair[0];
+        this._theme['dark'][key] = valuePair[1];
+    }
+    consume(expected) {
+        if (this.currentChar != expected) {
+            throw new Error('Unexpected character ' +
+                expected +
+                ' index=' +
+                this._index +
+                ' ' +
+                this.currentChar);
+        }
+        ++this._index;
+    }
+    get currentChar() {
+        if (this._index >= this._input.length) {
+            throw new Error('Unexpected end of input');
+        }
+        return this._input[this._index];
+    }
+    skipWhiteSpaceAndComments() {
+        while (this._index < this._input.length) {
+            const c = this._input[this._index];
+            if (this.isspace(c)) {
+                ++this._index;
+            }
+            else if (c == '/') {
+                this.skipComment();
+            }
+            else {
+                break;
+            }
+        }
+    }
+    skipComment() {
+        if (this.currentChar != '/') {
+            return;
+        }
+        this.consume('/');
+        let nextChar = this.currentChar;
+        if (nextChar == '/') {
+            // Single line comment
+            while (
+            // @ts-expect-error
+            this.currentChar !== '\n' &&
+                this._index < this._input.length - 1) {
+                ++this._index;
+            }
+            this.skipWhiteSpace();
+        }
+        else if (nextChar === '*') {
+            // Multi-line comment
+            while (true) {
+                if (this._index + 1 >= this._input.length) {
+                    throw new Error('Unterminated multi-line comment');
+                }
+                ++this._index;
+                // @ts-expect-error
+                if (this.currentChar === '*' && this._input[this._index + 1] === '/') {
+                    this._index += 2;
+                    break;
+                }
+            }
+            this.skipWhiteSpace();
+        }
+        else {
+            throw new Error('Invalid comment');
+        }
+    }
+    skipWhiteSpace() {
+        while (this._index < this._input.length &&
+            this.isspace(this._input[this._index])) {
+            ++this._index;
+        }
+    }
+    isspace(str) {
+        return str == ' ' || str == '\n' || str == '\r' || str == "'";
+    }
+}
+exports.ThemeSassParser = ThemeSassParser;

package/dist/uni_modules.d.ts

@@ -102,6 +102,7 @@ export declare function initCheckEnv(): Record<string, string>;
 export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
 export declare function checkEncryptUniModules(inputDir: string, params: {
     mode: 'development' | 'production';
+    packType: 'debug' | 'release';
     compilerVersion: string;
     appid: string;
     appname: string;

package/dist/uni_modules.js

@@ -191,20 +191,9 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
                                 const skipCheck = process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js' &&
                                     source.includes('app-js');
                                 if (!skipCheck) {
-                                    if (language === 'javascript') {
-                                        if (appOptions.js === false) {
-                                            return;
-                                        }
-                                    }
-                                    else if (language === 'kotlin') {
-                                        if (appOptions.kotlin === false) {
-                                            return;
-                                        }
-                                    }
-                                    else if (language === 'swift') {
-                                        if (appOptions.swift === false) {
-                                            return;
-                                        }
+                                    const targetLanguage = language === 'javascript' ? 'js' : language;
+                                    if (targetLanguage && appOptions[targetLanguage] === false) {
+                                        return;
                                     }
                                 }
                             }
@@ -407,6 +396,7 @@ function findEncryptUniModuleCache(uniModuleId, cacheDir, options) {
             !isEnvExpired(pkg.uni_modules?.artifacts?.env || {}, options.env)) {
             return pkg;
         }
+        console.log(`插件${uniModuleId} 缓存已过期，需要重新云编译。`);
         // 已过期的插件，删除缓存
         fs_extra_1.default.rmSync(uniModuleCacheDir, { recursive: true });
     }
@@ -494,10 +484,22 @@ async function checkEncryptUniModules(inputDir, params) {
         try {
             const isLogin = await C();
             console.log(`正在云编译插件${isLogin ? '' : '（请先登录）'}：${modules.join(',')}...`);
-            const downloadUrl = await U({
-                params,
-                attachment: zipFile,
-            });
+            let downloadUrl = '';
+            try {
+                downloadUrl = await U({
+                    params,
+                    attachment: zipFile,
+                });
+            }
+            catch (e) {
+                if (e.message && e.message === '{"error":"UserNotLogin"}') {
+                    console.log('当前项目包含需要云编译的付费插件，需要您先登录HBuilderX账号。');
+                }
+                else {
+                    console.error(e);
+                }
+                process.exit(0);
+            }
             await D(downloadUrl, downloadFile);
             // unzip
             const AdmZip = require('adm-zip');

package/dist/vite/autoImport.js

@@ -4,6 +4,9 @@ exports.initAutoImportOptions = void 0;
 const uniPreset = {
     from: '@dcloudio/uni-app',
     imports: [
+        // ssr
+        'ssrRef',
+        'shallowSsrRef',
         // uni-app lifecycle
         // App and Page
         'onShow',

package/dist/vite/cloud.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin, ResolveFn } from 'vite';
 import type { CssUrlReplacer } from './plugins/vitejs/plugins/css';
 export declare function createEncryptCssUrlReplacer(resolve: ResolveFn): CssUrlReplacer;
+export declare function uniEncryptUniModulesAssetsPlugin(): Plugin;
 export declare function uniEncryptUniModulesPlugin(): Plugin;
 export declare function addUniModulesExtApiComponents(relativeFilename: string, components: string[]): void;

package/dist/vite/cloud.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addUniModulesExtApiComponents = exports.uniEncryptUniModulesPlugin = exports.createEncryptCssUrlReplacer = void 0;
+exports.addUniModulesExtApiComponents = exports.uniEncryptUniModulesPlugin = exports.uniEncryptUniModulesAssetsPlugin = exports.createEncryptCssUrlReplacer = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const uni_modules_1 = require("../uni_modules");
 const utils_1 = require("./plugins/vitejs/utils");
 const uts_1 = require("../uts");
+const utils_2 = require("../utils");
 function createEncryptCssUrlReplacer(resolve) {
     return async (url, importer) => {
         if (url.startsWith('/') && !url.startsWith('//')) {
@@ -17,12 +18,44 @@ function createEncryptCssUrlReplacer(resolve) {
         }
         const resolved = await resolve(url, importer);
         if (resolved) {
-            return ('@/' + (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, resolved)));
+            return ('@/' + (0, utils_2.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, resolved)));
         }
         return url;
     };
 }
 exports.createEncryptCssUrlReplacer = createEncryptCssUrlReplacer;
+// 处理静态资源加载（目前仅限非app-android）
+function uniEncryptUniModulesAssetsPlugin() {
+    let resolvedConfig;
+    return {
+        name: 'uni:encrypt-uni-modules-assets',
+        enforce: 'pre',
+        configResolved(config) {
+            resolvedConfig = config;
+        },
+        resolveId(id, importer) {
+            if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
+                id = (0, utils_2.normalizePath)(id);
+                if (importer && (id.startsWith('./') || id.startsWith('../'))) {
+                    id = (0, utils_2.normalizePath)(path_1.default.resolve(path_1.default.dirname(importer), id));
+                }
+                if (path_1.default.isAbsolute(id)) {
+                    id = '@/' + path_1.default.relative(process.env.UNI_INPUT_DIR, id);
+                }
+                return `\0${id}`;
+            }
+        },
+        load(id) {
+            if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
+                return {
+                    code: `export default ${JSON.stringify(id.replace(/\0/g, ''))}`,
+                    moduleSideEffects: false,
+                };
+            }
+        },
+    };
+}
+exports.uniEncryptUniModulesAssetsPlugin = uniEncryptUniModulesAssetsPlugin;
 function uniEncryptUniModulesPlugin() {
     let resolvedConfig;
     return {
@@ -42,9 +75,28 @@ function uniEncryptUniModulesPlugin() {
             config.build.rollupOptions.external = createExternal(config);
             resolvedConfig = config;
         },
-        resolveId(id) {
-            if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
-                return `\0${id}`;
+        resolveId(id, importer) {
+            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+                if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
+                    id = (0, utils_2.normalizePath)(id);
+                    if (importer && (id.startsWith('./') || id.startsWith('../'))) {
+                        id = (0, utils_2.normalizePath)(path_1.default.resolve(path_1.default.dirname(importer), id));
+                    }
+                    if (path_1.default.isAbsolute(id)) {
+                        id = '@/' + path_1.default.relative(process.env.UNI_INPUT_DIR, id);
+                    }
+                    return `\0${id}`;
+                }
+            }
+        },
+        load(id) {
+            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+                if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
+                    return {
+                        code: `export default ${JSON.stringify(id.replace(/\0/g, ''))}`,
+                        moduleSideEffects: false,
+                    };
+                }
             }
         },
         generateBundle(_, bundle) {
@@ -121,12 +173,6 @@ function uvueOutDir() {
 }
 function createExternal(config) {
     return function external(source) {
-        if (
-        // android 平台需要编译 assets 资源
-        process.env.UNI_UTS_PLATFORM !== 'app-android' &&
-            config.assetsInclude((0, utils_1.cleanUrl)(source))) {
-            return true;
-        }
         if ([
             'vue',
             'plugin-vue:export-helper',
@@ -220,7 +266,7 @@ function genUniModulesPackageJson(uniModuleId, inputDir, artifacts) {
     }, null, 2);
 }
 function parseUniModuleId(relativeFilename) {
-    const parts = (0, utils_1.normalizePath)(relativeFilename).split('/', 2);
+    const parts = (0, utils_2.normalizePath)(relativeFilename).split('/', 2);
     if (parts[0] === 'uni_modules') {
         return parts[1];
     }

package/dist/vite/plugins/uts/uni_modules.js

@@ -171,6 +171,8 @@ function uniDecryptUniModulesPlugin() {
                     mode: process.env.NODE_ENV !== 'development'
                         ? 'production'
                         : 'development',
+                    packType: process.env.UNI_APP_PACK_TYPE ||
+                        (process.env.NODE_ENV !== 'development' ? 'release' : 'debug'),
                     compilerVersion: process.env.UNI_COMPILER_VERSION,
                     appid: manifest.appid,
                     appname: manifest.name,

package/dist/vue/transforms/transformPageHead.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPageHead = void 0;
+const compiler_core_1 = require("@vue/compiler-core");
 const utils_1 = require("../../utils");
 const transformPageHead = (node, context) => {
     // 发现是page-meta下的head,直接remove该节点
-    (0, utils_1.checkElementNodeTag)(node, 'head') &&
-        (0, utils_1.checkElementNodeTag)(context.parent, 'page-meta') &&
-        context.removeNode(node);
+    if ((0, utils_1.checkElementNodeTag)(node, 'head') &&
+        (0, utils_1.checkElementNodeTag)(context.parent, 'page-meta')) {
+        ;
+        node.tag = 'page-meta-head';
+        node.tagType = compiler_core_1.ElementTypes.COMPONENT;
+    }
 };
 exports.transformPageHead = transformPageHead;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4010820240520001",
+  "version": "3.0.0-alpha-4010820240529001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240520001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240520001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240529001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240529001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240520001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240529001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",