@tarojs/plugin-generator 4.1.4-beta.7 → 4.1.4-beta.8

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.
@@ -2,4 +2,7 @@ import type { IPluginContext } from '@tarojs/service';
2
2
  /**
3
3
  * 更新配置文件
4
4
  */
5
- export declare function updateConfig(ctx: IPluginContext): Promise<void>;
5
+ export declare function updateConfig(options: {
6
+ ctx: IPluginContext;
7
+ compilerType: CompilerType;
8
+ }): Promise<void>;
@@ -35,9 +35,17 @@ const t = __importStar(require("@babel/types"));
35
35
  const dedent_1 = __importDefault(require("dedent"));
36
36
  const ast_1 = require("../../utils/ast");
37
37
  const error_1 = require("../../utils/error");
38
- const modifiedConfigError = new error_1.GeneratorError({
38
+ const createModifiedConfigError = (compilerType) => new error_1.GeneratorError({
39
39
  type: error_1.GeneratorErrorType.modifyConfig,
40
- message: (0, dedent_1.default)(`
40
+ message: compilerType === 'vite'
41
+ ? (0, dedent_1.default)(`
42
+ {
43
+ h5: {
44
+ legacy: true,
45
+ }
46
+ }
47
+ `)
48
+ : (0, dedent_1.default)(`
41
49
  {
42
50
  mini: {
43
51
  compile: {
@@ -59,7 +67,8 @@ const modifiedConfigError = new error_1.GeneratorError({
59
67
  /**
60
68
  * 更新配置文件
61
69
  */
62
- async function updateConfig(ctx) {
70
+ async function updateConfig(options) {
71
+ const { ctx, compilerType } = options;
63
72
  const { fs } = ctx.helper;
64
73
  const sourceCode = await fs.readFile(ctx.paths.configPath, { encoding: 'utf-8' });
65
74
  const ast = parser.parse(sourceCode, { sourceType: 'module', plugins: ['typescript'] });
@@ -70,24 +79,46 @@ async function updateConfig(ctx) {
70
79
  ObjectProperty: (o) => {
71
80
  const { node } = o;
72
81
  if (t.isIdentifier(node.key) && node.key.name === 'mini' && t.isObjectExpression(node.value)) {
73
- modifyCompileConfig(node.value);
82
+ if (compilerType === 'webpack5') {
83
+ modifyWebpackCompileConfig(node.value);
84
+ }
85
+ else {
86
+ // vite-runner 小程序看着不支持 legacy 字段
87
+ }
74
88
  miniUpdated = true;
75
89
  }
76
90
  if (t.isIdentifier(node.key) && node.key.name === 'h5' && t.isObjectExpression(node.value)) {
77
- modifyCompileConfig(node.value);
91
+ if (compilerType === 'webpack5') {
92
+ modifyWebpackCompileConfig(node.value);
93
+ }
94
+ else {
95
+ modifyViteCompileConfig(node.value);
96
+ }
78
97
  h5Updated = true;
79
98
  }
80
99
  },
81
100
  });
82
101
  if (!miniUpdated || !h5Updated) {
83
- throw modifiedConfigError;
102
+ throw createModifiedConfigError(compilerType);
84
103
  }
85
104
  const { code } = (0, generator_1.default)(ast);
86
105
  await fs.outputFile(ctx.paths.configPath, code, { encoding: 'utf-8' });
87
106
  console.log('✅ 更新配置文件成功\n');
88
107
  }
89
108
  exports.updateConfig = updateConfig;
90
- function modifyCompileConfig(config) {
109
+ function modifyViteCompileConfig(config) {
110
+ const legacyProp = config.properties.find((p) => t.isObjectProperty(p) && t.isIdentifier(p.key) && p.key.name === 'legacy');
111
+ if (!legacyProp) {
112
+ config.properties.push(t.objectProperty(t.identifier('legacy'), t.booleanLiteral(true)));
113
+ }
114
+ else if (t.isObjectProperty(legacyProp)) {
115
+ legacyProp.value = t.booleanLiteral(true);
116
+ }
117
+ else {
118
+ throw createModifiedConfigError('vite');
119
+ }
120
+ }
121
+ function modifyWebpackCompileConfig(config) {
91
122
  (0, ast_1.ensureNestedObjectProperty)(config, ['compile']);
92
123
  const compileProp = config.properties.find((p) => t.isObjectProperty(p) && t.isIdentifier(p.key) && p.key.name === 'compile');
93
124
  if (compileProp && t.isObjectExpression(compileProp.value)) {
@@ -101,7 +132,7 @@ function modifyCompileConfig(config) {
101
132
  includeProp.value.elements.push(include);
102
133
  }
103
134
  else {
104
- throw modifiedConfigError;
135
+ throw createModifiedConfigError('webpack5');
105
136
  }
106
137
  }
107
138
  }
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/generators/es5/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/generators/es5/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,iEAAuC;AACvC,sDAAuC;AACvC,+DAAsC;AACtC,gDAAiC;AACjC,oDAA2B;AAE3B,yCAA4D;AAC5D,6CAAsE;AAItE,MAAM,yBAAyB,GAAG,CAAC,YAA0B,EAAE,EAAE,CAC/D,IAAI,sBAAc,CAAC;IACjB,IAAI,EAAE,0BAAkB,CAAC,YAAY;IACrC,OAAO,EACL,YAAY,KAAK,MAAM;QACrB,CAAC,CAAC,IAAA,gBAAM,EAAC;;;;;;KAMZ,CAAC;QACE,CAAC,CAAC,IAAA,gBAAM,EAAC;;;;;;;;;;;;;;;;;GAiBd,CAAC;CACD,CAAC,CAAA;AAEJ;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,OAA4D;IAC7F,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACrC,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEzB,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IAEjF,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACvF,oBAAoB,CAAC,GAAG,CAAC,CAAA;IACzB,IAAI,WAAW,GAAG,KAAK,CAAA;IACvB,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,IAAA,kBAAQ,EAAC,GAAG,EAAE;QACZ,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7F,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;oBAChC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACxC,CAAC;qBAAM,CAAC;oBACN,iCAAiC;gBACnC,CAAC;gBACD,WAAW,GAAG,IAAI,CAAA;YACpB,CAAC;YACD,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3F,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;oBAChC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACxC,CAAC;qBAAM,CAAC;oBACN,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACrC,CAAC;gBACD,SAAS,GAAG,IAAI,CAAA;YAClB,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IACF,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,MAAM,yBAAyB,CAAC,YAAY,CAAC,CAAA;IAC/C,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAA;IAC9B,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IACtE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC7B,CAAC;AArCD,oCAqCC;AAED,SAAS,uBAAuB,CAAC,MAA0B;IACzD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CACjF,CAAA;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC1F,CAAC;SAAM,IAAI,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;SAAM,CAAC;QACN,MAAM,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,MAA0B;IAC5D,IAAA,gCAA0B,EAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAClD,CAAA;IACjC,IAAI,WAAW,IAAI,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3D,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CACnD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAClF,CAAA;QAED,MAAM,OAAO,GAAG,CAAC,CAAC,uBAAuB,CACvC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAC1B,CAAC,CAAC,cAAc,CACd,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,aAAa,CACb,MAAM,CAAC,GAAG,CAAA,2FAA2F,EACrG,EAAE,CACH,EACD,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CACrB,EACD,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAC3B,CACF,CAAA;QACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAA;QAE1E,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5G,CAAC;aAAM,IAAI,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACrF,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1C,CAAC;aAAM,CAAC;YACN,MAAM,yBAAyB,CAAC,UAAU,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,GAAW;IACvC,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAA,kBAAQ,EAAC,GAAG,EAAE;QACZ,oBAAoB,CAAC,IAAI;YACvB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;YACrB,qCAAqC;YACrC,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,kBAAkB;gBACrC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB;gBAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;gBAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;gBAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;gBAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK;gBACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;gBACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAA;YAChD,6BAA6B;YAC7B,MAAM,YAAY,GAChB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB;gBACtC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB;gBAC7C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;gBAC9C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;gBAC3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;gBAChD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK;gBACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;gBACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAA;YAEzC,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;gBAChC,MAAM,GAAG,IAAI,CAAA;gBACb,IAAI,CAAC,IAAI,EAAE,CAAA;YACb,CAAC;QACH,CAAC;QACD,OAAO,EAAE;YACP,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAChC,qDAAqD,CAClB,CAAA;oBACrC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;oBACvF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;gBAC/C,CAAC;YACH,CAAC;SACF;KACF,CAAC,CAAA;AACJ,CAAC"}
@@ -6,8 +6,12 @@ const utils_1 = require("../../utils");
6
6
  const babel_1 = require("./babel");
7
7
  const config_1 = require("./config");
8
8
  async function es5Generator(ctx) {
9
+ const compilerType = (0, utils_1.getCompilerType)(ctx.initialConfig.compiler);
10
+ if (!compilerType) {
11
+ throw new Error('未找到编译器类型');
12
+ }
9
13
  await updateBrowserList(ctx);
10
- await (0, config_1.updateConfig)(ctx);
14
+ await (0, config_1.updateConfig)({ ctx, compilerType });
11
15
  await (0, babel_1.updateBabelConfig)(ctx);
12
16
  console.log('✅ 启用「编译为 ES5」成功');
13
17
  }
@@ -20,10 +24,7 @@ async function updateBrowserList(ctx) {
20
24
  return;
21
25
  }
22
26
  const pkgJson = (0, utils_1.readPkgJson)(ctx);
23
- pkgJson.browserslist = {
24
- development: ['defaults and fully supports es6-module', 'maintained node versions'],
25
- production: ['last 3 versions', 'Android >= 4.1', 'ios >= 8'],
26
- };
27
+ pkgJson.browserslist = ['last 3 versions', 'Android >= 4.1', 'ios >= 8'];
27
28
  await fs.outputJson(`${ctx.paths.appPath}/package.json`, pkgJson, {
28
29
  encoding: 'utf-8',
29
30
  spaces: 2,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/es5/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAyC;AACzC,mCAA2C;AAC3C,qCAAuC;AAIhC,KAAK,UAAU,YAAY,CAAC,GAAmB;IACpD,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAA;IACvB,MAAM,IAAA,yBAAiB,EAAC,GAAG,CAAC,CAAA;IAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;AAChC,CAAC;AALD,oCAKC;AAED,KAAK,UAAU,iBAAiB,CAAC,GAAmB;IAClD,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,cAAc,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAA;IAC7D,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACxC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,6CAA6C,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;QACnH,OAAM;IACR,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAA;IAChC,OAAO,CAAC,YAAY,GAAG;QACrB,WAAW,EAAE,CAAC,wCAAwC,EAAE,0BAA0B,CAAC;QACnF,UAAU,EAAE,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,UAAU,CAAC;KAC9D,CAAA;IACD,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,EAAE;QAChE,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,CAAC;KACV,CAAC,CAAA;IACF,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;AACvC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/es5/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAA0D;AAC1D,mCAA2C;AAC3C,qCAAuC;AAIhC,KAAK,UAAU,YAAY,CAAC,GAAmB;IACpD,MAAM,YAAY,GAAG,IAAA,uBAAe,EAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IAChE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;IAC7B,CAAC;IACD,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,IAAA,qBAAY,EAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAA;IACzC,MAAM,IAAA,yBAAiB,EAAC,GAAG,CAAC,CAAA;IAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;AAChC,CAAC;AATD,oCASC;AAED,KAAK,UAAU,iBAAiB,CAAC,GAAmB;IAClD,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,cAAc,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAA;IAC7D,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACxC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,6CAA6C,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;QACnH,OAAM;IACR,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAA;IAChC,OAAO,CAAC,YAAY,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAA;IACxE,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,EAAE;QAChE,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,CAAC;KACV,CAAC,CAAA;IACF,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;AACvC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/plugin-generator",
3
- "version": "4.1.4-beta.7",
3
+ "version": "4.1.4-beta.8",
4
4
  "description": "Taro 生成器插件",
5
5
  "keywords": [
6
6
  "Taro",
@@ -33,14 +33,13 @@
33
33
  "dedent": "^1.6.0",
34
34
  "inquirer": "^8.2.6",
35
35
  "ts-morph": "^26.0.0",
36
- "@tarojs/service": "4.1.4-beta.7",
37
- "@tarojs/helper": "4.1.4-beta.7"
36
+ "@tarojs/helper": "4.1.4-beta.8",
37
+ "@tarojs/service": "4.1.4-beta.8"
38
38
  },
39
39
  "devDependencies": {
40
40
  "@types/babel__generator": "^7.6.8",
41
41
  "@types/babel__traverse": "^7.20.5",
42
42
  "@types/inquirer": "^8.2.1",
43
- "@types/node": "^18.15.11",
44
43
  "typescript": "~5.4.5"
45
44
  },
46
45
  "scripts": {