@nx/js 0.0.0-pr-33838-05b9549 → 0.0.0-pr-34018-741bc4e

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 (19) hide show
  1. package/package.json +4 -4
  2. package/src/executors/node/node.impl.d.ts.map +1 -1
  3. package/src/executors/node/node.impl.js +10 -2
  4. package/src/executors/tsc/lib/batch/normalize-tasks-options.d.ts.map +1 -1
  5. package/src/executors/tsc/lib/batch/watch.d.ts.map +1 -1
  6. package/src/executors/tsc/lib/batch/watch.js +20 -4
  7. package/src/plugins/typescript/util.d.ts.map +1 -1
  8. package/src/plugins/typescript/util.js +1 -1
  9. package/src/utils/assets/copy-assets-handler.d.ts +1 -0
  10. package/src/utils/assets/copy-assets-handler.d.ts.map +1 -1
  11. package/src/utils/assets/copy-assets-handler.js +24 -5
  12. package/src/utils/prettier.js +2 -2
  13. package/src/utils/swc/compile-swc.d.ts.map +1 -1
  14. package/src/utils/swc/compile-swc.js +49 -40
  15. package/src/utils/typescript/run-type-check.d.ts.map +1 -1
  16. package/src/utils/versions.d.ts +1 -1
  17. package/src/utils/versions.js +1 -1
  18. package/src/utils/watch-for-single-file-changes.d.ts.map +1 -1
  19. package/src/utils/watch-for-single-file-changes.js +10 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/js",
3
- "version": "0.0.0-pr-33838-05b9549",
3
+ "version": "0.0.0-pr-34018-741bc4e",
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": "0.0.0-pr-33838-05b9549",
43
- "@nx/workspace": "0.0.0-pr-33838-05b9549",
42
+ "@nx/devkit": "0.0.0-pr-34018-741bc4e",
43
+ "@nx/workspace": "0.0.0-pr-34018-741bc4e",
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": "0.0.0-pr-33838-05b9549"
63
+ "nx": "0.0.0-pr-34018-741bc4e"
64
64
  },
65
65
  "peerDependencies": {
66
66
  "verdaccio": "^6.0.5"
package/src/executors/node/node.impl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cAqQhC;AA+HD,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA+HD,eAAe,YAAY,CAAC"}
package/src/executors/node/node.impl.js CHANGED
@@ -231,8 +231,16 @@ async function* nodeExecutor(options, context) {
231
231
  watchProjects: [context.projectName],
232
232
  includeDependentProjects: true,
233
233
  }, async (err, data) => {
234
- if (err === 'closed') {
235
- devkit_1.logger.error(`Watch error: Daemon closed the connection`);
234
+ if (err === 'reconnecting') {
235
+ // Silent - daemon restarts automatically on lockfile changes
236
+ return;
237
+ }
238
+ else if (err === 'reconnected') {
239
+ // Silent - reconnection succeeded
240
+ return;
241
+ }
242
+ else if (err === 'closed') {
243
+ devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
236
244
  process.exit(1);
237
245
  }
238
246
  else if (err) {
package/src/executors/tsc/lib/batch/normalize-tasks-options.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-tasks-options.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/normalize-tasks-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EACV,eAAe,EACf,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAGlC,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAa3C"}
1
+ {"version":3,"file":"normalize-tasks-options.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/normalize-tasks-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EACV,eAAe,EACf,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAGlC,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAgB3C"}
package/src/executors/tsc/lib/batch/watch.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/watch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAsB,uCAAuC,CAC3D,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,IAAI,GAC/C,OAAO,CAAC,MAAM,IAAI,CAAC,CAgCrB;AAED,wBAAsB,qCAAqC,CACzD,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,MAAM,IAAI,CAAC,CAsBrB"}
1
+ {"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/watch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAsB,uCAAuC,CAC3D,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,IAAI,GAC/C,OAAO,CAAC,MAAM,IAAI,CAAC,CAsCrB;AAED,wBAAsB,qCAAqC,CACzD,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,MAAM,IAAI,CAAC,CA4BrB"}
package/src/executors/tsc/lib/batch/watch.js CHANGED
@@ -13,8 +13,16 @@ async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
13
13
  packageJsonTaskInfoMap.set((0, path_1.join)(t.options.projectRoot, 'package.json'), t);
14
14
  });
15
15
  const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
16
- if (err === 'closed') {
17
- devkit_1.logger.error(`Watch error: Daemon closed the connection`);
16
+ if (err === 'reconnecting') {
17
+ // Silent - daemon restarts automatically on lockfile changes
18
+ return;
19
+ }
20
+ else if (err === 'reconnected') {
21
+ // Silent - reconnection succeeded
22
+ return;
23
+ }
24
+ else if (err === 'closed') {
25
+ devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
18
26
  process.exit(1);
19
27
  }
20
28
  else if (err) {
@@ -40,8 +48,16 @@ async function watchTaskProjectsFileChangesForAssets(taskInfos) {
40
48
  includeDependentProjects: true,
41
49
  includeGlobalWorkspaceFiles: true,
42
50
  }, (err, data) => {
43
- if (err === 'closed') {
44
- devkit_1.logger.error(`Watch error: Daemon closed the connection`);
51
+ if (err === 'reconnecting') {
52
+ // Silent - daemon restarts automatically on lockfile changes
53
+ return;
54
+ }
55
+ else if (err === 'reconnected') {
56
+ // Silent - reconnection succeeded
57
+ return;
58
+ }
59
+ else if (err === 'closed') {
60
+ devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
45
61
  process.exit(1);
46
62
  }
47
63
  else if (err) {
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/assets/copy-assets-handler.d.ts CHANGED
@@ -26,6 +26,7 @@ export declare class CopyAssetsHandler {
26
26
  constructor(opts: CopyAssetHandlerOptions);
27
27
  processAllAssetsOnce(): Promise<void>;
28
28
  processAllAssetsOnceSync(): void;
29
+ private getIgnorePatternsForAsset;
29
30
  watchAndProcessOnAssetChange(): Promise<() => void>;
30
31
  processWatchEvents(events: ChangedFile[]): Promise<void>;
31
32
  private filesToEvent;
package/src/utils/assets/copy-assets-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAWD,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2DnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3C,wBAAwB,IAAI,IAAI;IAgB1B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IAqBnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,qBAAqB;CAG9B"}
1
+ {"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAWD,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2DnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3C,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,yBAAyB;IAa3B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IA2BnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,qBAAqB;CAG9B"}
package/src/utils/assets/copy-assets-handler.js CHANGED
@@ -91,8 +91,10 @@ class CopyAssetsHandler {
91
91
  cwd: this.rootDir,
92
92
  dot: true, // enable hidden files
93
93
  expandDirectories: false,
94
- // Ignore common directories that should not be copied or processed
95
- ignore: ['**/node_modules/**', '**/.git/**'],
94
+ // Only ignore node_modules when the pattern doesn't explicitly reference it.
95
+ // This allows copying generated files from node_modules (e.g., Prisma client)
96
+ // while avoiding performance issues from scanning all node_modules for other patterns.
97
+ ignore: this.getIgnorePatternsForAsset(ag),
96
98
  });
97
99
  this.callback(this.filesToEvent(files, ag));
98
100
  }));
@@ -105,18 +107,35 @@ class CopyAssetsHandler {
105
107
  cwd: this.rootDir,
106
108
  dot: true, // enable hidden files
107
109
  expandDirectories: false,
108
- ignore: ['**/node_modules/**', '**/.git/**'],
110
+ ignore: this.getIgnorePatternsForAsset(ag),
109
111
  });
110
112
  this.callback(this.filesToEvent(files, ag));
111
113
  });
112
114
  }
115
+ getIgnorePatternsForAsset(ag) {
116
+ // If the asset input path starts with 'node_modules', allow traversing node_modules
117
+ // for that specific pattern. This enables copying generated files like Prisma client.
118
+ const inputStartsWithNodeModules = ag.input.startsWith('node_modules/') || ag.input === 'node_modules';
119
+ if (inputStartsWithNodeModules) {
120
+ return ['**/.git/**'];
121
+ }
122
+ return ['**/node_modules/**', '**/.git/**'];
123
+ }
113
124
  async watchAndProcessOnAssetChange() {
114
125
  const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
115
126
  watchProjects: 'all',
116
127
  includeGlobalWorkspaceFiles: true,
117
128
  }, (err, data) => {
118
- if (err === 'closed') {
119
- devkit_1.logger.error(`Watch error: Daemon closed the connection`);
129
+ if (err === 'reconnecting') {
130
+ // Silent - daemon restarts automatically on lockfile changes
131
+ return;
132
+ }
133
+ else if (err === 'reconnected') {
134
+ // Silent - reconnection succeeded
135
+ return;
136
+ }
137
+ else if (err === 'closed') {
138
+ devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
120
139
  process.exit(1);
121
140
  }
122
141
  else if (err) {
package/src/utils/prettier.js CHANGED
@@ -8,7 +8,7 @@ const versions_1 = require("./versions");
8
8
  async function resolveUserExistingPrettierConfig() {
9
9
  let prettier;
10
10
  try {
11
- prettier = require('prettier');
11
+ prettier = await Promise.resolve().then(() => require('prettier'));
12
12
  }
13
13
  catch {
14
14
  return null;
@@ -78,7 +78,7 @@ function generatePrettierSetup(tree, options) {
78
78
  async function resolvePrettierConfigPath(tree) {
79
79
  let prettier;
80
80
  try {
81
- prettier = require('prettier');
81
+ prettier = await Promise.resolve().then(() => require('prettier'));
82
82
  }
83
83
  catch {
84
84
  return null;
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();
package/src/utils/typescript/run-type-check.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run-type-check.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/run-type-check.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkB,UAAU,EAAW,MAAM,YAAY,CAAC;AAKtE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,IAAI,CAAC;AAE3D,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,uBAAuB,CAAC;AAEjD,UAAU,UAAU;IAClB,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,CACR,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,MAAM,EAC3B,UAAU,CAAC,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;;;;GAsC1B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,CAkC1B;AA6DD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,UAAU,GACrB,MAAM,CAqDR"}
1
+ {"version":3,"file":"run-type-check.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/run-type-check.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkB,UAAU,EAAW,MAAM,YAAY,CAAC;AAKtE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,IAAI,CAAC;AAE3D,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,uBAAuB,CAAC;AAEjD,UAAU,UAAU;IAClB,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,CACR,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,MAAM,EAC3B,UAAU,CAAC,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;;;;GAqC1B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,CAkC1B;AA6DD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,UAAU,GACrB,MAAM,CAqDR"}
package/src/utils/versions.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export declare const nxVersion: any;
2
2
  export declare const esbuildVersion = "^0.19.2";
3
- export declare const prettierVersion = "^2.6.2";
3
+ export declare const prettierVersion = "~3.6.2";
4
4
  export declare const swcCliVersion = "~0.6.0";
5
5
  export declare const swcCoreVersion = "~1.5.7";
6
6
  export declare const swcHelpersVersion = "~0.5.11";
package/src/utils/versions.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.supportedTypescriptVersions = exports.typescriptVersion = exports.verdaccioVersion = exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
5
  exports.esbuildVersion = '^0.19.2';
6
- exports.prettierVersion = '^2.6.2';
6
+ exports.prettierVersion = '~3.6.2';
7
7
  exports.swcCliVersion = '~0.6.0';
8
8
  exports.swcCoreVersion = '~1.5.7';
9
9
  exports.swcHelpersVersion = '~0.5.11';
package/src/utils/watch-for-single-file-changes.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"watch-for-single-file-changes.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":"AAIA,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,IAAI,GACnB,OAAO,CAAC,MAAM,IAAI,CAAC,CAoBrB"}
1
+ {"version":3,"file":"watch-for-single-file-changes.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":"AAIA,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,IAAI,GACnB,OAAO,CAAC,MAAM,IAAI,CAAC,CA0BrB"}
package/src/utils/watch-for-single-file-changes.js CHANGED
@@ -6,8 +6,16 @@ const client_1 = require("nx/src/daemon/client/client");
6
6
  const path_1 = require("path");
7
7
  async function watchForSingleFileChanges(projectName, projectRoot, relativeFilePath, callback) {
8
8
  const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
9
- if (err === 'closed') {
10
- devkit_1.logger.error(`Watch error: Daemon closed the connection`);
9
+ if (err === 'reconnecting') {
10
+ // Silent - daemon restarts automatically on lockfile changes
11
+ return;
12
+ }
13
+ else if (err === 'reconnected') {
14
+ // Silent - reconnection succeeded
15
+ return;
16
+ }
17
+ else if (err === 'closed') {
18
+ devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
11
19
  process.exit(1);
12
20
  }
13
21
  else if (err) {