@tarojs/taro-loader 3.6.0-beta.2 → 3.6.0-beta.3
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/lib/h5.js +18 -14
- package/lib/h5.js.map +1 -1
- package/package.json +3 -3
package/lib/h5.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const helper_1 = require("@tarojs/helper");
|
|
4
4
|
const loader_utils_1 = require("loader-utils");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const constants_1 = require("./constants");
|
|
6
7
|
function genResource(path, pages, loaderContext, syncFileName = false) {
|
|
7
8
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(loaderContext, s);
|
|
8
9
|
const importDependent = syncFileName ? 'require' : 'import';
|
|
@@ -18,7 +19,7 @@ function default_1() {
|
|
|
18
19
|
var _a, _b, _c;
|
|
19
20
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
20
21
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
21
|
-
const {
|
|
22
|
+
const { frameworkArgs, creator, creatorLocation, importFrameworkStatement, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp } = options.loaderMeta;
|
|
22
23
|
const config = options.config;
|
|
23
24
|
const pages = options.pages;
|
|
24
25
|
const routerMode = ((_a = config === null || config === void 0 ? void 0 : config.router) === null || _a === void 0 ? void 0 : _a.mode) || 'hash';
|
|
@@ -58,29 +59,33 @@ var tabbarSelectedIconPath = []
|
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
|
|
62
|
+
const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
|
|
63
|
+
let setReconcilerPost = '';
|
|
64
|
+
const setReconciler = runtimePath.reduce((res, item) => {
|
|
65
|
+
if (constants_1.REG_POST.test(item)) {
|
|
66
|
+
setReconcilerPost += `import '${item.replace(constants_1.REG_POST, '')}'\n`;
|
|
67
|
+
return res;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
return res + `import '${item}'\n`;
|
|
71
|
+
}
|
|
72
|
+
}, '');
|
|
70
73
|
const routesConfig = isMultiRouterMode ? `config.routes = []
|
|
71
74
|
config.route = ${genResource(pageName, pages, this, options.filename)}
|
|
72
75
|
config.pageName = "${pageName}"` : `config.routes = [
|
|
73
76
|
${(_c = config.pages) === null || _c === void 0 ? void 0 : _c.map(path => genResource(path, pages, this)).join(',')}
|
|
74
77
|
]`;
|
|
75
78
|
const routerCreator = isMultiRouterMode ? 'createMultiRouter' : 'createRouter';
|
|
76
|
-
const code =
|
|
79
|
+
const code = `${setReconciler}
|
|
80
|
+
import { initPxTransform } from '@tarojs/taro'
|
|
77
81
|
import { ${routerCreator} } from '@tarojs/router'
|
|
78
82
|
import component from ${stringify((0, path_1.join)(options.sourceDir, options.entryFileName))}
|
|
79
83
|
import { window } from '@tarojs/runtime'
|
|
80
84
|
import { ${creator} } from '${creatorLocation}'
|
|
81
|
-
var config = ${JSON.stringify(config)}
|
|
82
85
|
${importFrameworkStatement}
|
|
83
|
-
${
|
|
86
|
+
${extraImportForWeb}
|
|
87
|
+
${setReconcilerPost}
|
|
88
|
+
var config = ${JSON.stringify(config)}
|
|
84
89
|
window.__taroAppConfig = config
|
|
85
90
|
${config.tabBar ? tabBarCode : ''}
|
|
86
91
|
if (config.tabBar) {
|
|
@@ -96,7 +101,6 @@ if (config.tabBar) {
|
|
|
96
101
|
}
|
|
97
102
|
}
|
|
98
103
|
${routesConfig}
|
|
99
|
-
${options.useHtmlComponents ? compatComponentExtra : ''}
|
|
100
104
|
${execBeforeCreateWebApp || ''}
|
|
101
105
|
var inst = ${creator}(component, ${frameworkArgs})
|
|
102
106
|
${routerCreator}(inst, config, ${importFrameworkName})
|
package/lib/h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":";;AAAA,2CAA2C;AAG3C,+CAA2D;AAC3D,+BAAoC;
|
|
1
|
+
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-loader",
|
|
3
|
-
"version": "3.6.0-beta.
|
|
3
|
+
"version": "3.6.0-beta.3",
|
|
4
4
|
"description": "Taro runner use webpack loader",
|
|
5
5
|
"author": "yuche <i@yuche.me>",
|
|
6
6
|
"homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"loader-utils": "^1.2.3",
|
|
25
|
-
"@tarojs/helper": "3.6.0-beta.
|
|
26
|
-
"@tarojs/taro": "3.6.0-beta.
|
|
25
|
+
"@tarojs/helper": "3.6.0-beta.3",
|
|
26
|
+
"@tarojs/taro": "3.6.0-beta.3"
|
|
27
27
|
},
|
|
28
28
|
"publishConfig": {
|
|
29
29
|
"access": "public"
|