@nx/js 22.2.4 → 22.2.6

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.
Files changed (5) hide show
  1. package/package.json +4 -4
  2. package/src/plugins/typescript/util.d.ts.map +1 -1
  3. package/src/plugins/typescript/util.js +1 -1
  4. package/src/utils/swc/compile-swc.d.ts.map +1 -1
  5. package/src/utils/swc/compile-swc.js +49 -40
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/js",
3
- "version": "22.2.4",
3
+ "version": "22.2.6",
4
4
  "private": false,
5
5
  "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
6
6
  "repository": {
@@ -39,8 +39,8 @@
39
39
  "@babel/preset-env": "^7.23.2",
40
40
  "@babel/preset-typescript": "^7.22.5",
41
41
  "@babel/runtime": "^7.22.6",
42
- "@nx/devkit": "22.2.4",
43
- "@nx/workspace": "22.2.4",
42
+ "@nx/devkit": "22.2.6",
43
+ "@nx/workspace": "22.2.6",
44
44
  "@zkochan/js-yaml": "0.0.7",
45
45
  "babel-plugin-const-enum": "^1.0.1",
46
46
  "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
60
60
  "tslib": "^2.3.0"
61
61
  },
62
62
  "devDependencies": {
63
- "nx": "22.2.4"
63
+ "nx": "22.2.6"
64
64
  },
65
65
  "peerDependencies": {
66
66
  "verdaccio": "^6.0.5"
package/src/plugins/typescript/util.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAGpE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG3E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGpD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,iBAAiB,EACjB,SAAS,GAAG,mBAAmB,GAAG,KAAK,CACxC,GAAG;IACF,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC5C,OAAO,EAAE;IAAE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,EACvE,GAAG,EAAE,sBAAsB,GAC1B,IAAI,CA2BN;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,kBAAkB,EAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CA2CT"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAGpE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG3E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGpD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,iBAAiB,EACjB,SAAS,GAAG,mBAAmB,GAAG,KAAK,CACxC,GAAG;IACF,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC5C,OAAO,EAAE;IAAE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,EACvE,GAAG,EAAE,sBAAsB,GAC1B,IAAI,CA6BN;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,kBAAkB,EAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CA2CT"}
package/src/plugins/typescript/util.js CHANGED
@@ -18,7 +18,7 @@ function addBuildAndWatchDepsTargets(workspaceRoot, projectRoot, targets, option
18
18
  const projectJson = (0, devkit_1.readJsonFile)(projectJsonPath);
19
19
  projectName = projectJson.name;
20
20
  }
21
- else if ((0, node_fs_1.existsSync)(packageJsonPath)) {
21
+ if (!projectName && (0, node_fs_1.existsSync)(packageJsonPath)) {
22
22
  const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
23
23
  projectName = packageJson.nx?.name ?? packageJson.name;
24
24
  }
package/src/utils/swc/compile-swc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"compile-swc.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAU,MAAM,YAAY,CAAC;AAK/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAC;AAkEzD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,eAAe,EACxB,iBAAiB,EAAE,4BAA4B,EAC/C,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;GA+C7C;AAED,wBAAuB,eAAe,CACpC,OAAO,EAAE,eAAe,EACxB,iBAAiB,EAAE,4BAA4B,EAC/C,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;aAcC,OAAO;aAAW,MAAM;aA+FtE"}
1
+ {"version":3,"file":"compile-swc.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAU,MAAM,YAAY,CAAC;AAK/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAC;AAkEzD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,eAAe,EACxB,iBAAiB,EAAE,4BAA4B,EAC/C,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;GA+C7C;AAED,wBAAuB,eAAe,CACpC,OAAO,EAAE,eAAe,EACxB,iBAAiB,EAAE,4BAA4B,EAC/C,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;aAcC,OAAO;aAAW,MAAM;aA0GtE"}
package/src/utils/swc/compile-swc.js CHANGED
@@ -103,6 +103,7 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
103
103
  }
104
104
  return yield* (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
105
105
  let processOnExit;
106
+ let handleCallback;
106
107
  let stdoutOnData;
107
108
  let stderrOnData;
108
109
  let watcherOnExit;
@@ -117,52 +118,60 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
117
118
  process.off('SIGTERM', processOnExit);
118
119
  process.off('exit', processOnExit);
119
120
  };
120
- stdoutOnData = async (data) => {
121
- process.stdout.write(data);
122
- if (!data.startsWith('Watching')) {
123
- const swcStatus = data.includes('Successfully');
124
- if (initialPostCompile) {
125
- await postCompilationCallback();
126
- initialPostCompile = false;
121
+ handleCallback = async (type, data) => {
122
+ if (type === 'stdout' || data.includes('Successfully')) {
123
+ process.stdout.write(data);
124
+ if (!data.startsWith('Watching')) {
125
+ const swcStatus = data.includes('Successfully');
126
+ if (initialPostCompile) {
127
+ await postCompilationCallback();
128
+ initialPostCompile = false;
129
+ }
130
+ if (normalizedOptions.skipTypeCheck ||
131
+ normalizedOptions.isTsSolutionSetup) {
132
+ next(getResult(swcStatus));
133
+ return;
134
+ }
135
+ if (!typeCheckOptions) {
136
+ typeCheckOptions = getTypeCheckOptions(normalizedOptions);
137
+ }
138
+ const delayed = delay(5000);
139
+ next(getResult(await Promise.race([
140
+ delayed
141
+ .start()
142
+ .then(() => ({ tscStatus: false, type: 'timeout' })),
143
+ (0, run_type_check_1.runTypeCheck)(typeCheckOptions).then(({ errors, warnings }) => {
144
+ const hasErrors = errors.length > 0;
145
+ if (hasErrors) {
146
+ (0, print_diagnostics_1.printDiagnostics)(errors, warnings);
147
+ }
148
+ return {
149
+ tscStatus: !hasErrors,
150
+ type: 'tsc',
151
+ };
152
+ }),
153
+ ]).then(({ type, tscStatus }) => {
154
+ if (type === 'tsc') {
155
+ delayed.cancel();
156
+ return tscStatus && swcStatus;
157
+ }
158
+ return swcStatus;
159
+ })));
127
160
  }
128
- if (normalizedOptions.skipTypeCheck ||
129
- normalizedOptions.isTsSolutionSetup) {
130
- next(getResult(swcStatus));
161
+ }
162
+ else if (type === 'stderr' && !data.includes('Successfully')) {
163
+ process.stderr.write(data);
164
+ if (data.includes('Debugger attached.')) {
131
165
  return;
132
166
  }
133
- if (!typeCheckOptions) {
134
- typeCheckOptions = getTypeCheckOptions(normalizedOptions);
135
- }
136
- const delayed = delay(5000);
137
- next(getResult(await Promise.race([
138
- delayed
139
- .start()
140
- .then(() => ({ tscStatus: false, type: 'timeout' })),
141
- (0, run_type_check_1.runTypeCheck)(typeCheckOptions).then(({ errors, warnings }) => {
142
- const hasErrors = errors.length > 0;
143
- if (hasErrors) {
144
- (0, print_diagnostics_1.printDiagnostics)(errors, warnings);
145
- }
146
- return {
147
- tscStatus: !hasErrors,
148
- type: 'tsc',
149
- };
150
- }),
151
- ]).then(({ type, tscStatus }) => {
152
- if (type === 'tsc') {
153
- delayed.cancel();
154
- return tscStatus && swcStatus;
155
- }
156
- return swcStatus;
157
- })));
167
+ next(getResult(false));
158
168
  }
159
169
  };
170
+ stdoutOnData = async (data) => {
171
+ handleCallback('stdout', data);
172
+ };
160
173
  stderrOnData = (err) => {
161
- process.stderr.write(err);
162
- if (err.includes('Debugger attached.')) {
163
- return;
164
- }
165
- next(getResult(false));
174
+ handleCallback('stderr', err);
166
175
  };
167
176
  watcherOnExit = () => {
168
177
  done();