@tarojs/taro-loader 3.3.15 → 3.4.0-beta.0
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 +3 -3
- package/lib/app.js.map +1 -1
- package/lib/component.js +2 -3
- package/lib/component.js.map +1 -1
- package/lib/h5.js +3 -3
- package/lib/h5.js.map +1 -1
- package/lib/independentPage.js +3 -3
- package/lib/independentPage.js.map +1 -1
- package/lib/native-component.js +4 -5
- package/lib/native-component.js.map +1 -1
- package/lib/page.js +4 -53
- package/lib/page.js.map +1 -1
- package/package.json +4 -6
- package/lib/utils.js +0 -77
- package/lib/utils.js.map +0 -1
package/lib/app.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const helper_1 = require("@tarojs/helper");
|
|
5
|
-
const utils_1 = require("./utils");
|
|
6
5
|
function default_1() {
|
|
7
6
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
8
7
|
const options = loader_utils_1.getOptions(this);
|
|
9
|
-
const { importFrameworkStatement, frameworkArgs, creator } =
|
|
8
|
+
const { importFrameworkStatement, frameworkArgs, creator, creatorLocation } = options.loaderMeta;
|
|
10
9
|
const config = JSON.stringify(options.config);
|
|
11
10
|
const blended = options.blended;
|
|
12
11
|
const pxTransformConfig = options.pxTransformConfig;
|
|
@@ -29,7 +28,8 @@ exports.taroApp = app
|
|
|
29
28
|
`
|
|
30
29
|
: `var inst = App(${createApp})`;
|
|
31
30
|
return `${setReconciler}
|
|
32
|
-
import {
|
|
31
|
+
import { window } from '@tarojs/runtime'
|
|
32
|
+
import { ${creator} } from '${creatorLocation}'
|
|
33
33
|
import { initPxTransform } from '@tarojs/taro'
|
|
34
34
|
import component from ${stringify(this.request.split('!').slice(thisLoaderIndex + 1).join('!'))}
|
|
35
35
|
${importFrameworkStatement}
|
package/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAE9C
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAE9C;IACE,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,+BAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAElE,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IAChG,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,sBAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/G,MAAM,SAAS,GAAG;;;EAGlB,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,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,GAAG,OAAO,eAAe,aAAa,GAAG,CAAA;IAE3D,MAAM,cAAc,GAAG,OAAO;QAC5B,CAAC,CAAC;YACM,SAAS;;;CAGpB;QACG,CAAC,CAAC,kBAAkB,SAAS,GAAG,CAAA;IAElC,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;;wBAErB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EAC7F,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;;CAE7D,CAAA;AACD,CAAC;AA9CD,4BA8CC"}
|
package/lib/component.js
CHANGED
|
@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const helper_1 = require("@tarojs/helper");
|
|
5
5
|
const path = require("path");
|
|
6
|
-
const utils_1 = require("./utils");
|
|
7
6
|
function default_1() {
|
|
8
7
|
const options = loader_utils_1.getOptions(this);
|
|
9
8
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
10
|
-
const { isNeedRawLoader } =
|
|
9
|
+
const { isNeedRawLoader, creatorLocation } = options.loaderMeta;
|
|
11
10
|
// raw is a placeholder loader to locate changed .vue resource
|
|
12
11
|
const raw = path.join(__dirname, 'raw.js');
|
|
13
12
|
const loaders = this.loaders;
|
|
@@ -19,7 +18,7 @@ function default_1() {
|
|
|
19
18
|
if (typeof PRERENDER !== 'undefined') {
|
|
20
19
|
global._prerender = inst
|
|
21
20
|
}`;
|
|
22
|
-
return `import { createComponentConfig } from '
|
|
21
|
+
return `import { createComponentConfig } from '${creatorLocation}'
|
|
23
22
|
import component from ${stringify(componentPath)}
|
|
24
23
|
var inst = Component(createComponentConfig(component, '${options.name}'))
|
|
25
24
|
${options.prerender ? prerender : ''}
|
package/lib/component.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;AAE5B;IACE,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,+BAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IAC/D,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,sBAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,mCAAmC,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7H,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,SAAS,GAAG;;;EAGlB,CAAA;IACA,OAAO,0CAA0C,eAAe;wBAC1C,SAAS,CAAC,aAAa,CAAC;yDACS,OAAO,CAAC,IAAI;EACnE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;CACnC,CAAA;AACD,CAAC;AApBD,4BAoBC"}
|
package/lib/h5.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
-
const utils_1 = require("./utils");
|
|
6
5
|
function genResource(path, pages, loaderContext) {
|
|
7
6
|
const stringify = (s) => loader_utils_1.stringifyRequest(loaderContext, s);
|
|
8
7
|
return `
|
|
@@ -18,7 +17,7 @@ function default_1() {
|
|
|
18
17
|
var _a;
|
|
19
18
|
const options = loader_utils_1.getOptions(this);
|
|
20
19
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
21
|
-
const { importFrameworkStatement, frameworkArgs, creator, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } =
|
|
20
|
+
const { importFrameworkStatement, frameworkArgs, creator, creatorLocation, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } = options.loaderMeta;
|
|
22
21
|
const config = options.config;
|
|
23
22
|
const pages = options.pages;
|
|
24
23
|
const pxTransformConfig = options.pxTransformConfig;
|
|
@@ -50,7 +49,8 @@ applyPolyfills().then(function () {
|
|
|
50
49
|
const components = options.useHtmlComponents ? compatComponentImport || '' : webComponents;
|
|
51
50
|
const code = `import { createRouter, initPxTransform } from '@tarojs/taro'
|
|
52
51
|
import component from ${stringify(path_1.join(path_1.dirname(this.resourcePath), options.filename))}
|
|
53
|
-
import {
|
|
52
|
+
import { window } from '@tarojs/runtime'
|
|
53
|
+
import { ${creator} } from '${creatorLocation}'
|
|
54
54
|
${importFrameworkStatement}
|
|
55
55
|
${components}
|
|
56
56
|
var config = ${JSON.stringify(config)}
|
package/lib/h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAE3D,+BAAoC;
|
|
1
|
+
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
|
package/lib/independentPage.js
CHANGED
|
@@ -2,13 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const path = require("path");
|
|
5
|
-
const utils_1 = require("./utils");
|
|
6
5
|
function default_1() {
|
|
7
6
|
const options = loader_utils_1.getOptions(this);
|
|
8
7
|
const config = getPageConfig(options.config, this.resourcePath);
|
|
9
8
|
const configString = JSON.stringify(config);
|
|
10
9
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
11
|
-
const { isNeedRawLoader, importFrameworkStatement, mockAppStatement, frameworkArgs, creator } =
|
|
10
|
+
const { isNeedRawLoader, importFrameworkStatement, mockAppStatement, frameworkArgs, creator, creatorLocation } = options.loaderMeta;
|
|
12
11
|
const appConfig = options.appConfig;
|
|
13
12
|
const frameworkArgsArray = frameworkArgs.split(',');
|
|
14
13
|
frameworkArgsArray.splice(frameworkArgsArray.length - 1, 1, 'appConfig');
|
|
@@ -27,7 +26,8 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
27
26
|
global._prerender = inst
|
|
28
27
|
}`;
|
|
29
28
|
return `${setReconciler}
|
|
30
|
-
import { createPageConfig,
|
|
29
|
+
import { createPageConfig, window } from '@tarojs/runtime'
|
|
30
|
+
import { ${creator} } from '${creatorLocation}'
|
|
31
31
|
import component from ${stringify(componentPath)}
|
|
32
32
|
${importFrameworkStatement}
|
|
33
33
|
var config = ${configString};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,6BAA4B;
|
|
1
|
+
{"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":"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"}
|
package/lib/native-component.js
CHANGED
|
@@ -3,16 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const loader_utils_1 = require("loader-utils");
|
|
4
4
|
const helper_1 = require("@tarojs/helper");
|
|
5
5
|
const path = require("path");
|
|
6
|
-
const utils_1 = require("./utils");
|
|
7
6
|
const page_1 = require("./page");
|
|
8
7
|
function default_1() {
|
|
9
8
|
const options = loader_utils_1.getOptions(this);
|
|
10
|
-
const { importFrameworkStatement, frameworkArgs } =
|
|
11
|
-
const {
|
|
9
|
+
const { importFrameworkStatement, frameworkArgs, isNeedRawLoader, creatorLocation } = options.loaderMeta;
|
|
10
|
+
const { config: loaderConfig } = options;
|
|
12
11
|
const config = page_1.getPageConfig(loaderConfig, this.resourcePath);
|
|
13
12
|
const configString = JSON.stringify(config);
|
|
14
13
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
15
|
-
const { isNeedRawLoader } = utils_1.frameworkMeta[framework];
|
|
16
14
|
// raw is a placeholder loader to locate changed .vue resource
|
|
17
15
|
const raw = path.join(__dirname, 'raw.js');
|
|
18
16
|
const loaders = this.loaders;
|
|
@@ -30,7 +28,8 @@ if (typeof PRERENDER !== 'undefined') {
|
|
|
30
28
|
}`;
|
|
31
29
|
return `${setReconciler}
|
|
32
30
|
import { defaultReconciler } from '@tarojs/shared'
|
|
33
|
-
import {
|
|
31
|
+
import { container, SERVICE_IDENTIFIER } from '@tarojs/runtime'
|
|
32
|
+
import { createNativeComponentConfig } from '${creatorLocation}'
|
|
34
33
|
${importFrameworkStatement}
|
|
35
34
|
var hooks = container.get(SERVICE_IDENTIFIER.Hooks)
|
|
36
35
|
hooks.initNativeApiImpls = [defaultReconciler.initNativeApi]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;AAC5B,iCAAsC;AAEtC;IACE,MAAM,OAAO,GAAG,yBAAU,CAAC,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,oBAAa,CAAC,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,+BAAgB,CAAC,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,sBAAa,CAAC,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,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,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,SAAS,GAAG;;;EAGlB,CAAA;IAEA,OAAO,GAAG,aAAa;;;+CAGsB,eAAe;EAC5D,wBAAwB;;;0BAGA,SAAS,CAAC,aAAa,CAAC;eACnC,YAAY;8DACmC,aAAa;EACzE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;CACnC,CAAA;AACD,CAAC;AAnCD,4BAmCC"}
|
package/lib/page.js
CHANGED
|
@@ -4,16 +4,13 @@ exports.getPageConfig = void 0;
|
|
|
4
4
|
const loader_utils_1 = require("loader-utils");
|
|
5
5
|
const helper_1 = require("@tarojs/helper");
|
|
6
6
|
const path = require("path");
|
|
7
|
-
const acorn = require("acorn");
|
|
8
|
-
const walk = require("acorn-walk");
|
|
9
|
-
const utils_1 = require("./utils");
|
|
10
7
|
function default_1(source) {
|
|
11
8
|
const options = loader_utils_1.getOptions(this);
|
|
12
|
-
const {
|
|
9
|
+
const { config: loaderConfig } = options;
|
|
13
10
|
const config = getPageConfig(loaderConfig, this.resourcePath);
|
|
14
11
|
const configString = JSON.stringify(config);
|
|
15
12
|
const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
|
|
16
|
-
const { isNeedRawLoader } =
|
|
13
|
+
const { isNeedRawLoader } = options.loaderMeta;
|
|
17
14
|
// raw is a placeholder loader to locate changed .vue resource
|
|
18
15
|
const raw = path.join(__dirname, 'raw.js');
|
|
19
16
|
const loaders = this.loaders;
|
|
@@ -25,8 +22,8 @@ function default_1(source) {
|
|
|
25
22
|
if (typeof PRERENDER !== 'undefined') {
|
|
26
23
|
global._prerender = inst
|
|
27
24
|
}`;
|
|
28
|
-
if (
|
|
29
|
-
|
|
25
|
+
if (typeof options.loaderMeta.modifyConfig === 'function') {
|
|
26
|
+
options.loaderMeta.modifyConfig(config, source);
|
|
30
27
|
}
|
|
31
28
|
return `import { createPageConfig } from '@tarojs/runtime'
|
|
32
29
|
import component from ${stringify(componentPath)}
|
|
@@ -52,50 +49,4 @@ exports.getPageConfig = getPageConfig;
|
|
|
52
49
|
function removeExt(file) {
|
|
53
50
|
return path.join(path.dirname(file), path.basename(file, path.extname(file)));
|
|
54
51
|
}
|
|
55
|
-
function addConfig(source) {
|
|
56
|
-
const configsMap = {
|
|
57
|
-
enableShareAppMessage: ['onShareAppMessage', 'useShareAppMessage'],
|
|
58
|
-
enableShareTimeline: ['onShareTimeline', 'useShareTimeline']
|
|
59
|
-
};
|
|
60
|
-
const ast = acorn.parse(source, {
|
|
61
|
-
ecmaVersion: 'latest',
|
|
62
|
-
sourceType: 'module'
|
|
63
|
-
});
|
|
64
|
-
const additionConfig = {};
|
|
65
|
-
function check(name) {
|
|
66
|
-
Object.keys(configsMap).forEach(configName => {
|
|
67
|
-
const apis = configsMap[configName];
|
|
68
|
-
if (apis.includes(name)) {
|
|
69
|
-
additionConfig[configName] = true;
|
|
70
|
-
}
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
walk.simple(ast, {
|
|
74
|
-
FunctionExpression(node) {
|
|
75
|
-
if (!node.id || !node.id.name)
|
|
76
|
-
return;
|
|
77
|
-
check(node.id.name);
|
|
78
|
-
},
|
|
79
|
-
FunctionDeclaration(node) {
|
|
80
|
-
if (!node.id || !node.id.name)
|
|
81
|
-
return;
|
|
82
|
-
check(node.id.name);
|
|
83
|
-
},
|
|
84
|
-
CallExpression(node) {
|
|
85
|
-
const { callee } = node;
|
|
86
|
-
if (callee.type === 'Identifier') {
|
|
87
|
-
check(callee.name);
|
|
88
|
-
}
|
|
89
|
-
else if (callee.type === 'MemberExpression') {
|
|
90
|
-
if (callee.property.type === 'Identifier') {
|
|
91
|
-
check(callee.property.name);
|
|
92
|
-
}
|
|
93
|
-
else if (callee.property.type === 'Literal') {
|
|
94
|
-
check(callee.property.value);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
return additionConfig;
|
|
100
|
-
}
|
|
101
52
|
//# sourceMappingURL=page.js.map
|
package/lib/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;AAO5B,mBAA6D,MAAc;IACzE,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACxC,MAAM,MAAM,GAAG,aAAa,CAAC,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,+BAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,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,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,sBAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAA;IACxH,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,SAAS,GAAG;;;EAGlB,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;wBACe,SAAS,CAAC,aAAa,CAAC;eACjC,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;+CAC/B,OAAO,CAAC,IAAI;EACzD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;CACnC,CAAA;AACD,CAAC;AA/BD,4BA+BC;AAED,SAAgB,aAAa,CAAE,OAAmC,EAAE,YAAoB;IACtF,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACtD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE;YAChD,OAAO,MAAM,CAAC,OAAO,CAAA;SACtB;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AATD,sCASC;AAED,SAAS,SAAS,CAAE,IAAY;IAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC/E,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-loader",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.4.0-beta.0",
|
|
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,16 +26,14 @@
|
|
|
26
26
|
"url": "https://github.com/NervJS/taro/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@tarojs/helper": "3.
|
|
30
|
-
"acorn": "^8.0.4",
|
|
31
|
-
"acorn-walk": "^8.0.0",
|
|
29
|
+
"@tarojs/helper": "3.4.0-beta.0",
|
|
32
30
|
"loader-utils": "^1.2.3"
|
|
33
31
|
},
|
|
34
32
|
"publishConfig": {
|
|
35
33
|
"access": "public"
|
|
36
34
|
},
|
|
37
35
|
"devDependencies": {
|
|
38
|
-
"@tarojs/taro": "3.
|
|
36
|
+
"@tarojs/taro": "3.4.0-beta.0"
|
|
39
37
|
},
|
|
40
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "107670bc2360ee9136a0e558e6d5fad1db640fba"
|
|
41
39
|
}
|
package/lib/utils.js
DELETED
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.frameworkMeta = void 0;
|
|
4
|
-
exports.frameworkMeta = {
|
|
5
|
-
vue: {
|
|
6
|
-
importFrameworkStatement: `
|
|
7
|
-
import Vue from 'vue';
|
|
8
|
-
`,
|
|
9
|
-
mockAppStatement: `
|
|
10
|
-
const App = {
|
|
11
|
-
render (h) {
|
|
12
|
-
// this.$slots.default 是将要会渲染的页面
|
|
13
|
-
return h('block', this.$slots.default)
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
`,
|
|
17
|
-
frameworkArgs: 'Vue, config',
|
|
18
|
-
creator: 'createVueApp',
|
|
19
|
-
importFrameworkName: 'Vue',
|
|
20
|
-
isNeedRawLoader: true,
|
|
21
|
-
extraImportForWeb: `
|
|
22
|
-
require('@tarojs/components/dist-h5/vue')
|
|
23
|
-
`
|
|
24
|
-
},
|
|
25
|
-
vue3: {
|
|
26
|
-
importFrameworkStatement: `
|
|
27
|
-
import { h, createApp } from 'vue'
|
|
28
|
-
`,
|
|
29
|
-
mockAppStatement: `
|
|
30
|
-
const App = createApp({})
|
|
31
|
-
`,
|
|
32
|
-
frameworkArgs: 'h, config',
|
|
33
|
-
creator: 'createVue3App',
|
|
34
|
-
importFrameworkName: 'h',
|
|
35
|
-
isNeedRawLoader: true,
|
|
36
|
-
extraImportForWeb: `
|
|
37
|
-
import { initVue3Components } from '@tarojs/components/dist-h5/vue3'
|
|
38
|
-
`,
|
|
39
|
-
execBeforeCreateWebApp: `
|
|
40
|
-
initVue3Components(component)
|
|
41
|
-
`
|
|
42
|
-
},
|
|
43
|
-
nerv: {
|
|
44
|
-
importFrameworkStatement: `
|
|
45
|
-
import Nerv from 'nervjs';
|
|
46
|
-
`,
|
|
47
|
-
mockAppStatement: `
|
|
48
|
-
class App extends Nerv.Component {
|
|
49
|
-
render () {
|
|
50
|
-
return this.props.children
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
`,
|
|
54
|
-
frameworkArgs: 'Nerv, Nerv, config',
|
|
55
|
-
creator: 'createReactApp',
|
|
56
|
-
importFrameworkName: 'Nerv'
|
|
57
|
-
},
|
|
58
|
-
react: {
|
|
59
|
-
importFrameworkStatement: `
|
|
60
|
-
import * as React from 'react'
|
|
61
|
-
import ReactDOM from 'react-dom'
|
|
62
|
-
`,
|
|
63
|
-
mockAppStatement: `
|
|
64
|
-
class App extends React.Component {
|
|
65
|
-
render () {
|
|
66
|
-
return this.props.children
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
`,
|
|
70
|
-
frameworkArgs: 'React, ReactDOM, config',
|
|
71
|
-
creator: 'createReactApp',
|
|
72
|
-
importFrameworkName: 'React',
|
|
73
|
-
compatComponentImport: 'import { PullDownRefresh } from "@tarojs/components"',
|
|
74
|
-
compatComponentExtra: 'config.PullDownRefresh = PullDownRefresh'
|
|
75
|
-
}
|
|
76
|
-
};
|
|
77
|
-
//# sourceMappingURL=utils.js.map
|
package/lib/utils.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAWrB;IACH,GAAG,EAAE;QACH,wBAAwB,EAAE;;CAE7B;QACG,gBAAgB,EAAE;;;;;;;CAOrB;QACG,aAAa,EAAE,aAAa;QAC5B,OAAO,EAAE,cAAc;QACvB,mBAAmB,EAAE,KAAK;QAC1B,eAAe,EAAE,IAAI;QACrB,iBAAiB,EAAE;;CAEtB;KACE;IACD,IAAI,EAAE;QACJ,wBAAwB,EAAE;;CAE7B;QACG,gBAAgB,EAAE;;CAErB;QACG,aAAa,EAAE,WAAW;QAC1B,OAAO,EAAE,eAAe;QACxB,mBAAmB,EAAE,GAAG;QACxB,eAAe,EAAE,IAAI;QACrB,iBAAiB,EAAE;;CAEtB;QACG,sBAAsB,EAAE;;CAE3B;KACE;IACD,IAAI,EAAE;QACJ,wBAAwB,EAAE;;CAE7B;QACG,gBAAgB,EAAE;;;;;;CAMrB;QACG,aAAa,EAAE,oBAAoB;QACnC,OAAO,EAAE,gBAAgB;QACzB,mBAAmB,EAAE,MAAM;KAC5B;IACD,KAAK,EAAE;QACL,wBAAwB,EAAE;;;CAG7B;QACG,gBAAgB,EAAE;;;;;;CAMrB;QACG,aAAa,EAAE,yBAAyB;QACxC,OAAO,EAAE,gBAAgB;QACzB,mBAAmB,EAAE,OAAO;QAC5B,qBAAqB,EAAE,sDAAsD;QAC7E,oBAAoB,EAAE,0CAA0C;KACjE;CACF,CAAA"}
|