Merge branch 'master' into changelog-true

.github/workflows/publish.yml

@@ -158,9 +158,11 @@ jobs:
      timeout-minutes: 45
      steps:
        - uses: actions/checkout@v3
+         if: ${{ !contains(github.ref, '-') }}
        - name: Build
          id: build
-         uses: cross-platform-actions/action@v0.21.0
+         if: ${{ !contains(github.ref, '-') }}
+         uses: cross-platform-actions/action@v0.21.1
          env:
            DEBUG: napi:*
            RUSTUP_IO_THREADS: 1
@@ -197,9 +199,10 @@ jobs:
              rm -rf node_modules
              rm -rf dist
              echo "KILL ALL NODE PROCESSES"
-             killall node
+             killall node || true
              echo "COMPLETE"
        - name: Upload artifact
+         if: ${{ !contains(github.ref, '-') }}
          uses: actions/upload-artifact@v3
          with:
            name: bindings-freebsd

packages/devkit/src/utils/convert-nx-executor.ts

@@ -32,7 +32,7 @@ export function convertNxExecutor(executor: Executor) {
               projects: await retrieveProjectConfigurationsWithAngularProjects(
                 builderContext.workspaceRoot,
                 nxJsonConfiguration
-              ).then((p) => (p as any).projectNodes ?? p.projects),
+              ).then((p) => p.projectNodes),
             }
           : // TODO(v18): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
             (workspaces as any).readProjectsConfigurations({

packages/nx/src/command-line/run-many/run-many.spec.ts

@@ -201,7 +201,7 @@ describe('run-many', () => {
         );
         performance.mark('end');
         const measure = performance.measure('projects', 'start', 'end');
-        expect(measure.duration).toBeLessThan(4000);
+        expect(measure.duration).toBeLessThan(10000);
       });
     });
   });

packages/nx/src/config/workspaces.spec.ts

@@ -60,13 +60,13 @@ describe('Workspaces', () => {
         }),
       });
 
-      const { projects } = await withEnvironmentVariables(
+      const { projectNodes } = await withEnvironmentVariables(
         {
           NX_WORKSPACE_ROOT: fs.tempDir,
         },
         () => retrieveProjectConfigurations(fs.tempDir, readNxJson(fs.tempDir))
       );
-      expect(projects['my-package']).toEqual({
+      expect(projectNodes['my-package']).toEqual({
         name: 'my-package',
         root: 'packages/my-package',
         sourceRoot: 'packages/my-package',

packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts

@@ -16,7 +16,6 @@ import {
   readFileMapCache,
 } from '../../project-graph/nx-deps-cache';
 import {
-  RetrievedGraphNodes,
   retrieveProjectConfigurations,
   retrieveWorkspaceFiles,
 } from '../../project-graph/utils/retrieve-workspace-files';
@@ -144,11 +143,10 @@ function computeWorkspaceConfigHash(
   return hashArray(projectConfigurationStrings);
 }
 
-async function processCollectedUpdatedAndDeletedFiles({
-  projects,
-  externalNodes,
-  projectRootMap,
-}: RetrievedGraphNodes) {
+async function processCollectedUpdatedAndDeletedFiles(
+  projects: Record<string, ProjectConfiguration>,
+  nxJson: NxJsonConfiguration
+) {
   try {
     performance.mark('hash-watched-changes-start');
     const updatedFiles = [...collectedUpdatedFiles.values()];
@@ -172,12 +170,8 @@ async function processCollectedUpdatedAndDeletedFiles({
     if (workspaceConfigHash !== storedWorkspaceConfigHash) {
       storedWorkspaceConfigHash = workspaceConfigHash;
 
-      ({ ...fileMapWithFiles } = await retrieveWorkspaceFiles(
-        workspaceRoot,
-        projectRootMap
-      ));
-
-      knownExternalNodes = externalNodes;
+      ({ externalNodes: knownExternalNodes, ...fileMapWithFiles } =
+        await retrieveWorkspaceFiles(workspaceRoot, nxJson));
     } else {
       if (fileMapWithFiles) {
         fileMapWithFiles = updateFileMap(
@@ -187,10 +181,7 @@ async function processCollectedUpdatedAndDeletedFiles({
           deletedFiles
         );
       } else {
-        fileMapWithFiles = await retrieveWorkspaceFiles(
-          workspaceRoot,
-          projectRootMap
-        );
+        fileMapWithFiles = await retrieveWorkspaceFiles(workspaceRoot, nxJson);
       }
     }
 
@@ -219,9 +210,12 @@ async function processFilesAndCreateAndSerializeProjectGraph() {
       workspaceRoot,
       nxJson
     );
-    await processCollectedUpdatedAndDeletedFiles(configResult);
+    await processCollectedUpdatedAndDeletedFiles(
+      configResult.projectNodes,
+      nxJson
+    );
     writeSourceMaps(configResult.sourceMaps);
-    return createAndSerializeProjectGraph(configResult);
+    return createAndSerializeProjectGraph(configResult.projectNodes);
   } catch (err) {
     return Promise.resolve({
       error: err,
@@ -249,9 +243,9 @@ function copyFileMap(m: FileMap) {
   return c;
 }
 
-async function createAndSerializeProjectGraph({
-  projects,
-}: RetrievedGraphNodes): Promise<{
+async function createAndSerializeProjectGraph(
+  projects: Record<string, ProjectConfiguration>
+): Promise<{
   error: string | null;
   projectGraph: ProjectGraph | null;
   fileMap: FileMap | null;

packages/nx/src/executors/utils/convert-nx-executor.ts

@@ -24,7 +24,7 @@ export function convertNxExecutor(executor: Executor) {
             builderContext.workspaceRoot,
             nxJsonConfiguration
           )
-        ).projects,
+        ).projectNodes,
       };
       const context: ExecutorContext = {
         root: builderContext.workspaceRoot,

packages/nx/src/hasher/native-task-hasher-impl.spec.ts

@@ -77,21 +77,16 @@ describe('native task hasher', () => {
   });
 
   it('should create a task hash', async () => {
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-      'libs/unrelated': 'unrelated',
-      'libs/tagged': 'tagged',
-    });
+    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
     const builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap
     );
-
     builder.addNode({
       name: 'parent',
       type: 'lib',
       data: {
-        root: 'libs/parent',
+        root: 'parent',
         targets: {
           build: {
             executor: 'nx:run-commands',
@@ -154,9 +149,9 @@ describe('native task hasher', () => {
             "AllExternalDependencies": "3244421341483603138",
             "env:NONEXISTENTENV": "3244421341483603138",
             "env:TESTENV": "11441948532827618368",
-            "parent:ProjectConfiguration": "4131510303084753861",
+            "parent:ProjectConfiguration": "15828052557461792163",
             "parent:TsConfig": "2264969541778889434",
-            "parent:{projectRoot}/**/*": "15295586939211629225",
+            "parent:{projectRoot}/**/*": "3244421341483603138",
             "runtime:echo runtime123": "29846575039086708",
             "tagged:ProjectConfiguration": "1604492097835699503",
             "tagged:TsConfig": "2264969541778889434",
@@ -168,17 +163,17 @@ describe('native task hasher', () => {
             "{workspaceRoot}/.nxignore": "3244421341483603138",
             "{workspaceRoot}/nx.json": "5219582320960288192",
           },
-          "value": "6332317845632665670",
+          "value": "2902224107680327789",
         },
       ]
     `);
   });
 
   it('should hash tasks where the project has dependencies', async () => {
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-      'libs/child': 'child',
-    });
+    console.log('read first', await tempFs.readFile('nx.json'));
+    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
+    console.dir(workspaceFiles.allWorkspaceFiles);
+    console.log('read second', await tempFs.readFile('nx.json'));
     const builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap
@@ -248,10 +243,10 @@ describe('native task hasher', () => {
     } as any;
     tempFs.writeFile('nx.json', JSON.stringify(nxJsonModified));
 
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-      'libs/child': 'child',
-    });
+    const workspaceFiles = await retrieveWorkspaceFiles(
+      tempFs.tempDir,
+      nxJsonModified
+    );
 
     let builder = new ProjectGraphBuilder(
       undefined,
@@ -328,9 +323,7 @@ describe('native task hasher', () => {
       },
     };
     tempFs.writeFile('nx.json', JSON.stringify(nxJson));
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-    });
+    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
     let builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap
@@ -410,10 +403,7 @@ describe('native task hasher', () => {
       },
     };
     tempFs.writeFile('nx.json', JSON.stringify(nxJson));
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-      'libs/child': 'child',
-    });
+    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
     const builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap
@@ -496,9 +486,7 @@ describe('native task hasher', () => {
   });
 
   it('should be able to include only a part of the base tsconfig', async () => {
-    let workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-    });
+    let workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
     const builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap
@@ -551,10 +539,7 @@ describe('native task hasher', () => {
   });
 
   it('should hash tasks where the project graph has circular dependencies', async () => {
-    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, {
-      'libs/parent': 'parent',
-      'libs/child': 'child',
-    });
+    const workspaceFiles = await retrieveWorkspaceFiles(tempFs.tempDir, nxJson);
     const builder = new ProjectGraphBuilder(
       undefined,
       workspaceFiles.fileMap.projectFileMap

packages/nx/src/native/index.d.ts

@@ -171,9 +171,10 @@ export class Watcher {
 export class WorkspaceContext {
   workspaceRoot: string
   constructor(workspaceRoot: string)
-  getWorkspaceFiles(projectRootMap: Record<string, string>): NxWorkspaceFiles
+  getWorkspaceFiles(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Promise<Record<string, string>>): Promise<NxWorkspaceFiles>
   glob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<string>
   hashFilesMatchingGlob(globs: Array<string>, exclude?: Array<string> | undefined | null): string
+  getProjectConfigurations(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Promise<Record<string, string>>): Promise<Record<string, string>>
   incrementalUpdate(updatedFiles: Array<string>, deletedFiles: Array<string>): Record<string, string>
   updateProjectFiles(projectRootMappings: ProjectRootMappings, projectFiles: ExternalObject<ProjectFiles>, globalFiles: ExternalObject<Array<FileData>>, updatedFiles: Record<string, string>, deletedFiles: Array<string>): UpdatedWorkspaceFiles
   allFileData(): Array<FileData>

packages/nx/src/native/tests/workspace_files.spec.ts

@@ -48,16 +48,12 @@ describe('workspace files', () => {
       './libs/package-project/index.js': '',
       './nested/non-project/file.txt': '',
     });
+    let globs = ['project.json', '**/project.json', 'libs/*/package.json'];
 
     const context = new WorkspaceContext(fs.tempDir);
     let { projectFileMap, globalFiles } = await context.getWorkspaceFiles(
-      {
-        'libs/project1': 'project1',
-        'libs/project2': 'project2',
-        'libs/project3': 'project3',
-        'libs/nested/project': 'nested-project',
-        'libs/package-project': 'package-project'
-      }
+      globs,
+      createParseConfigurationsFunction(fs.tempDir)
     );
 
     expect(projectFileMap).toMatchInlineSnapshot(`
@@ -151,10 +147,10 @@ describe('workspace files', () => {
 
     const context = new WorkspaceContext(fs.tempDir);
 
+    const globs = ['project.json', '**/project.json', '**/package.json'];
     const { globalFiles, projectFileMap } = await context.getWorkspaceFiles(
-      {
-        '.': 'repo-name'
-      }
+      globs,
+      createParseConfigurationsFunction(fs.tempDir)
     );
 
     expect(globalFiles).toEqual([]);

packages/nx/src/native/workspace/config_files.rs

@@ -1,3 +1,6 @@
+use std::collections::HashMap;
+
+use napi::bindgen_prelude::Promise;
 use rayon::prelude::*;
 
 use crate::native::glob::build_glob_set;
@@ -29,3 +32,17 @@ pub(super) fn glob_files(
             .unwrap_or(is_match)
     }))
 }
+
+/// Get workspace config files based on provided globs
+pub(super) fn get_project_configurations<ConfigurationParser>(
+    globs: Vec<String>,
+    files: &[FileData],
+    parse_configurations: ConfigurationParser,
+) -> napi::Result<Promise<HashMap<String, String>>>
+where
+    ConfigurationParser: Fn(Vec<String>) -> napi::Result<Promise<HashMap<String, String>>>,
+{
+    let files = glob_files(files, globs, None).map_err(anyhow::Error::from)?;
+
+    parse_configurations(files.map(|file| file.file.to_owned()).collect())
+}