@tarojs/taro-loader 3.7.0-alpha.2 → 3.7.0-alpha.22
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/app.js +2 -1
- package/lib/app.js.map +1 -1
- package/lib/h5.js +4 -3
- package/lib/h5.js.map +1 -1
- package/lib/native-component.js +5 -4
- package/lib/native-component.js.map +1 -1
- package/lib/native-page.js +55 -0
- package/lib/native-page.js.map +1 -0
- package/lib/util.js +18 -0
- package/lib/util.js.map +1 -0
- package/package.json +3 -3
package/lib/app.js
CHANGED
|
@@ -10,6 +10,7 @@ function default_1() {
|
|
|
10
10
|
const { importFrameworkStatement, frameworkArgs, creator, creatorLocation, modifyInstantiate } = options.loaderMeta;
|
|
11
11
|
const config = JSON.stringify(options.config);
|
|
12
12
|
const blended = options.blended;
|
|
13
|
+
const newBlended = options.newBlended;
|
|
13
14
|
const pxTransformConfig = options.pxTransformConfig;
|
|
14
15
|
const loaders = this.loaders;
|
|
15
16
|
const thisLoaderIndex = loaders.findIndex(item => (0, helper_1.normalizePath)(item.path).indexOf('@tarojs/taro-loader') >= 0);
|
|
@@ -30,7 +31,7 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
30
31
|
}
|
|
31
32
|
}, '');
|
|
32
33
|
const createApp = `${creator}(component, ${frameworkArgs})`;
|
|
33
|
-
let instantiateApp = blended
|
|
34
|
+
let instantiateApp = blended || newBlended
|
|
34
35
|
? `
|
|
35
36
|
var app = ${createApp}
|
|
36
37
|
app.onLaunch()
|
package/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,+CAA2D;AAE3D,2CAAsC;AAItC;;IACE,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAElE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACnH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/G,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,IAAI,iBAAiB,GAAG,EAAE,CAAA;IAC1B,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACvB,iBAAiB,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,oBAAQ,EAAE,EAAE,CAAC,KAAK,CAAA;YAC/D,OAAO,GAAG,CAAA;SACX;aAAM;YACL,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;SAClC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,GAAG,OAAO,eAAe,aAAa,GAAG,CAAA;IAE3D,IAAI,cAAc,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/lib/h5.js
CHANGED
|
@@ -13,7 +13,7 @@ function genResource(path, pages, loaderContext, syncFileName = false) {
|
|
|
13
13
|
const page = ${importDependent}(${stringify((0, path_1.join)(loaderContext.context, syncFileName || path))})
|
|
14
14
|
return [page, context, params]
|
|
15
15
|
}
|
|
16
|
-
}, ${JSON.stringify((0, helper_1.readConfig)(pages.get(path)))})`;
|
|
16
|
+
}, ${JSON.stringify((0, helper_1.readConfig)(pages.get(path.split(path_1.sep).join('/'))))})`;
|
|
17
17
|
}
|
|
18
18
|
function default_1() {
|
|
19
19
|
var _a, _b;
|
|
@@ -24,7 +24,7 @@ function default_1() {
|
|
|
24
24
|
const isBuildNativeComp = options.isBuildNativeComp;
|
|
25
25
|
const isMultiRouterMode = routerMode === 'multi';
|
|
26
26
|
const pathDirname = (0, path_1.dirname)(this.resourcePath);
|
|
27
|
-
const pageName = isMultiRouterMode ? (0, path_1.join)(pathDirname, options.filename).replace(options.sourceDir +
|
|
27
|
+
const pageName = isMultiRouterMode ? (0, path_1.join)(pathDirname, options.filename).replace(options.sourceDir + path_1.sep, '') : '';
|
|
28
28
|
const pages = new Map(options.pages);
|
|
29
29
|
const pxTransformConfig = options.pxTransformConfig;
|
|
30
30
|
const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
|
|
@@ -40,7 +40,8 @@ function default_1() {
|
|
|
40
40
|
}, '');
|
|
41
41
|
if (isBuildNativeComp) {
|
|
42
42
|
const compPath = (0, path_1.join)(pathDirname, options.filename);
|
|
43
|
-
return
|
|
43
|
+
return `${setReconciler}
|
|
44
|
+
import component from ${stringify(compPath)}
|
|
44
45
|
import { initPxTransform } from '@tarojs/taro'
|
|
45
46
|
${setReconcilerPost}
|
|
46
47
|
component.config = {}
|
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,+
|
|
1
|
+
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
|
package/lib/native-component.js
CHANGED
|
@@ -7,9 +7,10 @@ const page_1 = require("./page");
|
|
|
7
7
|
function default_1() {
|
|
8
8
|
var _a;
|
|
9
9
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
10
|
-
const {
|
|
11
|
-
const {
|
|
10
|
+
const { loaderMeta = {}, config: loaderConfig, isNewBlended = false, runtimePath } = options;
|
|
11
|
+
const { importFrameworkStatement, frameworkArgs, isNeedRawLoader, creatorLocation } = loaderMeta;
|
|
12
12
|
const config = (0, page_1.getPageConfig)(loaderConfig, this.resourcePath);
|
|
13
|
+
config.isNewBlended = isNewBlended;
|
|
13
14
|
const configString = JSON.stringify(config);
|
|
14
15
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
15
16
|
// raw is a placeholder loader to locate changed .vue resource
|
|
@@ -19,8 +20,8 @@ function default_1() {
|
|
|
19
20
|
const componentPath = isNeedRawLoader
|
|
20
21
|
? `${raw}!${this.resourcePath}`
|
|
21
22
|
: this.request.split('!').slice(thisLoaderIndex + 1).join('!');
|
|
22
|
-
const
|
|
23
|
-
const setReconciler =
|
|
23
|
+
const processedRuntimePath = Array.isArray(runtimePath) ? runtimePath : [runtimePath];
|
|
24
|
+
const setReconciler = processedRuntimePath.reduce((res, item) => {
|
|
24
25
|
if (/^@tarojs\/plugin-(react|vue)-devtools/.test(item))
|
|
25
26
|
return res;
|
|
26
27
|
return res + `import '${item}'\n`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,+CAA2D;AAC3D,6BAA4B;AAE5B,iCAAsC;AAItC;;IACE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,+CAA2D;AAC3D,6BAA4B;AAE5B,iCAAsC;AAItC;;IACE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC5F,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,UAAU,CAAA;IAChG,MAAM,MAAM,GAAG,IAAA,oBAAa,EAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC7D,MAAM,CAAC,YAAY,GAAG,YAAY,CAAA;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,8DAA8D;IAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,0CAA0C,CAAC,IAAI,CAAC,CAAC,CAAA;IACpI,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE;QAC/B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChE,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;IACrF,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAC9D,IAAI,uCAAuC,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,GAAG,CAAA;QAClE,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,OAAO,GAAG,aAAa;+CACsB,eAAe;EAC5D,wBAAwB;0BACA,SAAS,CAAC,aAAa,CAAC;eACnC,YAAY;8DACmC,aAAa;EACzE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;CAEnC,CAAA;AACD,CAAC;AApCD,4BAoCC"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const helper_1 = require("@tarojs/helper");
|
|
4
|
+
const loader_utils_1 = require("loader-utils");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const page_1 = require("./page");
|
|
7
|
+
function default_1(source) {
|
|
8
|
+
var _a;
|
|
9
|
+
const options = (0, loader_utils_1.getOptions)(this);
|
|
10
|
+
const { importFrameworkStatement, frameworkArgs, isNeedRawLoader, creatorLocation } = options.loaderMeta;
|
|
11
|
+
const { config: loaderConfig } = options;
|
|
12
|
+
const config = (0, page_1.getPageConfig)(loaderConfig, this.resourcePath);
|
|
13
|
+
const configString = JSON.stringify(config);
|
|
14
|
+
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
15
|
+
// raw is a placeholder loader to locate changed .vue resource
|
|
16
|
+
const raw = path.join(__dirname, 'raw.js');
|
|
17
|
+
const loaders = this.loaders;
|
|
18
|
+
const thisLoaderIndex = loaders.findIndex(item => (0, helper_1.normalizePath)(item.path).indexOf('@tarojs/taro-loader/lib/native-page') >= 0);
|
|
19
|
+
const componentPath = isNeedRawLoader
|
|
20
|
+
? `${raw}!${this.resourcePath}`
|
|
21
|
+
: this.request.split('!').slice(thisLoaderIndex + 1).join('!');
|
|
22
|
+
const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
|
|
23
|
+
const setReconciler = runtimePath.reduce((res, item) => {
|
|
24
|
+
if (/^@tarojs\/plugin-(react|vue)-devtools/.test(item))
|
|
25
|
+
return res;
|
|
26
|
+
return res + `import '${item}'\n`;
|
|
27
|
+
}, '');
|
|
28
|
+
const { globalObject } = ((_a = this._compilation) === null || _a === void 0 ? void 0 : _a.outputOptions) || { globalObject: 'wx' };
|
|
29
|
+
const prerender = `
|
|
30
|
+
if (typeof PRERENDER !== 'undefined') {
|
|
31
|
+
${globalObject}._prerender = inst
|
|
32
|
+
}`;
|
|
33
|
+
const hmr = !options.hot ? '' : `if (process.env.NODE_ENV !== 'production') {
|
|
34
|
+
const cache = __webpack_require__.c || {}
|
|
35
|
+
Object.keys(cache).forEach(item => {
|
|
36
|
+
if (item.indexOf('${options.name}') !== -1) delete cache[item]
|
|
37
|
+
})
|
|
38
|
+
}`;
|
|
39
|
+
if (typeof options.loaderMeta.modifyConfig === 'function') {
|
|
40
|
+
options.loaderMeta.modifyConfig(config, source);
|
|
41
|
+
}
|
|
42
|
+
return `${setReconciler}
|
|
43
|
+
import { createNativePageConfig } from '${creatorLocation}'
|
|
44
|
+
${importFrameworkStatement}
|
|
45
|
+
var component = require(${stringify(componentPath)}).default
|
|
46
|
+
var config = ${configString};
|
|
47
|
+
${config.enableShareTimeline ? 'component.enableShareTimeline = true' : ''}
|
|
48
|
+
${config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : ''}
|
|
49
|
+
var inst = Page(createNativePageConfig(component, '${options.name}', {root:{cn:[]}}, ${frameworkArgs}))
|
|
50
|
+
${options.prerender ? prerender : ''}
|
|
51
|
+
${hmr}
|
|
52
|
+
`;
|
|
53
|
+
}
|
|
54
|
+
exports.default = default_1;
|
|
55
|
+
//# sourceMappingURL=native-page.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-page.js","sourceRoot":"","sources":["../src/native-page.ts"],"names":[],"mappings":"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"}
|
package/lib/util.js
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPkgVersion = exports.getRootPath = void 0;
|
|
4
|
+
const helper_1 = require("@tarojs/helper");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
function getRootPath() {
|
|
7
|
+
return path.resolve(__dirname, '../');
|
|
8
|
+
}
|
|
9
|
+
exports.getRootPath = getRootPath;
|
|
10
|
+
function getPkgVersion() {
|
|
11
|
+
const pkgPath = path.join(getRootPath(), 'package.json');
|
|
12
|
+
if (helper_1.fs.existsSync(pkgPath)) {
|
|
13
|
+
return require(pkgPath).version;
|
|
14
|
+
}
|
|
15
|
+
return 'unknown';
|
|
16
|
+
}
|
|
17
|
+
exports.getPkgVersion = getPkgVersion;
|
|
18
|
+
//# sourceMappingURL=util.js.map
|
package/lib/util.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,6BAA4B;AAE5B,SAAgB,WAAW;IACzB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;AACvC,CAAC;AAFD,kCAEC;AAED,SAAgB,aAAa;IAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,cAAc,CAAC,CAAA;IAExD,IAAI,WAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;KAChC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AARD,sCAQC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-loader",
|
|
3
|
-
"version": "3.7.0-alpha.
|
|
3
|
+
"version": "3.7.0-alpha.22",
|
|
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.7.0-alpha.
|
|
26
|
-
"@tarojs/taro": "3.7.0-alpha.
|
|
25
|
+
"@tarojs/helper": "3.7.0-alpha.22",
|
|
26
|
+
"@tarojs/taro": "3.7.0-alpha.22"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"jest": "^29.3.1",
|