@tarojs/taro-loader 3.7.0-beta.3 → 3.7.0-beta.4
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 +6 -5
- package/lib/app.js.map +1 -1
- package/lib/component.js +8 -7
- package/lib/component.js.map +1 -1
- package/lib/entry-cache.js +15 -0
- package/lib/entry-cache.js.map +1 -0
- package/lib/h5.js +2 -1
- package/lib/h5.js.map +1 -1
- package/lib/independentPage.js +8 -4
- package/lib/independentPage.js.map +1 -1
- package/lib/native-component.js +7 -6
- package/lib/native-component.js.map +1 -1
- package/lib/native-page.js +8 -7
- package/lib/native-page.js.map +1 -1
- package/lib/page.js +8 -7
- package/lib/page.js.map +1 -1
- package/package.json +3 -3
package/lib/app.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const helper_1 = require("@tarojs/helper");
|
|
4
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
|
+
const path = require("path");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
|
-
|
|
6
|
+
const entry_cache_1 = require("./entry-cache");
|
|
7
|
+
function default_1(source) {
|
|
7
8
|
var _a;
|
|
8
9
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
9
10
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
@@ -12,9 +13,9 @@ function default_1() {
|
|
|
12
13
|
const blended = options.blended;
|
|
13
14
|
const newBlended = options.newBlended;
|
|
14
15
|
const pxTransformConfig = options.pxTransformConfig;
|
|
15
|
-
const loaders = this.loaders;
|
|
16
|
-
const thisLoaderIndex = loaders.findIndex(item => (0, helper_1.normalizePath)(item.path).indexOf('@tarojs/taro-loader') >= 0);
|
|
17
16
|
const { globalObject } = ((_a = this._compilation) === null || _a === void 0 ? void 0 : _a.outputOptions) || { globalObject: 'wx' };
|
|
17
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + '?name=app';
|
|
18
|
+
entry_cache_1.entryCache.set('app', source);
|
|
18
19
|
const prerender = `
|
|
19
20
|
if (typeof PRERENDER !== 'undefined') {
|
|
20
21
|
${globalObject}._prerender = inst
|
|
@@ -46,7 +47,7 @@ import { window } from '@tarojs/runtime'
|
|
|
46
47
|
import { ${creator} } from '${creatorLocation}'
|
|
47
48
|
import { initPxTransform } from '@tarojs/taro'
|
|
48
49
|
${setReconcilerPost}
|
|
49
|
-
import component from ${stringify(
|
|
50
|
+
import component from ${stringify(['!', entryCacheLoader, this.resourcePath].join('!'))}
|
|
50
51
|
${importFrameworkStatement}
|
|
51
52
|
var config = ${config};
|
|
52
53
|
window.__taroAppConfig = config
|
package/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAE5B,2CAAsC;AACtC,+CAA0C;AAI1C,mBAA2D,MAAc;;IACvE,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,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;IACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IACnF,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,WAAW,CAAA;IAC7E,wBAAU,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAE7B,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,IAAI,UAAU;QACxC,CAAC,CAAC;YACM,SAAS;;;CAGpB;QACG,CAAC,CAAC,kBAAkB,SAAS,GAAG,CAAA;IAElC,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE;QAC3C,cAAc,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;KAC1D;IAED,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;;EAE3C,iBAAiB;wBACK,SAAS,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EACrF,wBAAwB;eACX,MAAM;;EAEnB,cAAc;EACd,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;iBAEnB,iBAAiB,CAAC,WAAW;iBAC7B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC;kBAC5C,iBAAiB,CAAC,YAAY,IAAI,EAAE;mBACnC,iBAAiB,CAAC,aAAa;gBAClC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC;;CAE3D,CAAA;AACD,CAAC;AA9DD,4BA8DC"}
|
package/lib/component.js
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const helper_1 = require("@tarojs/helper");
|
|
4
3
|
const loader_utils_1 = require("loader-utils");
|
|
5
4
|
const path = require("path");
|
|
6
|
-
|
|
5
|
+
const entry_cache_1 = require("./entry-cache");
|
|
6
|
+
function default_1(source) {
|
|
7
7
|
var _a;
|
|
8
8
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
9
9
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
10
|
+
const pageName = options.name;
|
|
10
11
|
const { isNeedRawLoader } = options.loaderMeta;
|
|
11
12
|
// raw is a placeholder loader to locate changed .vue resource
|
|
12
13
|
const raw = path.join(__dirname, 'raw.js');
|
|
13
|
-
const
|
|
14
|
-
|
|
14
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + `?name=${pageName}`;
|
|
15
|
+
entry_cache_1.entryCache.set(pageName, source);
|
|
15
16
|
const componentPath = isNeedRawLoader
|
|
16
|
-
?
|
|
17
|
-
:
|
|
17
|
+
? ['!', raw, entryCacheLoader, this.resourcePath].join('!')
|
|
18
|
+
: ['!', entryCacheLoader, this.resourcePath].join('!');
|
|
18
19
|
const { globalObject } = ((_a = this._compilation) === null || _a === void 0 ? void 0 : _a.outputOptions) || { globalObject: 'wx' };
|
|
19
20
|
const prerender = `
|
|
20
21
|
if (typeof PRERENDER !== 'undefined') {
|
|
@@ -22,7 +23,7 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
22
23
|
}`;
|
|
23
24
|
return `import { createComponentConfig } from '@tarojs/runtime'
|
|
24
25
|
import component from ${stringify(componentPath)}
|
|
25
|
-
var inst = Component(createComponentConfig(component, '${
|
|
26
|
+
var inst = Component(createComponentConfig(component, '${pageName}'))
|
|
26
27
|
${options.prerender ? prerender : ''}
|
|
27
28
|
export default component
|
|
28
29
|
`;
|
package/lib/component.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAE5B,+CAA0C;AAI1C,mBAA2D,MAAc;;IACvE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IAC7B,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IAC9C,8DAA8D;IAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,SAAS,QAAQ,EAAE,CAAA;IACrF,wBAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAChC,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,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;IACA,OAAO;wBACe,SAAS,CAAC,aAAa,CAAC;yDACS,QAAQ;EAC/D,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;CAEnC,CAAA;AACD,CAAC;AAxBD,4BAwBC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.entryCache = void 0;
|
|
4
|
+
const loader_utils_1 = require("loader-utils");
|
|
5
|
+
exports.entryCache = new Map();
|
|
6
|
+
function default_1() {
|
|
7
|
+
const { name } = (0, loader_utils_1.getOptions)(this);
|
|
8
|
+
if (name && exports.entryCache.has(name)) {
|
|
9
|
+
const content = exports.entryCache.get(name);
|
|
10
|
+
exports.entryCache.delete(name);
|
|
11
|
+
return content;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.default = default_1;
|
|
15
|
+
//# sourceMappingURL=entry-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-cache.js","sourceRoot":"","sources":["../src/entry-cache.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAE5B,QAAA,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAA;AAEnD;IACE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IACjC,IAAI,IAAI,IAAI,kBAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAChC,MAAM,OAAO,GAAG,kBAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpC,kBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACvB,OAAO,OAAO,CAAA;KACf;AACH,CAAC;AAPD,4BAOC"}
|
package/lib/h5.js
CHANGED
|
@@ -5,6 +5,7 @@ const loader_utils_1 = require("loader-utils");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const constants_1 = require("./constants");
|
|
7
7
|
function genResource(path, pages, loaderContext, syncFileName = false) {
|
|
8
|
+
const options = (0, loader_utils_1.getOptions)(loaderContext);
|
|
8
9
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(loaderContext, s);
|
|
9
10
|
const importDependent = syncFileName ? 'require' : 'import';
|
|
10
11
|
return `Object.assign({
|
|
@@ -13,7 +14,7 @@ function genResource(path, pages, loaderContext, syncFileName = false) {
|
|
|
13
14
|
const page = ${importDependent}(${stringify((0, path_1.join)(loaderContext.context, syncFileName || path))})
|
|
14
15
|
return [page, context, params]
|
|
15
16
|
}
|
|
16
|
-
}, ${JSON.stringify((0, helper_1.readConfig)(pages.get(path.split(path_1.sep).join('/'))))})`;
|
|
17
|
+
}, ${JSON.stringify((0, helper_1.readConfig)(pages.get(path.split(path_1.sep).join('/')), options))})`;
|
|
17
18
|
}
|
|
18
19
|
function default_1() {
|
|
19
20
|
var _a, _b;
|
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,+BAAyC;AAEzC,2CAAsC;AAItC,SAAS,WAAW,CAAE,IAAY,EAAE,KAA0B,EAAE,aAAyC,EAAE,eAA+B,KAAK;IAC7I,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IAC3E,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAA;IAC3D,OAAO;WACE,IAAI;;mBAEI,eAAe,IAAI,SAAS,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC,CAAC;;;KAG7F,IAAI,CAAC,SAAS,CAAC,IAAA,mBAAU,EAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
|
package/lib/independentPage.js
CHANGED
|
@@ -3,22 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
|
-
|
|
6
|
+
const entry_cache_1 = require("./entry-cache");
|
|
7
|
+
function default_1(source) {
|
|
7
8
|
var _a;
|
|
8
9
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
9
10
|
const config = getPageConfig(options.config, this.resourcePath);
|
|
10
11
|
const configString = JSON.stringify(config);
|
|
11
12
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
13
|
+
const pageName = options.name;
|
|
12
14
|
const { isNeedRawLoader, importFrameworkStatement, mockAppStatement, frameworkArgs, creator, creatorLocation } = options.loaderMeta;
|
|
13
15
|
const appConfig = options.appConfig;
|
|
14
16
|
const frameworkArgsArray = frameworkArgs.split(',');
|
|
15
17
|
frameworkArgsArray.splice(frameworkArgsArray.length - 1, 1, 'appConfig');
|
|
16
18
|
const frameworkArgsCopy = frameworkArgsArray.join(',');
|
|
17
19
|
// raw is a placeholder loader to locate changed .vue resource
|
|
20
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + `?name=${pageName}`;
|
|
21
|
+
entry_cache_1.entryCache.set(pageName, source);
|
|
18
22
|
const raw = path.join(__dirname, 'raw.js');
|
|
19
23
|
const componentPath = isNeedRawLoader
|
|
20
|
-
?
|
|
21
|
-
:
|
|
24
|
+
? ['!', raw, entryCacheLoader, this.resourcePath].join('!')
|
|
25
|
+
: ['!', entryCacheLoader, this.resourcePath].join('!');
|
|
22
26
|
const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
|
|
23
27
|
let setReconcilerPost = '';
|
|
24
28
|
const setReconciler = runtimePath.reduce((res, item) => {
|
|
@@ -48,7 +52,7 @@ ${creator}(App, ${frameworkArgsCopy})
|
|
|
48
52
|
var component = require(${stringify(componentPath)}).default
|
|
49
53
|
${config.enableShareTimeline ? 'component.enableShareTimeline = true' : ''}
|
|
50
54
|
${config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : ''}
|
|
51
|
-
var inst = Page(createPageConfig(component, '${
|
|
55
|
+
var inst = Page(createPageConfig(component, '${pageName}', {}, config || {}))
|
|
52
56
|
${options.prerender ? prerender : ''}
|
|
53
57
|
export default component
|
|
54
58
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAE5B,2CAAsC;
|
|
1
|
+
{"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":"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"}
|
package/lib/native-component.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const helper_1 = require("@tarojs/helper");
|
|
4
3
|
const loader_utils_1 = require("loader-utils");
|
|
5
4
|
const path = require("path");
|
|
5
|
+
const entry_cache_1 = require("./entry-cache");
|
|
6
6
|
const page_1 = require("./page");
|
|
7
|
-
function default_1() {
|
|
7
|
+
function default_1(source) {
|
|
8
8
|
var _a;
|
|
9
9
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
10
10
|
const { loaderMeta = {}, config: loaderConfig, isNewBlended = false, runtimePath } = options;
|
|
@@ -13,13 +13,14 @@ function default_1() {
|
|
|
13
13
|
config.isNewBlended = isNewBlended;
|
|
14
14
|
const configString = JSON.stringify(config);
|
|
15
15
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
16
|
+
const pageName = options.name;
|
|
16
17
|
// raw is a placeholder loader to locate changed .vue resource
|
|
18
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + `?name=${pageName}`;
|
|
19
|
+
entry_cache_1.entryCache.set(pageName, source);
|
|
17
20
|
const raw = path.join(__dirname, 'raw.js');
|
|
18
|
-
const loaders = this.loaders;
|
|
19
|
-
const thisLoaderIndex = loaders.findIndex(item => (0, helper_1.normalizePath)(item.path).indexOf('@tarojs/taro-loader/lib/native-component') >= 0);
|
|
20
21
|
const componentPath = isNeedRawLoader
|
|
21
|
-
?
|
|
22
|
-
:
|
|
22
|
+
? ['!', raw, entryCacheLoader, this.resourcePath].join('!')
|
|
23
|
+
: ['!', entryCacheLoader, this.resourcePath].join('!');
|
|
23
24
|
const processedRuntimePath = Array.isArray(runtimePath) ? runtimePath : [runtimePath];
|
|
24
25
|
const setReconciler = processedRuntimePath.reduce((res, item) => {
|
|
25
26
|
if (/^@tarojs\/plugin-(react|vue)-devtools/.test(item))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAE5B,+CAA0C;AAC1C,iCAAsC;AAItC,mBAA2D,MAAc;;IACvE,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,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IAC7B,8DAA8D;IAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,SAAS,QAAQ,EAAE,CAAA;IACrF,wBAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,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;AArCD,4BAqCC"}
|
package/lib/native-page.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const helper_1 = require("@tarojs/helper");
|
|
4
3
|
const loader_utils_1 = require("loader-utils");
|
|
5
4
|
const path = require("path");
|
|
5
|
+
const entry_cache_1 = require("./entry-cache");
|
|
6
6
|
const page_1 = require("./page");
|
|
7
7
|
function default_1(source) {
|
|
8
8
|
var _a;
|
|
@@ -12,13 +12,14 @@ function default_1(source) {
|
|
|
12
12
|
const config = (0, page_1.getPageConfig)(loaderConfig, this.resourcePath);
|
|
13
13
|
const configString = JSON.stringify(config);
|
|
14
14
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
15
|
+
const pageName = options.name;
|
|
15
16
|
// raw is a placeholder loader to locate changed .vue resource
|
|
17
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + `?name=${pageName}`;
|
|
18
|
+
entry_cache_1.entryCache.set(pageName, source);
|
|
16
19
|
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
20
|
const componentPath = isNeedRawLoader
|
|
20
|
-
?
|
|
21
|
-
:
|
|
21
|
+
? ['!', raw, entryCacheLoader, this.resourcePath].join('!')
|
|
22
|
+
: ['!', entryCacheLoader, this.resourcePath].join('!');
|
|
22
23
|
const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
|
|
23
24
|
const setReconciler = runtimePath.reduce((res, item) => {
|
|
24
25
|
if (/^@tarojs\/plugin-(react|vue)-devtools/.test(item))
|
|
@@ -33,7 +34,7 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
33
34
|
const hmr = !options.hot ? '' : `if (process.env.NODE_ENV !== 'production') {
|
|
34
35
|
const cache = __webpack_require__.c || {}
|
|
35
36
|
Object.keys(cache).forEach(item => {
|
|
36
|
-
if (item.indexOf('${
|
|
37
|
+
if (item.indexOf('${pageName}') !== -1) delete cache[item]
|
|
37
38
|
})
|
|
38
39
|
}`;
|
|
39
40
|
if (typeof options.loaderMeta.modifyConfig === 'function') {
|
|
@@ -46,7 +47,7 @@ var component = require(${stringify(componentPath)}).default
|
|
|
46
47
|
var config = ${configString};
|
|
47
48
|
${config.enableShareTimeline ? 'component.enableShareTimeline = true' : ''}
|
|
48
49
|
${config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : ''}
|
|
49
|
-
var inst = Page(createNativePageConfig(component, '${
|
|
50
|
+
var inst = Page(createNativePageConfig(component, '${pageName}', {root:{cn:[]}}, ${frameworkArgs}))
|
|
50
51
|
${options.prerender ? prerender : ''}
|
|
51
52
|
${hmr}
|
|
52
53
|
`;
|
package/lib/native-page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-page.js","sourceRoot":"","sources":["../src/native-page.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"native-page.js","sourceRoot":"","sources":["../src/native-page.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAE5B,+CAA0C;AAC1C,iCAAsC;AAItC,mBAA2D,MAAc;;IACvE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACxG,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACxC,MAAM,MAAM,GAAG,IAAA,oBAAa,EAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC7D,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,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IAC7B,8DAA8D;IAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,SAAS,QAAQ,EAAE,CAAA;IACrF,wBAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,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,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,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,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;;;wBAGV,QAAQ;;EAE9B,CAAA;IAEA,IAAI,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,KAAK,UAAU,EAAE;QACzD,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAChD;IAED,OAAO,GAAG,aAAa;0CACiB,eAAe;EACvD,wBAAwB;0BACA,SAAS,CAAC,aAAa,CAAC;eACnC,YAAY;EACzB,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE;EACxE,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,EAAE;qDACzB,QAAQ,sBAAsB,aAAa;EAC9F,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;EAClC,GAAG;CACJ,CAAA;AACD,CAAC;AAjDD,4BAiDC"}
|
package/lib/page.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getPageConfig = void 0;
|
|
4
|
-
const helper_1 = require("@tarojs/helper");
|
|
5
4
|
const loader_utils_1 = require("loader-utils");
|
|
6
5
|
const path = require("path");
|
|
6
|
+
const entry_cache_1 = require("./entry-cache");
|
|
7
7
|
function default_1(source) {
|
|
8
8
|
var _a;
|
|
9
9
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
@@ -11,14 +11,15 @@ function default_1(source) {
|
|
|
11
11
|
const config = getPageConfig(loaderConfig, this.resourcePath);
|
|
12
12
|
const configString = JSON.stringify(config);
|
|
13
13
|
const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
|
|
14
|
+
const pageName = options.name;
|
|
14
15
|
const { isNeedRawLoader, modifyInstantiate } = options.loaderMeta;
|
|
15
16
|
// raw is a placeholder loader to locate changed .vue resource
|
|
17
|
+
const entryCacheLoader = path.join(__dirname, 'entry-cache.js') + `?name=${pageName}`;
|
|
18
|
+
entry_cache_1.entryCache.set(pageName, source);
|
|
16
19
|
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/page') >= 0);
|
|
19
20
|
const componentPath = isNeedRawLoader
|
|
20
|
-
?
|
|
21
|
-
:
|
|
21
|
+
? ['!', raw, entryCacheLoader, this.resourcePath].join('!')
|
|
22
|
+
: ['!', entryCacheLoader, this.resourcePath].join('!');
|
|
22
23
|
const { globalObject } = ((_a = this._compilation) === null || _a === void 0 ? void 0 : _a.outputOptions) || { globalObject: 'wx' };
|
|
23
24
|
const prerender = `
|
|
24
25
|
if (typeof PRERENDER !== 'undefined') {
|
|
@@ -27,13 +28,13 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
27
28
|
const hmr = !options.hot ? '' : `if (process.env.NODE_ENV !== 'production') {
|
|
28
29
|
const cache = __webpack_require__.c || {}
|
|
29
30
|
Object.keys(cache).forEach(item => {
|
|
30
|
-
if (item.indexOf('${
|
|
31
|
+
if (item.indexOf('${pageName}') !== -1) delete cache[item]
|
|
31
32
|
})
|
|
32
33
|
}`;
|
|
33
34
|
if (typeof options.loaderMeta.modifyConfig === 'function') {
|
|
34
35
|
options.loaderMeta.modifyConfig(config, source);
|
|
35
36
|
}
|
|
36
|
-
let instantiatePage = `var inst = Page(createPageConfig(component, '${
|
|
37
|
+
let instantiatePage = `var inst = Page(createPageConfig(component, '${pageName}', {root:{cn:[]}}, config || {}))`;
|
|
37
38
|
if (typeof modifyInstantiate === 'function') {
|
|
38
39
|
instantiatePage = modifyInstantiate(instantiatePage, 'page');
|
|
39
40
|
}
|
package/lib/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.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.7.0-beta.
|
|
3
|
+
"version": "3.7.0-beta.4",
|
|
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-beta.
|
|
26
|
-
"@tarojs/taro": "3.7.0-beta.
|
|
25
|
+
"@tarojs/helper": "3.7.0-beta.4",
|
|
26
|
+
"@tarojs/taro": "3.7.0-beta.4"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"jest": "^29.3.1",
|