@tarojs/taro-loader 3.4.6 → 3.5.0-alpha.1
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 +31 -10
- package/lib/h5.js.map +1 -1
- package/package.json +7 -4
package/lib/h5.js
CHANGED
|
@@ -1,26 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const helper_1 = require("@tarojs/helper");
|
|
3
4
|
const loader_utils_1 = require("loader-utils");
|
|
4
5
|
const path_1 = require("path");
|
|
5
|
-
|
|
6
|
-
function genResource(path, pages, loaderContext) {
|
|
6
|
+
function genResource(path, pages, loaderContext, syncFileName = false) {
|
|
7
7
|
const stringify = (s) => loader_utils_1.stringifyRequest(loaderContext, s);
|
|
8
|
+
if (syncFileName) {
|
|
9
|
+
return `
|
|
10
|
+
Object.assign({
|
|
11
|
+
path: '${path}',
|
|
12
|
+
load: function() {
|
|
13
|
+
return require(${stringify(path_1.join(loaderContext.context, syncFileName))})
|
|
14
|
+
}
|
|
15
|
+
}, ${JSON.stringify(helper_1.readConfig(pages.get(path)))})
|
|
16
|
+
`;
|
|
17
|
+
}
|
|
8
18
|
return `
|
|
9
19
|
Object.assign({
|
|
10
20
|
path: '${path}',
|
|
11
21
|
load: function() {
|
|
12
22
|
return import(${stringify(path_1.join(loaderContext.context, path))})
|
|
13
23
|
}
|
|
14
|
-
}, ${JSON.stringify(helper_1.readConfig(pages.get(path)))})
|
|
24
|
+
}, ${JSON.stringify(helper_1.readConfig(pages.get(path)))})
|
|
15
25
|
`;
|
|
26
|
+
// TODO 优化加载 config 方法，保留 config 文件内的变量
|
|
16
27
|
}
|
|
17
28
|
function default_1() {
|
|
18
|
-
var _a;
|
|
29
|
+
var _a, _b;
|
|
19
30
|
const options = loader_utils_1.getOptions(this);
|
|
20
31
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
21
32
|
const { importFrameworkStatement, frameworkArgs, creator, creatorLocation, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } = options.loaderMeta;
|
|
22
33
|
const config = options.config;
|
|
23
34
|
const pages = options.pages;
|
|
35
|
+
const routerMode = ((_a = config === null || config === void 0 ? void 0 : config.router) === null || _a === void 0 ? void 0 : _a.mode) || 'hash';
|
|
36
|
+
const isMultiRouterMode = routerMode === 'multi';
|
|
24
37
|
const pxTransformConfig = options.pxTransformConfig;
|
|
25
38
|
let tabBarCode = `var tabbarIconPath = []
|
|
26
39
|
var tabbarSelectedIconPath = []
|
|
@@ -48,8 +61,18 @@ applyPolyfills().then(function () {
|
|
|
48
61
|
})
|
|
49
62
|
`;
|
|
50
63
|
const components = options.useHtmlComponents ? compatComponentImport || '' : webComponents;
|
|
51
|
-
const
|
|
52
|
-
|
|
64
|
+
const routerCreator = isMultiRouterMode ? 'createMultiRouter' : 'createRouter';
|
|
65
|
+
const pageName = isMultiRouterMode ? path_1.join(path_1.dirname(this.resourcePath), options.filename).replace(options.sourceDir + '/', '') : '';
|
|
66
|
+
const routesConfig = isMultiRouterMode ? `
|
|
67
|
+
config.routes = []
|
|
68
|
+
config.route = ${genResource(pageName, pages, this, options.filename)}
|
|
69
|
+
config.pageName = "${pageName}"` : `
|
|
70
|
+
config.routes = [
|
|
71
|
+
${(_b = config.pages) === null || _b === void 0 ? void 0 : _b.map(path => genResource(path, pages, this)).join(',')}
|
|
72
|
+
]`;
|
|
73
|
+
const code = `import { initPxTransform } from '@tarojs/taro'
|
|
74
|
+
import { ${routerCreator} } from '@tarojs/router'
|
|
75
|
+
import component from ${stringify(path_1.join(options.sourceDir, options.entryFileName))}
|
|
53
76
|
import { window } from '@tarojs/runtime'
|
|
54
77
|
import { ${creator} } from '${creatorLocation}'
|
|
55
78
|
${importFrameworkStatement}
|
|
@@ -69,13 +92,11 @@ if (config.tabBar) {
|
|
|
69
92
|
}
|
|
70
93
|
}
|
|
71
94
|
}
|
|
72
|
-
|
|
73
|
-
${(_a = config.pages) === null || _a === void 0 ? void 0 : _a.map(path => genResource(path, pages, this)).join('')}
|
|
74
|
-
]
|
|
95
|
+
${routesConfig}
|
|
75
96
|
${options.useHtmlComponents ? compatComponentExtra : ''}
|
|
76
97
|
${execBeforeCreateWebApp || ''}
|
|
77
98
|
var inst = ${creator}(component, ${frameworkArgs})
|
|
78
|
-
|
|
99
|
+
${routerCreator}(inst, config, ${importFrameworkName})
|
|
79
100
|
initPxTransform({
|
|
80
101
|
designWidth: ${pxTransformConfig.designWidth},
|
|
81
102
|
deviceRatio: ${JSON.stringify(pxTransformConfig.deviceRatio)}
|
package/lib/h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":";;
|
|
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.
|
|
3
|
+
"version": "3.5.0-alpha.1",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "yuche <i@yuche.me>",
|
|
6
6
|
"homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme",
|
|
@@ -26,12 +26,15 @@
|
|
|
26
26
|
"url": "https://github.com/NervJS/taro/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@tarojs/helper": "3.
|
|
30
|
-
"@tarojs/taro": "3.
|
|
29
|
+
"@tarojs/helper": "3.5.0-alpha.1",
|
|
30
|
+
"@tarojs/taro": "3.5.0-alpha.1",
|
|
31
31
|
"loader-utils": "^1.2.3"
|
|
32
32
|
},
|
|
33
33
|
"publishConfig": {
|
|
34
34
|
"access": "public"
|
|
35
35
|
},
|
|
36
|
-
"
|
|
36
|
+
"devDependencies": {
|
|
37
|
+
"webpack": "^4"
|
|
38
|
+
},
|
|
39
|
+
"gitHead": "3bd136d26d77b847a1a18e028d5b0d048c89f288"
|
|
37
40
|
}
|