@modern-js/app-tools 2.60.4-alpha.0 → 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 -21
  2. package/dist/esm/utils/register.js +37 -43
  3. package/dist/esm-node/utils/register.js +19 -21
  4. package/package.json +9 -9
package/dist/cjs/utils/register.js CHANGED
@@ -81,24 +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
- }
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
+ });
102
106
  } catch (error) {
103
107
  import_utils.logger.error(error);
104
108
  await registerEsbuild({
@@ -107,12 +111,6 @@ const registerCompiler = async (appDir, distDir, alias) => {
107
111
  distDir
108
112
  });
109
113
  }
110
- } else {
111
- await registerEsbuild({
112
- isTsProject,
113
- tsConfig,
114
- distDir
115
- });
116
114
  }
117
115
  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
118
116
  if (await import_utils.fs.pathExists(appDir)) {
package/dist/esm/utils/register.js CHANGED
@@ -82,44 +82,55 @@ 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
- 7
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
- 4,
106
+ 3,
107
+ 5,
95
108
  ,
96
- 6
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
- 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
- }
118
+ tsNode.register(_object_spread({
119
+ project: tsconfigPath,
120
+ scope: true,
121
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
122
+ files: true,
123
+ transpileOnly: true,
124
+ ignore: [
125
+ "(?:^|/)node_modules/",
126
+ "(?:^|/)".concat(path.relative(appDir, distDir), "/")
127
+ ]
128
+ }, tsNodeOptions));
118
129
  return [
119
130
  3,
120
- 6
131
+ 7
121
132
  ];
122
- case 4:
133
+ case 5:
123
134
  error = _state.sent();
124
135
  logger.error(error);
125
136
  return [
@@ -130,41 +141,24 @@ var registerCompiler = function() {
130
141
  distDir
131
142
  })
132
143
  ];
133
- case 5:
134
- _state.sent();
135
- return [
136
- 3,
137
- 6
138
- ];
139
144
  case 6:
145
+ _state.sent();
140
146
  return [
141
147
  3,
142
- 9
148
+ 7
143
149
  ];
144
150
  case 7:
145
- return [
146
- 4,
147
- registerEsbuild({
148
- isTsProject,
149
- tsConfig,
150
- distDir
151
- })
152
- ];
153
- case 8:
154
- _state.sent();
155
- _state.label = 9;
156
- case 9:
157
151
  return [
158
152
  4,
159
153
  import("@modern-js/utils/tsconfig-paths")
160
154
  ];
161
- case 10:
155
+ case 8:
162
156
  tsConfigPaths = _state.sent().default;
163
157
  return [
164
158
  4,
165
159
  fs.pathExists(appDir)
166
160
  ];
167
- case 11:
161
+ case 9:
168
162
  if (_state.sent()) {
169
163
  tsConfigPaths.register({
170
164
  baseUrl: absoluteBaseUrl || "./",
package/dist/esm-node/utils/register.js CHANGED
@@ -48,24 +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
- }
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
+ });
69
73
  } catch (error) {
70
74
  logger.error(error);
71
75
  await registerEsbuild({
@@ -74,12 +78,6 @@ const registerCompiler = async (appDir, distDir, alias) => {
74
78
  distDir
75
79
  });
76
80
  }
77
- } else {
78
- await registerEsbuild({
79
- isTsProject,
80
- tsConfig,
81
- distDir
82
- });
83
81
  }
84
82
  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
85
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.0",
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,19 +88,19 @@
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",
91
+ "@modern-js/node-bundle-require": "2.60.3",
92
92
  "@modern-js/plugin-data-loader": "2.60.3",
93
+ "@modern-js/core": "2.60.3",
94
+ "@modern-js/plugin": "2.60.3",
93
95
  "@modern-js/plugin-i18n": "2.60.3",
94
- "@modern-js/node-bundle-require": "2.60.3",
95
96
  "@modern-js/prod-server": "2.60.3",
96
- "@modern-js/plugin": "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
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",