@tarojs/taro-loader 3.3.20 → 3.4.0-beta.3

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 CHANGED
@@ -2,19 +2,19 @@
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 } = utils_1.frameworkMeta[options.framework];
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;
13
12
  const loaders = this.loaders;
14
13
  const thisLoaderIndex = loaders.findIndex(item => helper_1.normalizePath(item.path).indexOf('@tarojs/taro-loader') >= 0);
14
+ const { globalObject } = this._compilation.outputOptions;
15
15
  const prerender = `
16
16
  if (typeof PRERENDER !== 'undefined') {
17
- global._prerender = inst
17
+ ${globalObject}._prerender = inst
18
18
  }`;
19
19
  const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
20
20
  const setReconciler = runtimePath.reduce((res, item) => {
@@ -29,7 +29,8 @@ exports.taroApp = app
29
29
  `
30
30
  : `var inst = App(${createApp})`;
31
31
  return `${setReconciler}
32
- import { ${creator}, window } from '@tarojs/runtime'
32
+ import { window } from '@tarojs/runtime'
33
+ import { ${creator} } from '${creatorLocation}'
33
34
  import { initPxTransform } from '@tarojs/taro'
34
35
  import component from ${stringify(this.request.split('!').slice(thisLoaderIndex + 1).join('!'))}
35
36
  ${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,mCAAuC;AAEvC;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,GAAG,qBAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC7F,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;WACd,OAAO;;wBAEM,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;AA7CD,4BA6CC"}
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;IAC/G,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAA;IAExD,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,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;AA/CD,4BA+CC"}
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 } = utils_1.frameworkMeta[options.framework];
9
+ const { isNeedRawLoader } = 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;
@@ -15,9 +14,10 @@ function default_1() {
15
14
  const componentPath = isNeedRawLoader
16
15
  ? `${raw}!${this.resourcePath}`
17
16
  : this.request.split('!').slice(thisLoaderIndex + 1).join('!');
17
+ const { globalObject } = this._compilation.outputOptions;
18
18
  const prerender = `
19
19
  if (typeof PRERENDER !== 'undefined') {
20
- global._prerender = inst
20
+ ${globalObject}._prerender = inst
21
21
  }`;
22
22
  return `import { createComponentConfig } from '@tarojs/runtime'
23
23
  import component from ${stringify(componentPath)}
@@ -1 +1 @@
1
- {"version":3,"file":"component.js","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAC3D,2CAA8C;AAC9C,6BAA4B;AAC5B,mCAAuC;AAEvC;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,GAAG,qBAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC5D,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;wBACe,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"}
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,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,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,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAA;IAExD,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IACA,OAAO;wBACe,SAAS,CAAC,aAAa,CAAC;yDACS,OAAO,CAAC,IAAI;EACnE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;CACnC,CAAA;AACD,CAAC;AAtBD,4BAsBC"}
package/lib/h5.js CHANGED
@@ -2,7 +2,7 @@
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");
5
+ const helper_1 = require("@tarojs/helper");
6
6
  function genResource(path, pages, loaderContext) {
7
7
  const stringify = (s) => loader_utils_1.stringifyRequest(loaderContext, s);
8
8
  return `
@@ -11,14 +11,14 @@ function genResource(path, pages, loaderContext) {
11
11
  load: function() {
12
12
  return import(${stringify(path_1.join(loaderContext.context, path))})
13
13
  }
14
- }, require(${stringify(pages.get(path))}).default || {}),
14
+ }, ${JSON.stringify(helper_1.readConfig(pages.get(path)))}),
15
15
  `;
16
16
  }
17
17
  function default_1() {
18
18
  var _a;
19
19
  const options = loader_utils_1.getOptions(this);
20
20
  const stringify = (s) => loader_utils_1.stringifyRequest(this, s);
21
- const { importFrameworkStatement, frameworkArgs, creator, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } = utils_1.frameworkMeta[options.framework];
21
+ const { importFrameworkStatement, frameworkArgs, creator, creatorLocation, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } = options.loaderMeta;
22
22
  const config = options.config;
23
23
  const pages = options.pages;
24
24
  const pxTransformConfig = options.pxTransformConfig;
@@ -50,7 +50,8 @@ applyPolyfills().then(function () {
50
50
  const components = options.useHtmlComponents ? compatComponentImport || '' : webComponents;
51
51
  const code = `import { createRouter, initPxTransform } from '@tarojs/taro'
52
52
  import component from ${stringify(path_1.join(path_1.dirname(this.resourcePath), options.filename))}
53
- import { ${creator}, window } from '@tarojs/runtime'
53
+ import { window } from '@tarojs/runtime'
54
+ import { ${creator} } from '${creatorLocation}'
54
55
  ${importFrameworkStatement}
55
56
  ${components}
56
57
  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;AACpC,mCAAuC;AAEvC,SAAS,WAAW,CAAE,IAAY,EAAE,KAA0B,EAAE,aAA2C;IACzG,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,+BAAgB,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IAC3E,OAAO;;eAEM,IAAI;;0BAEO,SAAS,CAAC,WAAI,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;;eAEvD,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;CACzC,CAAA;AACD,CAAC;AAED;;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,EACJ,wBAAwB,EACxB,aAAa,EACb,OAAO,EACP,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACrB,GAAG,qBAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACpC,MAAM,MAAM,GAAc,OAAO,CAAC,MAAM,CAAA;IACxC,MAAM,KAAK,GAAwB,OAAO,CAAC,KAAK,CAAA;IAChD,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,IAAI,UAAU,GAAG;;CAElB,CAAA;IACC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACxE,UAAU,IAAI,kBAAkB,CAAC,sBAAsB,QAAQ,4BAA4B,QAAQ,uBAAuB,QAAQ,KAAK,CAAA;aACxI;YACD,IAAI,CAAC,CAAC,gBAAgB,EAAE;gBACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAA;gBAChF,UAAU,IAAI,0BAA0B,CAAC,sBAAsB,QAAQ,4BAA4B,QAAQ,uBAAuB,QAAQ,KAAK,CAAA;aAChJ;SACF;KACF;IAED,MAAM,aAAa,GAAG;;;EAGtB,iBAAiB,IAAI,EAAE;;;;CAIxB,CAAA;IAEC,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAA;IAE1F,MAAM,IAAI,GAAG;wBACS,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;WAC1E,OAAO;EAChB,wBAAwB;EACxB,UAAU;eACG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;EAEnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;IAc7B,MAAA,MAAM,CAAC,KAAK,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;;EAEpE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;EACrD,sBAAsB,IAAI,EAAE;aACjB,OAAO,eAAe,aAAa;6BACnB,mBAAmB;;iBAE/B,iBAAiB,CAAC,WAAW;iBAC7B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC;;CAE7D,CAAA;IAEC,OAAO,IAAI,CAAA;AACb,CAAC;AA/ED,4BA+EC"}
1
+ {"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":";;AACA,+CAA2D;AAE3D,+BAAoC;AACpC,2CAA2C;AAE3C,SAAS,WAAW,CAAE,IAAY,EAAE,KAA0B,EAAE,aAA2C;IACzG,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,+BAAgB,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IAC3E,OAAO;;eAEM,IAAI;;0BAEO,SAAS,CAAC,WAAI,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;;OAE/D,IAAI,CAAC,SAAS,CAAC,mBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC;CAClD,CAAA;AACD,CAAC;AAED;;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,EACJ,wBAAwB,EACxB,aAAa,EACb,OAAO,EACP,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACrB,GAAG,OAAO,CAAC,UAAU,CAAA;IACtB,MAAM,MAAM,GAAc,OAAO,CAAC,MAAM,CAAA;IACxC,MAAM,KAAK,GAAwB,OAAO,CAAC,KAAK,CAAA;IAChD,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,IAAI,UAAU,GAAG;;CAElB,CAAA;IACC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACxE,UAAU,IAAI,kBAAkB,CAAC,sBAAsB,QAAQ,4BAA4B,QAAQ,uBAAuB,QAAQ,KAAK,CAAA;aACxI;YACD,IAAI,CAAC,CAAC,gBAAgB,EAAE;gBACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAA;gBAChF,UAAU,IAAI,0BAA0B,CAAC,sBAAsB,QAAQ,4BAA4B,QAAQ,uBAAuB,QAAQ,KAAK,CAAA;aAChJ;SACF;KACF;IAED,MAAM,aAAa,GAAG;;;EAGtB,iBAAiB,IAAI,EAAE;;;;CAIxB,CAAA;IAEC,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAA;IAE1F,MAAM,IAAI,GAAG;wBACS,SAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;;WAE1E,OAAO,YAAY,eAAe;EAC3C,wBAAwB;EACxB,UAAU;eACG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;EAEnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;IAc7B,MAAA,MAAM,CAAC,KAAK,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;;EAEpE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;EACrD,sBAAsB,IAAI,EAAE;aACjB,OAAO,eAAe,aAAa;6BACnB,mBAAmB;;iBAE/B,iBAAiB,CAAC,WAAW;iBAC7B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC;;CAE7D,CAAA;IAEC,OAAO,IAAI,CAAA;AACb,CAAC;AAjFD,4BAiFC"}
@@ -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 } = utils_1.frameworkMeta[options.framework];
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');
@@ -22,12 +21,14 @@ function default_1() {
22
21
  const setReconciler = runtimePath.reduce((res, item) => {
23
22
  return res + `import '${item}'\n`;
24
23
  }, '');
24
+ const { globalObject } = this._compilation.outputOptions;
25
25
  const prerender = `
26
26
  if (typeof PRERENDER !== 'undefined') {
27
- global._prerender = inst
27
+ ${globalObject}._prerender = inst
28
28
  }`;
29
29
  return `${setReconciler}
30
- import { createPageConfig, ${creator}, window } from '@tarojs/runtime'
30
+ import { createPageConfig, window } from '@tarojs/runtime'
31
+ import { ${creator} } from '${creatorLocation}'
31
32
  import component from ${stringify(componentPath)}
32
33
  ${importFrameworkStatement}
33
34
  var config = ${configString};
@@ -1 +1 @@
1
- {"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":"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"}
@@ -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 } = utils_1.frameworkMeta[options.framework];
11
- const { framework, config: loaderConfig } = options;
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;
@@ -24,13 +22,15 @@ function default_1() {
24
22
  const setReconciler = runtimePath.reduce((res, item) => {
25
23
  return res + `import '${item}'\n`;
26
24
  }, '');
25
+ const { globalObject } = this._compilation.outputOptions;
27
26
  const prerender = `
28
27
  if (typeof PRERENDER !== 'undefined') {
29
- global._prerender = inst
28
+ ${globalObject}._prerender = inst
30
29
  }`;
31
30
  return `${setReconciler}
32
31
  import { defaultReconciler } from '@tarojs/shared'
33
- import { createNativeComponentConfig, container, SERVICE_IDENTIFIER } from '@tarojs/runtime'
32
+ import { container, SERVICE_IDENTIFIER } from '@tarojs/runtime'
33
+ import { createNativeComponentConfig } from '${creatorLocation}'
34
34
  ${importFrameworkStatement}
35
35
  var hooks = container.get(SERVICE_IDENTIFIER.Hooks)
36
36
  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,mCAAuC;AACvC,iCAAsC;AAEtC;IACE,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,GAAG,qBAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACpF,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACnD,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,MAAM,EAAE,eAAe,EAAE,GAAG,qBAAa,CAAC,SAAS,CAAC,CAAA;IACpD,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;;;EAGvB,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"}
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,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAA;IAExD,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,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;AArCD,4BAqCC"}
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 { framework, config: loaderConfig } = options;
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 } = utils_1.frameworkMeta[framework];
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;
@@ -21,12 +18,19 @@ function default_1(source) {
21
18
  const componentPath = isNeedRawLoader
22
19
  ? `${raw}!${this.resourcePath}`
23
20
  : this.request.split('!').slice(thisLoaderIndex + 1).join('!');
21
+ const { globalObject } = this._compilation.outputOptions;
24
22
  const prerender = `
25
23
  if (typeof PRERENDER !== 'undefined') {
26
- global._prerender = inst
24
+ ${globalObject}._prerender = inst
27
25
  }`;
28
- if (framework === 'react' || framework === 'nerv') {
29
- Object.assign(config, addConfig(source));
26
+ const hmr = !options.hot ? '' : `if (process.env.NODE_ENV !== 'production') {
27
+ const cache = __webpack_require__.c
28
+ Object.keys(cache).forEach(item => {
29
+ if (item.indexOf('${options.name}') !== -1) delete cache[item]
30
+ })
31
+ }`;
32
+ if (typeof options.loaderMeta.modifyConfig === 'function') {
33
+ options.loaderMeta.modifyConfig(config, source);
30
34
  }
31
35
  return `import { createPageConfig } from '@tarojs/runtime'
32
36
  import component from ${stringify(componentPath)}
@@ -35,6 +39,7 @@ ${config.enableShareTimeline ? 'component.enableShareTimeline = true' : ''}
35
39
  ${config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : ''}
36
40
  var inst = Page(createPageConfig(component, '${options.name}', {root:{cn:[]}}, config || {}))
37
41
  ${options.prerender ? prerender : ''}
42
+ ${hmr}
38
43
  `;
39
44
  }
40
45
  exports.default = default_1;
@@ -42,7 +47,8 @@ function getPageConfig(configs, resourcePath) {
42
47
  const configPath = removeExt(resourcePath) + '.config';
43
48
  for (const name in configs) {
44
49
  const config = configs[name];
45
- if (removeExt(configs[name].path) === configPath) {
50
+ const currentPath = config.path.endsWith('.config') ? config.path : removeExt(config.path);
51
+ if (currentPath === configPath) {
46
52
  return config.content;
47
53
  }
48
54
  }
@@ -52,50 +58,4 @@ exports.getPageConfig = getPageConfig;
52
58
  function removeExt(file) {
53
59
  return path.join(path.dirname(file), path.basename(file, path.extname(file)));
54
60
  }
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
61
  //# 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;AAC5B,+BAA8B;AAC9B,mCAAkC;AAClC,mCAAuC;AAOvC,mBAA6D,MAAc;IACzE,MAAM,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACnD,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,qBAAa,CAAC,SAAS,CAAC,CAAA;IACpD,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,SAAS,KAAK,OAAO,IAAI,SAAS,KAAK,MAAM,EAAE;QACjD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;KACzC;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;AAED,SAAS,SAAS,CAAE,MAAM;IACxB,MAAM,UAAU,GAAG;QACjB,qBAAqB,EAAE,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;QAClE,mBAAmB,EAAE,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;KAC7D,CAAA;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;QAC9B,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,QAAQ;KACrB,CAAC,CAAA;IAEF,MAAM,cAAc,GAAwB,EAAE,CAAA;IAE9C,SAAS,KAAK,CAAE,IAAY;QAC1B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC3C,MAAM,IAAI,GAAa,UAAU,CAAC,UAAU,CAAC,CAAA;YAC7C,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACvB,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;aAClC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,kBAAkB,CAAE,IAAS;YAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI;gBAAE,OAAM;YACrC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;QACD,mBAAmB,CAAE,IAAS;YAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI;gBAAE,OAAM;YACrC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;QACD,cAAc,CAAE,IAAS;YACvB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;YACvB,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;gBAChC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACnB;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE;gBAC7C,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE;oBACzC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;iBAC5B;qBAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC7C,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;iBAC7B;aACF;QACH,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,cAAc,CAAA;AACvB,CAAC"}
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.3.20",
3
+ "version": "3.4.0-beta.3",
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,12 @@
26
26
  "url": "https://github.com/NervJS/taro/issues"
27
27
  },
28
28
  "dependencies": {
29
- "@tarojs/helper": "3.3.20",
30
- "acorn": "^8.0.4",
31
- "acorn-walk": "^8.0.0",
29
+ "@tarojs/helper": "3.4.0-beta.3",
30
+ "@tarojs/taro": "3.4.0-beta.3",
32
31
  "loader-utils": "^1.2.3"
33
32
  },
34
33
  "publishConfig": {
35
34
  "access": "public"
36
35
  },
37
- "devDependencies": {
38
- "@tarojs/taro": "3.3.20"
39
- },
40
- "gitHead": "f98ceefaa3e419db5a6c3bcd3bf123ce5a0a0124"
36
+ "gitHead": "2ef7e8c10c9e5784e98bb1ad3a803d5fd6a46c8b"
41
37
  }
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"}