@dcloudio/uni-cli-shared 3.0.0-alpha-3050420220804002 → 3.0.0-alpha-3050420220804005

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -35,7 +35,7 @@ function initSplashscreen(manifestJson, userManifestJson) {
35
35
  exports.initSplashscreen = initSplashscreen;
36
36
  function getSplashscreen(manifestJson) {
37
37
  var _a;
38
- const splashscreenOptions = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.splashscreen;
38
+ const splashscreenOptions = ((_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.splashscreen) || {};
39
39
  return {
40
40
  autoclose: splashscreenOptions.autoclose !== false,
41
41
  alwaysShowBeforeRender: splashscreenOptions.alwaysShowBeforeRender !== false,
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = void 0;
4
4
  const shared_1 = require("@vue/shared");
5
+ const merge_1 = require("merge");
5
6
  const json_1 = require("../json");
6
7
  const projectKeys = [
7
8
  'appid',
@@ -31,8 +32,15 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
31
32
  if (platformConfig) {
32
33
  projectKeys.forEach((name) => {
33
34
  if ((0, shared_1.hasOwn)(platformConfig, name)) {
34
- ;
35
- projectJson[name] = platformConfig[name];
35
+ if ((0, shared_1.isPlainObject)(platformConfig[name]) &&
36
+ (0, shared_1.isPlainObject)(projectJson[name])) {
37
+ ;
38
+ projectJson[name] = (0, merge_1.recursive)(true, projectJson[name], platformConfig[name]);
39
+ }
40
+ else {
41
+ ;
42
+ projectJson[name] = platformConfig[name];
43
+ }
36
44
  }
37
45
  });
38
46
  }
@@ -234,6 +234,7 @@ function normalizeNavigationBar(pageStyle) {
234
234
  delete pageStyle[name];
235
235
  }
236
236
  });
237
+ navigationBar.type = navigationBar.type || 'default';
237
238
  const { titleNView } = pageStyle;
238
239
  if ((0, shared_1.isPlainObject)(titleNView)) {
239
240
  (0, shared_1.extend)(navigationBar, titleNView);
package/dist/resolve.js CHANGED
@@ -23,7 +23,7 @@ function resolveWithSymlinks(id, basedir) {
23
23
  // necessary to work with pnpm
24
24
  preserveSymlinks: true,
25
25
  pathFilter(pkg, filepath, relativePath) {
26
- if (pkg.dcloudext && pkg.dcloudext.type === 'native-uts') {
26
+ if (pkg.uni_modules && pkg.uni_modules.type === 'uts') {
27
27
  if (process.env.UNI_APP_PLATFORM === 'app-android' ||
28
28
  process.env.UNI_APP_PLATFORM === 'app-ios') {
29
29
  const file = process.env.UNI_APP_PLATFORM + '/index.uts';
package/lib/.DS_Store ADDED
Binary file
Binary file
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcloudio/uni-cli-shared",
3
- "version": "3.0.0-alpha-3050420220804002",
3
+ "version": "3.0.0-alpha-3050420220804005",
4
4
  "description": "@dcloudio/uni-cli-shared",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
22
22
  "@babel/core": "^7.17.9",
23
23
  "@babel/parser": "^7.17.9",
24
24
  "@babel/types": "^7.17.0",
25
- "@dcloudio/uni-i18n": "3.0.0-alpha-3050420220804002",
26
- "@dcloudio/uni-shared": "3.0.0-alpha-3050420220804002",
25
+ "@dcloudio/uni-i18n": "3.0.0-alpha-3050420220804005",
26
+ "@dcloudio/uni-shared": "3.0.0-alpha-3050420220804005",
27
27
  "@intlify/core-base": "9.1.9",
28
28
  "@intlify/shared": "9.1.9",
29
29
  "@intlify/vue-devtools": "9.1.9",