@nx/js 22.1.0-beta.5 → 22.1.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.1.0-beta.5",
+  "version": "22.1.0-beta.7",
   "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.1.0-beta.5",
-    "@nx/workspace": "22.1.0-beta.5",
+    "@nx/devkit": "22.1.0-beta.7",
+    "@nx/workspace": "22.1.0-beta.7",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.5"
+    "nx": "22.1.0-beta.7"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BA+K/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AA6uBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BA6K/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AA6uBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -98,8 +98,9 @@ async function libraryGeneratorInternal(tree, schema) {
     else if (options.unitTestRunner === 'vitest' &&
         options.bundler !== 'vite' // Test would have been set up already
     ) {
-        const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-        const vitestTask = await vitestGenerator(tree, {
+        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+        const vitestTask = await configurationGenerator(tree, {
             project: options.name,
             uiFramework: 'none',
             coverageProvider: 'v8',
@@ -520,14 +521,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/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$',