@nx/js 22.0.1 → 22.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.0.1",
+  "version": "22.0.3",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.0.1",
-    "@nx/workspace": "22.0.1",
+    "@nx/devkit": "22.0.3",
+    "@nx/workspace": "22.0.3",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -54,13 +54,13 @@
     "npm-run-path": "^4.0.1",
     "picocolors": "^1.1.0",
     "picomatch": "4.0.2",
-    "semver": "^7.5.3",
+    "semver": "^7.6.3",
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.0.1"
+    "nx": "22.0.3"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/verdaccio/verdaccio.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verdaccio.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/verdaccio/verdaccio.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAMrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAUnD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;GAqDzB;AAmTD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"verdaccio.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/verdaccio/verdaccio.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAOrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAUnD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;GAqDzB;AAoTD,eAAe,iBAAiB,CAAC"}

package/src/executors/verdaccio/verdaccio.impl.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verdaccioExecutor = verdaccioExecutor;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 const detectPort = require("detect-port");
 const node_fs_1 = require("node:fs");
@@ -85,7 +86,9 @@ function startVerdaccio(options, workspaceRoot) {
         childProcess.on('disconnect', (err) => {
             reject(err);
         });
-        childProcess.on('exit', (code) => {
+        childProcess.on('exit', (code, signal) => {
+            if (code === null)
+                code = (0, internal_1.signalToCode)(signal);
             if (code === 0) {
                 resolve(code);
             }

package/src/generators/library/files/jest-config/jest.config.__ext__

@@ -1,5 +1,5 @@
 /* eslint-disable */
-<% if(js) {%>const { readFileSync } = require('fs')<% } else { %>import { readFileSync } from 'fs';<% } %>
+<% if(ext === 'js' || ext === 'cts') {%>const { readFileSync } = require('fs')<% } else { %>import { readFileSync } from 'fs';<% } %>
 
 // Reading the SWC compilation config and remove the "exclude"
 // for the test files to be compiled by SWC
@@ -18,7 +18,7 @@ if (swcJestConfig.swcrc === undefined) {
 // jest needs EsModule Interop to find the default exported setup/teardown functions
 // swcJestConfig.module.noInterop = false;
 
-<% if(js) {%>module.exports =<% } else { %>export default<% } %> {
+<% if(ext === 'js' || ext === 'cts') {%>module.exports =<% } else { %>export default<% } %> {
   displayName: '<%= project %>',
   preset: '<%= offsetFromRoot %><%= jestPreset %>',
   transform: {

package/src/generators/library/library.js

@@ -520,14 +520,14 @@ async function addJest(tree, options) {
 function replaceJestConfig(tree, options) {
     const filesDir = (0, path_1.join)(__dirname, './files/jest-config');
     // the existing config has to be deleted otherwise the new config won't overwrite it
-    const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'ts'}`);
+    const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'cts'}`);
     if (tree.exists(existingJestConfig)) {
         tree.delete(existingJestConfig);
     }
     const jestPreset = findRootJestPreset(tree) ?? 'jest.presets.js';
     // replace with JS:SWC specific jest config
     (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
-        ext: options.js ? 'js' : 'ts',
+        ext: options.js ? 'js' : 'cts',
         jestPreset,
         js: !!options.js,
         project: options.name,

package/src/plugins/jest/start-local-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-local-registry.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/jest/start-local-registry.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,mBAAmB,EACnB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,aAAa,GACd,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,iBAK0B,IAAI,EA4E9B;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"start-local-registry.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/jest/start-local-registry.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,mBAAmB,EACnB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,aAAa,GACd,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,iBAK0B,IAAI,EA6E9B;AAED,eAAe,kBAAkB,CAAC"}

package/src/plugins/jest/start-local-registry.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startLocalRegistry = startLocalRegistry;
+const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 /**
  * This function is used to start a local registry for testing purposes.
@@ -61,7 +62,9 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
             console.log('local registry error', err);
             reject(err);
         });
-        childProcess.on('exit', (code) => {
+        childProcess.on('exit', (code, signal) => {
+            if (code === null)
+                code = (0, internal_1.signalToCode)(signal);
             console.log('local registry exit', code);
             if (code !== 0) {
                 reject(code);

package/src/utils/swc/add-swc-config.js

@@ -5,7 +5,7 @@ exports.addSwcConfig = addSwcConfig;
 exports.addSwcTestConfig = addSwcTestConfig;
 const path_1 = require("path");
 exports.defaultExclude = [
-    'jest.config.ts',
+    'jest.config.[ct]s',
     '.*\\.spec.tsx?$',
     '.*\\.test.tsx?$',
     './src/jest-setup.ts$',