@dcloudio/uni-cli-shared 3.0.0-alpha-3040820220424004 → 3.0.0-alpha-3041020220513001

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.
package/dist/constants.js CHANGED
@@ -7,7 +7,7 @@ exports.EXTNAME_TS = ['.ts', '.tsx'];
7
7
  exports.EXTNAME_VUE = ['.vue', '.nvue'];
8
8
  exports.EXTNAME_VUE_TEMPLATE = ['.vue', '.nvue', '.jsx', '.tsx'];
9
9
  exports.EXTNAME_VUE_RE = /\.(vue|nvue)$/;
10
- exports.EXTNAME_JS_RE = /\.[jt]sx?$/;
10
+ exports.EXTNAME_JS_RE = /\.(js|jsx|ts|tsx|mjs)$/;
11
11
  exports.EXTNAME_TS_RE = /\.tsx?$/;
12
12
  exports.extensions = [
13
13
  '.mjs',
@@ -168,12 +168,25 @@ function normalizeSubpackageSubNVues(root, style = { navigationBar: {} }) {
168
168
  return style;
169
169
  }
170
170
  function normalizePageStyle(pagePath, pageStyle, platform) {
171
- const isNVue = pagePath &&
171
+ const hasNVue = pagePath &&
172
172
  process.env.UNI_INPUT_DIR &&
173
- process.env.UNI_NVUE_COMPILER !== 'vue' &&
174
173
  fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.nvue'))
175
174
  ? true
176
175
  : undefined;
176
+ let isNVue = false;
177
+ if (hasNVue) {
178
+ const hasVue = fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.vue'));
179
+ if (hasVue) {
180
+ if (platform === 'app') {
181
+ if (process.env.UNI_NVUE_COMPILER !== 'vue') {
182
+ isNVue = true;
183
+ }
184
+ }
185
+ }
186
+ else {
187
+ isNVue = true;
188
+ }
189
+ }
177
190
  if (pageStyle) {
178
191
  if (platform === 'h5') {
179
192
  (0, shared_1.extend)(pageStyle, pageStyle['app'] || pageStyle['app-plus']);
@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.isJsFile = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.isInternalRequest = exports.ENV_PUBLIC_PATH = exports.CLIENT_PUBLIC_PATH = exports.VALID_ID_PREFIX = exports.FS_PREFIX = exports.isImportRequest = exports.parseVueRequest = void 0;
7
7
  const path_1 = __importDefault(require("path"));
8
- const querystring_1 = __importDefault(require("querystring"));
9
8
  const constants_1 = require("../../constants");
10
9
  function parseVueRequest(id) {
11
10
  const [filename, rawQuery] = id.split(`?`, 2);
12
- const query = querystring_1.default.parse(rawQuery);
11
+ const query = Object.fromEntries(new URLSearchParams(rawQuery));
13
12
  if (query.vue != null) {
14
13
  query.vue = true;
15
14
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcloudio/uni-cli-shared",
3
- "version": "3.0.0-alpha-3040820220424004",
3
+ "version": "3.0.0-alpha-3041020220513001",
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-3040820220424004",
26
- "@dcloudio/uni-shared": "3.0.0-alpha-3040820220424004",
25
+ "@dcloudio/uni-i18n": "3.0.0-alpha-3041020220513001",
26
+ "@dcloudio/uni-shared": "3.0.0-alpha-3041020220513001",
27
27
  "@intlify/core-base": "9.1.9",
28
28
  "@intlify/shared": "9.1.9",
29
29
  "@intlify/vue-devtools": "9.1.9",
package/lib/.DS_Store DELETED
Binary file
Binary file