@nx/js 17.0.0-beta.6 → 17.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "17.0.0-beta.6",
+  "version": "17.0.0-beta.8",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -57,9 +57,9 @@
     "semver": "7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.6",
-    "@nx/workspace": "17.0.0-beta.6",
-    "@nrwl/js": "17.0.0-beta.6"
+    "@nx/devkit": "17.0.0-beta.8",
+    "@nx/workspace": "17.0.0-beta.8",
+    "@nrwl/js": "17.0.0-beta.8"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/library.js

@@ -37,7 +37,7 @@ async function libraryGeneratorInternal(tree, schema) {
         tasks.push(await (0, generator_1.default)(tree, { ...options, skipFormat: true }));
     }
     if (options.bundler === 'vite') {
-        const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const viteTask = await viteConfigurationGenerator(tree, {
             project: options.name,
             newProject: true,
@@ -48,6 +48,11 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
         });
         tasks.push(viteTask);
+        createOrEditViteConfig(tree, {
+            project: options.name,
+            includeLib: true,
+            includeVitest: options.unitTestRunner === 'vitest',
+        }, false);
     }
     if (options.linter !== 'none') {
         const lintCallback = await addLint(tree, options);
@@ -63,7 +68,7 @@ async function libraryGeneratorInternal(tree, schema) {
     else if (options.unitTestRunner === 'vitest' &&
         options.bundler !== 'vite' // Test would have been set up already
     ) {
-        const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const vitestTask = await vitestGenerator(tree, {
             project: options.name,
             uiFramework: 'none',
@@ -72,6 +77,11 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
         });
         tasks.push(vitestTask);
+        createOrEditViteConfig(tree, {
+            project: options.name,
+            includeLib: false,
+            includeVitest: true,
+        }, true);
     }
     if (!schema.skipTsConfig) {
         (0, ts_config_1.addTsConfigPath)(tree, options.importPath, [
@@ -147,10 +157,10 @@ function addProject(tree, options) {
     }
 }
 async function addLint(tree, options) {
-    const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
     const { mapLintPattern } = 
     // nx-ignore-next-line
-    require('@nx/linter/src/generators/lint-project/lint-project');
+    require('@nx/eslint/src/generators/lint-project/lint-project');
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     const task = lintProjectGenerator(tree, {
         project: options.name,
@@ -168,7 +178,7 @@ async function addLint(tree, options) {
     });
     const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
     // nx-ignore-next-line
-     } = require('@nx/linter/src/generators/utils/eslint-file');
+     } = require('@nx/eslint/src/generators/utils/eslint-file');
     // if config is not supported, we don't need to do anything
     if (!isEslintConfigSupported(tree)) {
         return task;
@@ -414,7 +424,7 @@ async function normalizeOptions(tree, options) {
     if (options.publishable === false && options.buildable === false) {
         options.bundler = 'none';
     }
-    const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    const { Linter } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
     if (options.config === 'npm-scripts') {
         options.unitTestRunner = 'none';
         options.linter = Linter.None;

package/src/utils/schema.d.ts

@@ -2,7 +2,7 @@ import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project
 import type { AssetGlob, FileInputOutput } from './assets/assets';
 import { TransformerEntry } from './typescript/types';
 // nx-ignore-next-line
-const { Linter } = require('@nx/linter'); // use require to import to avoid circular dependency
+const { Linter } = require('@nx/eslint'); // use require to import to avoid circular dependency
 
 export type Compiler = 'tsc' | 'swc';
 export type Bundler = 'swc' | 'tsc' | 'rollup' | 'vite' | 'esbuild' | 'none';