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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. package/dist/cjs/utils/register.js +19 -27
  2. package/dist/esm/utils/register.js +26 -52
  3. package/dist/esm-node/utils/register.js +19 -27
  4. package/package.json +5 -5
package/dist/cjs/utils/register.js CHANGED
@@ -81,30 +81,28 @@ const registerCompiler = async (appDir, distDir, alias) => {
81
81
  tsConfig = (0, import_utils.readTsConfigByFile)(tsconfigPath);
82
82
  }
83
83
  const { MODERN_NODE_LOADER } = process.env;
84
- if (MODERN_NODE_LOADER !== "esbuild") {
84
+ if (MODERN_NODE_LOADER === "esbuild" || !isTsProject) {
85
+ await registerEsbuild({
86
+ isTsProject,
87
+ tsConfig,
88
+ distDir
89
+ });
90
+ } else {
85
91
  try {
86
92
  const tsNode = await (0, import_utils.loadFromProject)("ts-node", appDir);
87
93
  const tsNodeOptions = tsConfig["ts-node"];
88
- if (isTsProject) {
89
- tsNode.register({
90
- project: tsconfigPath,
91
- scope: true,
92
- // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
93
- files: true,
94
- transpileOnly: true,
95
- ignore: [
96
- "(?:^|/)node_modules/",
97
- `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
98
- ],
99
- ...tsNodeOptions
100
- });
101
- } else {
102
- await registerEsbuild({
103
- isTsProject,
104
- tsConfig,
105
- distDir
106
- });
107
- }
94
+ tsNode.register({
95
+ project: tsconfigPath,
96
+ scope: true,
97
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
98
+ files: true,
99
+ transpileOnly: true,
100
+ ignore: [
101
+ "(?:^|/)node_modules/",
102
+ `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
103
+ ],
104
+ ...tsNodeOptions
105
+ });
108
106
  } catch (error) {
109
107
  import_utils.logger.error(error);
110
108
  await registerEsbuild({
@@ -113,12 +111,6 @@ const registerCompiler = async (appDir, distDir, alias) => {
113
111
  distDir
114
112
  });
115
113
  }
116
- } else {
117
- await registerEsbuild({
118
- isTsProject,
119
- tsConfig,
120
- distDir
121
- });
122
114
  }
123
115
  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
124
116
  if (await import_utils.fs.pathExists(appDir)) {
package/dist/esm/utils/register.js CHANGED
@@ -82,31 +82,39 @@ var registerCompiler = function() {
82
82
  tsConfig = readTsConfigByFile(tsconfigPath);
83
83
  }
84
84
  MODERN_NODE_LOADER = process.env.MODERN_NODE_LOADER;
85
- if (!(MODERN_NODE_LOADER !== "esbuild"))
85
+ if (!(MODERN_NODE_LOADER === "esbuild" || !isTsProject))
86
86
  return [
87
87
  3,
88
- 10
88
+ 3
89
89
  ];
90
- _state.label = 2;
90
+ return [
91
+ 4,
92
+ registerEsbuild({
93
+ isTsProject,
94
+ tsConfig,
95
+ distDir
96
+ })
97
+ ];
91
98
  case 2:
99
+ _state.sent();
100
+ return [
101
+ 3,
102
+ 7
103
+ ];
104
+ case 3:
92
105
  _state.trys.push([
93
- 2,
94
- 7,
106
+ 3,
107
+ 5,
95
108
  ,
96
- 9
109
+ 7
97
110
  ]);
98
111
  return [
99
112
  4,
100
113
  loadFromProject("ts-node", appDir)
101
114
  ];
102
- case 3:
115
+ case 4:
103
116
  tsNode = _state.sent();
104
117
  tsNodeOptions = tsConfig["ts-node"];
105
- if (!isTsProject)
106
- return [
107
- 3,
108
- 4
109
- ];
110
118
  tsNode.register(_object_spread({
111
119
  project: tsconfigPath,
112
120
  scope: true,
@@ -120,26 +128,9 @@ var registerCompiler = function() {
120
128
  }, tsNodeOptions));
121
129
  return [
122
130
  3,
123
- 6
124
- ];
125
- case 4:
126
- return [
127
- 4,
128
- registerEsbuild({
129
- isTsProject,
130
- tsConfig,
131
- distDir
132
- })
131
+ 7
133
132
  ];
134
133
  case 5:
135
- _state.sent();
136
- _state.label = 6;
137
- case 6:
138
- return [
139
- 3,
140
- 9
141
- ];
142
- case 7:
143
134
  error = _state.sent();
144
135
  logger.error(error);
145
136
  return [
@@ -150,41 +141,24 @@ var registerCompiler = function() {
150
141
  distDir
151
142
  })
152
143
  ];
153
- case 8:
144
+ case 6:
154
145
  _state.sent();
155
146
  return [
156
147
  3,
157
- 9
158
- ];
159
- case 9:
160
- return [
161
- 3,
162
- 12
148
+ 7
163
149
  ];
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:
150
+ case 7:
177
151
  return [
178
152
  4,
179
153
  import("@modern-js/utils/tsconfig-paths")
180
154
  ];
181
- case 13:
155
+ case 8:
182
156
  tsConfigPaths = _state.sent().default;
183
157
  return [
184
158
  4,
185
159
  fs.pathExists(appDir)
186
160
  ];
187
- case 14:
161
+ case 9:
188
162
  if (_state.sent()) {
189
163
  tsConfigPaths.register({
190
164
  baseUrl: absoluteBaseUrl || "./",
package/dist/esm-node/utils/register.js CHANGED
@@ -48,30 +48,28 @@ const registerCompiler = async (appDir, distDir, alias) => {
48
48
  tsConfig = readTsConfigByFile(tsconfigPath);
49
49
  }
50
50
  const { MODERN_NODE_LOADER } = process.env;
51
- if (MODERN_NODE_LOADER !== "esbuild") {
51
+ if (MODERN_NODE_LOADER === "esbuild" || !isTsProject) {
52
+ await registerEsbuild({
53
+ isTsProject,
54
+ tsConfig,
55
+ distDir
56
+ });
57
+ } else {
52
58
  try {
53
59
  const tsNode = await loadFromProject("ts-node", appDir);
54
60
  const tsNodeOptions = tsConfig["ts-node"];
55
- if (isTsProject) {
56
- tsNode.register({
57
- project: tsconfigPath,
58
- scope: true,
59
- // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
60
- files: true,
61
- transpileOnly: true,
62
- ignore: [
63
- "(?:^|/)node_modules/",
64
- `(?:^|/)${path.relative(appDir, distDir)}/`
65
- ],
66
- ...tsNodeOptions
67
- });
68
- } else {
69
- await registerEsbuild({
70
- isTsProject,
71
- tsConfig,
72
- distDir
73
- });
74
- }
61
+ tsNode.register({
62
+ project: tsconfigPath,
63
+ scope: true,
64
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
65
+ files: true,
66
+ transpileOnly: true,
67
+ ignore: [
68
+ "(?:^|/)node_modules/",
69
+ `(?:^|/)${path.relative(appDir, distDir)}/`
70
+ ],
71
+ ...tsNodeOptions
72
+ });
75
73
  } catch (error) {
76
74
  logger.error(error);
77
75
  await registerEsbuild({
@@ -80,12 +78,6 @@ const registerCompiler = async (appDir, distDir, alias) => {
80
78
  distDir
81
79
  });
82
80
  }
83
- } else {
84
- await registerEsbuild({
85
- isTsProject,
86
- tsConfig,
87
- distDir
88
- });
89
81
  }
90
82
  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
91
83
  if (await fs.pathExists(appDir)) {
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.60.4-alpha.1",
18
+ "version": "2.60.4-alpha.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -88,15 +88,15 @@
88
88
  "mlly": "^1.6.1",
89
89
  "pkg-types": "^1.1.0",
90
90
  "std-env": "^3.7.0",
91
- "@modern-js/core": "2.60.3",
92
91
  "@modern-js/node-bundle-require": "2.60.3",
93
- "@modern-js/plugin-i18n": "2.60.3",
94
92
  "@modern-js/plugin-data-loader": "2.60.3",
93
+ "@modern-js/core": "2.60.3",
94
+ "@modern-js/plugin": "2.60.3",
95
+ "@modern-js/plugin-i18n": "2.60.3",
95
96
  "@modern-js/prod-server": "2.60.3",
96
- "@modern-js/types": "2.60.3",
97
97
  "@modern-js/server-core": "2.60.3",
98
+ "@modern-js/types": "2.60.3",
98
99
  "@modern-js/server": "2.60.3",
99
- "@modern-js/plugin": "2.60.3",
100
100
  "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
101
101
  "@modern-js/server-utils": "2.60.3",
102
102
  "@modern-js/utils": "2.60.3",