@tarojs/taro-loader 3.6.11 → 3.6.12
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/native-component.js +5 -4
- package/lib/native-component.js.map +1 -1
- 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/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,EAAG,GAAG,OAAO,CAAA;IAC7F,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-loader",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.12",
|
|
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.
|
|
26
|
-
"@tarojs/taro": "3.6.
|
|
25
|
+
"@tarojs/helper": "3.6.12",
|
|
26
|
+
"@tarojs/taro": "3.6.12"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"jest": "^29.3.1",
|