@nx/js 21.3.0-beta.2 → 21.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "21.3.0-beta.2",
+  "version": "21.3.0-beta.4",
   "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": "21.3.0-beta.2",
-    "@nx/workspace": "21.3.0-beta.2",
+    "@nx/devkit": "21.3.0-beta.4",
+    "@nx/workspace": "21.3.0-beta.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

package/src/generators/release-version/release-version.js

@@ -188,9 +188,10 @@ To fix this you will either need to add a package.json file at that location, or
                         // We always need to independently resolve the current version from git tag per project if the projects are independent
                         options.releaseGroup.projectsRelationship === 'independent') {
                         const releaseTagPattern = options.releaseGroup.releaseTagPattern;
+                        const releaseTagPatternRequireSemver = options.releaseGroup.releaseTagPatternRequireSemver;
                         latestMatchingGitTag = await (0, git_1.getLatestGitTagForPattern)(releaseTagPattern, {
                             projectName: project.name,
-                        }, options.releaseGroup.releaseTagPatternCheckAllBranchesWhen);
+                        }, options.releaseGroup.releaseTagPatternCheckAllBranchesWhen, releaseTagPatternRequireSemver ?? true);
                         if (!latestMatchingGitTag) {
                             if (options.fallbackCurrentVersionResolver === 'disk') {
                                 if (!currentVersionFromDisk &&

package/src/generators/setup-build/generator.js

@@ -5,12 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const plugin_1 = require("../../utils/typescript/plugin");
 const get_import_path_1 = require("../../utils/get-import-path");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const ensure_typescript_1 = require("../../utils/typescript/ensure-typescript");
+const plugin_1 = require("../../utils/typescript/plugin");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
@@ -29,7 +29,7 @@ async function setupBuildGenerator(tree, options) {
         mainFile = options.main;
     }
     else {
-        const root = project.sourceRoot ?? project.root;
+        const root = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
         for (const f of [
             (0, devkit_1.joinPathFragments)(root, 'main.ts'),
             (0, devkit_1.joinPathFragments)(root, 'main.js'),

package/src/utils/inline.js

@@ -7,6 +7,7 @@ exports.getRootTsConfigPath = getRootTsConfigPath;
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
+const ts_solution_setup_1 = require("./typescript/ts-solution-setup");
 function isInlineGraphEmpty(inlineGraph) {
     return Object.keys(inlineGraph.nodes).length === 0;
 }
@@ -72,7 +73,7 @@ function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutput
     return {
         name: projectNode.name,
         root: projectNode.data.root,
-        sourceRoot: projectNode.data.sourceRoot,
+        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
         pathAlias,
         buildOutputPath,
     };

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;
 export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: string, generatorName: string): void;
@@ -6,4 +6,4 @@ export declare function findRuntimeTsConfigName(projectRoot: string, tree?: Tree
 export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[], rootDir?: string): void;
 export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): Promise<void>;
 export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';
-export declare function getProjectSourceRoot(tree: Tree, projectSourceRoot: string | undefined, projectRoot: string): string | undefined;
+export declare function getProjectSourceRoot(project: ProjectConfiguration, tree?: Tree): string;

package/src/utils/typescript/ts-solution-setup.js

@@ -9,6 +9,7 @@ exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 exports.getProjectType = getProjectType;
 exports.getProjectSourceRoot = getProjectSourceRoot;
 const devkit_1 = require("@nx/devkit");
+const node_fs_1 = require("node:fs");
 const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
@@ -206,9 +207,15 @@ function getProjectType(tree, projectRoot, projectType) {
         return 'application';
     return 'library';
 }
-function getProjectSourceRoot(tree, projectSourceRoot, projectRoot) {
-    return (projectSourceRoot ??
-        (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'src'))
-            ? (0, devkit_1.joinPathFragments)(projectRoot, 'src')
-            : projectRoot));
+function getProjectSourceRoot(project, tree) {
+    if (tree) {
+        return (project.sourceRoot ??
+            (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src'))
+                ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+                : project.root));
+    }
+    return (project.sourceRoot ??
+        ((0, node_fs_1.existsSync)((0, posix_1.join)(devkit_1.workspaceRoot, project.root, 'src'))
+            ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+            : project.root));
 }