@nx/vue 20.5.0-rc.0 → 20.5.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "20.5.0-rc.0",
+  "version": "20.5.0-rc.2",
   "private": false,
   "description": "The Vue plugin for Nx contains executors and generators for managing Vue applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -31,11 +31,11 @@
   "dependencies": {
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.5.0-rc.0",
-    "@nx/js": "20.5.0-rc.0",
-    "@nx/eslint": "20.5.0-rc.0",
-    "@nx/vite": "20.5.0-rc.0",
-    "@nx/web": "20.5.0-rc.0"
+    "@nx/devkit": "20.5.0-rc.2",
+    "@nx/js": "20.5.0-rc.2",
+    "@nx/eslint": "20.5.0-rc.2",
+    "@nx/vite": "20.5.0-rc.2",
+    "@nx/web": "20.5.0-rc.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/library/lib/create-library-files.js

@@ -17,15 +17,15 @@ function createLibraryFiles(host, options) {
     if (!options.isUsingTsSolutionConfig &&
         (options.publishable || options.bundler !== 'none')) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: options.name,
+            name: options.importPath ?? options.projectName,
             version: '0.0.1',
             main: './index.js',
             types: './index.d.ts',
             exports: {
                 '.': {
+                    types: './index.d.ts',
                     import: './index.mjs',
                     require: './index.js',
-                    types: './index.d.ts',
                 },
             },
         });

package/src/generators/library/lib/normalize-options.js

@@ -32,7 +32,7 @@ async function normalizeOptions(host, options) {
         addPlugin,
         ...options,
         projectName: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            ? importPath ?? (0, get_import_path_1.getImportPath)(host, projectName)
             : projectName,
         bundler,
         fileName,

package/src/generators/library/library.js

@@ -15,20 +15,20 @@ const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const path_1 = require("path");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const determine_entry_fields_1 = require("./lib/determine-entry-fields");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 function libraryGenerator(tree, schema) {
     return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function libraryGeneratorInternal(tree, schema) {
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
+    tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
@@ -36,9 +36,8 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+            name: options.projectName,
             version: '0.0.1',
-            private: true,
             ...(0, determine_entry_fields_1.determineEntryFields)(options),
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
             nx: options.parsedTags?.length
@@ -49,7 +48,7 @@ async function libraryGeneratorInternal(tree, schema) {
         });
     }
     else {
-        (0, devkit_1.addProjectConfiguration)(tree, options.name, {
+        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
             root: options.projectRoot,
             sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
             projectType: 'library',
@@ -82,13 +81,6 @@ async function libraryGeneratorInternal(tree, schema) {
             skipFormat: true,
         });
     }
-    if (!options.isUsingTsSolutionConfig &&
-        (options.publishable || options.bundler !== 'none')) {
-        (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
-            json.name = options.importPath;
-            return json;
-        });
-    }
     if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(tree, options.importPath, [
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
@@ -108,6 +100,17 @@ async function libraryGeneratorInternal(tree, schema) {
             : undefined);
     }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
+    if (options.publishable) {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+        if (options.isUsingTsSolutionConfig) {
+            await (0, add_release_config_1.addReleaseConfigForTsSolution)(tree, options.projectName, projectConfig);
+        }
+        else {
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, options.projectName, projectConfig);
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
+        tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
+    }
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);
     // Always run install to link packages.