@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211119002 → 3.0.0-alpha-3021320211119003

package/dist/json/app/manifest/splashscreen.d.ts

@@ -1 +1,5 @@
 export declare function initSplashscreen(manifestJson: Record<string, any>, userManifestJson: Record<string, any>): void;
+export declare function getSplashscreen(manifestJson: Record<string, any>): {
+    autoclose: boolean;
+    alwaysShowBeforeRender: boolean;
+};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initSplashscreen = void 0;
+exports.getSplashscreen = exports.initSplashscreen = void 0;
 const shared_1 = require("@vue/shared");
 function initSplashscreen(manifestJson, userManifestJson) {
     if (!manifestJson.plus.splashscreen) {
@@ -21,8 +21,6 @@ function initSplashscreen(manifestJson, userManifestJson) {
         }
         manifestJson.plus.splashscreen.autoclose = true;
         manifestJson.plus.splashscreen.delay = 0;
-        // 简单起见，直接设置环境变量，这样生成uniConfig时，直接读取判断
-        process.env.UNI_SPLASHSCREEN_ALWAYSSHOWBEFORERENDER = 'true';
     }
     else {
         // 不启用白屏检测
@@ -30,10 +28,17 @@ function initSplashscreen(manifestJson, userManifestJson) {
         if (manifestJson.plus.splashscreen.autoclose) {
             // 启用 uni-app 框架关闭 splash
             manifestJson.plus.splashscreen.autoclose = false; // 原 5+ autoclose 改为 false
-            // 简单起见，直接设置环境变量，这样生成uniConfig时，直接读取判断
-            process.env.UNI_SPLASHSCREEN_AUTOCLOSE = 'true';
         }
     }
     delete manifestJson.plus.splashscreen.alwaysShowBeforeRender;
 }
 exports.initSplashscreen = initSplashscreen;
+function getSplashscreen(manifestJson) {
+    var _a;
+    const splashscreenOptions = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.splashscreen;
+    return {
+        autoclose: splashscreenOptions.autoclose !== false,
+        alwaysShowBeforeRender: splashscreenOptions.alwaysShowBeforeRender !== false,
+    };
+}
+exports.getSplashscreen = getSplashscreen;

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

@@ -8,8 +8,10 @@ const path_1 = __importDefault(require("path"));
 const i18n_1 = require("../../../i18n");
 const manifest_1 = require("../../manifest");
 const manifest_2 = require("../manifest");
+const splashscreen_1 = require("../manifest/splashscreen");
 function normalizeAppUniConfig(pagesJson, manifestJson) {
     var _a;
+    const { autoclose, alwaysShowBeforeRender } = (0, splashscreen_1.getSplashscreen)(manifestJson);
     const config = {
         pages: [],
         globalStyle: pagesJson.globalStyle,
@@ -21,11 +23,8 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         renderer: ((_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.renderer) === 'native' ? 'native' : 'auto',
         appname: manifestJson.name || '',
         splashscreen: {
-            alwaysShowBeforeRender: process.env
-                .UNI_SPLASHSCREEN_ALWAYSSHOWBEFORERENDER
-                ? true
-                : false,
-            autoclose: process.env.UNI_SPLASHSCREEN_AUTOCLOSE ? true : false,
+            alwaysShowBeforeRender,
+            autoclose,
         },
         compilerVersion: process.env.UNI_COMPILER_VERSION,
         entryPagePath: pagesJson.pages[0].path,

package/dist/resolve.js

@@ -10,6 +10,7 @@ const debug_1 = __importDefault(require("debug"));
 const resolve_1 = __importDefault(require("resolve"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("./utils");
+const env_1 = require("./hbx/env");
 const DEFAULT_EXTENSIONS = ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json'];
 function resolveWithSymlinks(id, basedir) {
     return resolve_1.default.sync(id, {
@@ -50,20 +51,23 @@ function initPaths() {
     if (cliContext) {
         const pathSet = new Set();
         pathSet.add(path_1.default.join(cliContext, 'node_modules'));
-        [`@dcloudio/uni-` + process.env.UNI_PLATFORM, ...ownerModules].forEach((ownerModule) => {
-            let pkgPath = '';
-            try {
-                pkgPath = require.resolve(ownerModule + '/package.json', {
-                    paths: [cliContext],
-                });
-            }
-            catch (e) { }
-            if (pkgPath) {
-                resolveNodeModulePath(path_1.default.dirname(pkgPath)).forEach((nodeModulePath) => {
-                    pathSet.add(nodeModulePath);
-                });
-            }
-        });
+        if (!(0, env_1.isInHBuilderX)()) {
+            ;
+            [`@dcloudio/uni-` + process.env.UNI_PLATFORM, ...ownerModules].forEach((ownerModule) => {
+                let pkgPath = '';
+                try {
+                    pkgPath = require.resolve(ownerModule + '/package.json', {
+                        paths: [cliContext],
+                    });
+                }
+                catch (e) { }
+                if (pkgPath) {
+                    resolveNodeModulePath(path_1.default.dirname(pkgPath)).forEach((nodeModulePath) => {
+                        pathSet.add(nodeModulePath);
+                    });
+                }
+            });
+        }
         paths.push(...pathSet);
         (0, debug_1.default)('uni-paths')(paths);
     }
@@ -82,7 +86,12 @@ exports.resolveBuiltIn = resolveBuiltIn;
 let componentsLibPath = '';
 function resolveComponentsLibPath() {
     if (!componentsLibPath) {
-        componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), '../lib');
+        if ((0, env_1.isInHBuilderX)()) {
+            componentsLibPath = path_1.default.join(resolveBuiltIn('@dcloudio/uni-components/package.json'), '../lib');
+        }
+        else {
+            componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), '../lib');
+        }
     }
     return componentsLibPath;
 }

package/package.json

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