@dcloudio/uni-cli-shared 3.0.0-alpha-3040820220424004 → 3.0.0-alpha-3040820220424005
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/json/pages.js +15 -2
- package/package.json +3 -3
package/dist/json/pages.js
CHANGED
|
@@ -168,12 +168,25 @@ function normalizeSubpackageSubNVues(root, style = { navigationBar: {} }) {
|
|
|
168
168
|
return style;
|
|
169
169
|
}
|
|
170
170
|
function normalizePageStyle(pagePath, pageStyle, platform) {
|
|
171
|
-
const
|
|
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']);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcloudio/uni-cli-shared",
|
|
3
|
-
"version": "3.0.0-alpha-
|
|
3
|
+
"version": "3.0.0-alpha-3040820220424005",
|
|
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-
|
|
26
|
-
"@dcloudio/uni-shared": "3.0.0-alpha-
|
|
25
|
+
"@dcloudio/uni-i18n": "3.0.0-alpha-3040820220424005",
|
|
26
|
+
"@dcloudio/uni-shared": "3.0.0-alpha-3040820220424005",
|
|
27
27
|
"@intlify/core-base": "9.1.9",
|
|
28
28
|
"@intlify/shared": "9.1.9",
|
|
29
29
|
"@intlify/vue-devtools": "9.1.9",
|