@modern-js/app-tools 2.60.4-alpha.0 → 2.60.4-alpha.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -98,6 +98,12 @@ const registerCompiler = async (appDir, distDir, alias) => {
98
98
  ],
99
99
  ...tsNodeOptions
100
100
  });
101
+ } else {
102
+ await registerEsbuild({
103
+ isTsProject,
104
+ tsConfig,
105
+ distDir
106
+ });
101
107
  }
102
108
  } catch (error) {
103
109
  import_utils.logger.error(error);
@@ -85,15 +85,15 @@ var registerCompiler = function() {
85
85
  if (!(MODERN_NODE_LOADER !== "esbuild"))
86
86
  return [
87
87
  3,
88
- 7
88
+ 10
89
89
  ];
90
90
  _state.label = 2;
91
91
  case 2:
92
92
  _state.trys.push([
93
93
  2,
94
- 4,
94
+ 7,
95
95
  ,
96
- 6
96
+ 9
97
97
  ]);
98
98
  return [
99
99
  4,
@@ -102,26 +102,27 @@ var registerCompiler = function() {
102
102
  case 3:
103
103
  tsNode = _state.sent();
104
104
  tsNodeOptions = tsConfig["ts-node"];
105
- if (isTsProject) {
106
- tsNode.register(_object_spread({
107
- project: tsconfigPath,
108
- scope: true,
109
- // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
110
- files: true,
111
- transpileOnly: true,
112
- ignore: [
113
- "(?:^|/)node_modules/",
114
- "(?:^|/)".concat(path.relative(appDir, distDir), "/")
115
- ]
116
- }, tsNodeOptions));
117
- }
105
+ if (!isTsProject)
106
+ return [
107
+ 3,
108
+ 4
109
+ ];
110
+ tsNode.register(_object_spread({
111
+ project: tsconfigPath,
112
+ scope: true,
113
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
114
+ files: true,
115
+ transpileOnly: true,
116
+ ignore: [
117
+ "(?:^|/)node_modules/",
118
+ "(?:^|/)".concat(path.relative(appDir, distDir), "/")
119
+ ]
120
+ }, tsNodeOptions));
118
121
  return [
119
122
  3,
120
123
  6
121
124
  ];
122
125
  case 4:
123
- error = _state.sent();
124
- logger.error(error);
125
126
  return [
126
127
  4,
127
128
  registerEsbuild({
@@ -132,16 +133,15 @@ var registerCompiler = function() {
132
133
  ];
133
134
  case 5:
134
135
  _state.sent();
135
- return [
136
- 3,
137
- 6
138
- ];
136
+ _state.label = 6;
139
137
  case 6:
140
138
  return [
141
139
  3,
142
140
  9
143
141
  ];
144
142
  case 7:
143
+ error = _state.sent();
144
+ logger.error(error);
145
145
  return [
146
146
  4,
147
147
  registerEsbuild({
@@ -152,19 +152,39 @@ var registerCompiler = function() {
152
152
  ];
153
153
  case 8:
154
154
  _state.sent();
155
- _state.label = 9;
155
+ return [
156
+ 3,
157
+ 9
158
+ ];
156
159
  case 9:
160
+ return [
161
+ 3,
162
+ 12
163
+ ];
164
+ case 10:
165
+ return [
166
+ 4,
167
+ registerEsbuild({
168
+ isTsProject,
169
+ tsConfig,
170
+ distDir
171
+ })
172
+ ];
173
+ case 11:
174
+ _state.sent();
175
+ _state.label = 12;
176
+ case 12:
157
177
  return [
158
178
  4,
159
179
  import("@modern-js/utils/tsconfig-paths")
160
180
  ];
161
- case 10:
181
+ case 13:
162
182
  tsConfigPaths = _state.sent().default;
163
183
  return [
164
184
  4,
165
185
  fs.pathExists(appDir)
166
186
  ];
167
- case 11:
187
+ case 14:
168
188
  if (_state.sent()) {
169
189
  tsConfigPaths.register({
170
190
  baseUrl: absoluteBaseUrl || "./",
@@ -65,6 +65,12 @@ const registerCompiler = async (appDir, distDir, alias) => {
65
65
  ],
66
66
  ...tsNodeOptions
67
67
  });
68
+ } else {
69
+ await registerEsbuild({
70
+ isTsProject,
71
+ tsConfig,
72
+ distDir
73
+ });
68
74
  }
69
75
  } catch (error) {
70
76
  logger.error(error);
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.60.4-alpha.0",
18
+ "version": "2.60.4-alpha.1",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -89,18 +89,18 @@
89
89
  "pkg-types": "^1.1.0",
90
90
  "std-env": "^3.7.0",
91
91
  "@modern-js/core": "2.60.3",
92
- "@modern-js/plugin-data-loader": "2.60.3",
93
- "@modern-js/plugin-i18n": "2.60.3",
94
92
  "@modern-js/node-bundle-require": "2.60.3",
93
+ "@modern-js/plugin-i18n": "2.60.3",
94
+ "@modern-js/plugin-data-loader": "2.60.3",
95
95
  "@modern-js/prod-server": "2.60.3",
96
- "@modern-js/plugin": "2.60.3",
96
+ "@modern-js/types": "2.60.3",
97
97
  "@modern-js/server-core": "2.60.3",
98
98
  "@modern-js/server": "2.60.3",
99
+ "@modern-js/plugin": "2.60.3",
99
100
  "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
100
101
  "@modern-js/server-utils": "2.60.3",
101
- "@modern-js/types": "2.60.3",
102
- "@modern-js/uni-builder": "2.60.3",
103
- "@modern-js/utils": "2.60.3"
102
+ "@modern-js/utils": "2.60.3",
103
+ "@modern-js/uni-builder": "2.60.3"
104
104
  },
105
105
  "devDependencies": {
106
106
  "@rsbuild/plugin-webpack-swc": "~1.0.3",
@@ -112,8 +112,8 @@
112
112
  "tsconfig-paths": "^4.2.0",
113
113
  "typescript": "^5",
114
114
  "webpack": "^5.95.0",
115
- "@scripts/jest-config": "2.60.3",
116
- "@scripts/build": "2.60.3"
115
+ "@scripts/build": "2.60.3",
116
+ "@scripts/jest-config": "2.60.3"
117
117
  },
118
118
  "peerDependencies": {
119
119
  "ts-node": "^10.7.0",