cleanup(core): remove async flag from signature of buildProjectsConfi…

…gurationsFromProjectPathsAndPlugins (#20228)
nrwl · Nov 17, 2023 · 30d94f7 · 30d94f7 · vercel · Nov 17, 2023
1 parent 2a5d541
commit 30d94f7
Show file tree

Hide file tree

Showing 58 changed files with 451 additions and 318 deletions.
diff --git a/docs/generated/devkit/CreateNodesAsync.md b/docs/generated/devkit/CreateNodesAsync.md
diff --git a/docs/generated/devkit/CreateNodesFunction.md b/docs/generated/devkit/CreateNodesFunction.md
@@ -1,6 +1,6 @@
 # Type alias: CreateNodesFunction<T\>
 
-Ƭ **CreateNodesFunction**<`T`\>: (`projectConfigurationFile`: `string`, `options`: `T` \| `undefined`, `context`: [`CreateNodesContext`](../../devkit/documents/CreateNodesContext)) => [`CreateNodesResult`](../../devkit/documents/CreateNodesResult)
+Ƭ **CreateNodesFunction**<`T`\>: (`projectConfigurationFile`: `string`, `options`: `T` \| `undefined`, `context`: [`CreateNodesContext`](../../devkit/documents/CreateNodesContext)) => [`CreateNodesResult`](../../devkit/documents/CreateNodesResult) \| `Promise`<[`CreateNodesResult`](../../devkit/documents/CreateNodesResult)\>
 
 #### Type parameters
 
@@ -10,7 +10,7 @@
 
 #### Type declaration
 
-▸ (`projectConfigurationFile`, `options`, `context`): [`CreateNodesResult`](../../devkit/documents/CreateNodesResult)
+▸ (`projectConfigurationFile`, `options`, `context`): [`CreateNodesResult`](../../devkit/documents/CreateNodesResult) \| `Promise`<[`CreateNodesResult`](../../devkit/documents/CreateNodesResult)\>
 
 A function which parses a configuration file into a set of nodes.
 Used for creating nodes for the [ProjectGraph](../../devkit/documents/ProjectGraph)
@@ -25,4 +25,4 @@ Used for creating nodes for the [ProjectGraph](../../devkit/documents/ProjectGra
 
 ##### Returns
 
-[`CreateNodesResult`](../../devkit/documents/CreateNodesResult)
+[`CreateNodesResult`](../../devkit/documents/CreateNodesResult) \| `Promise`<[`CreateNodesResult`](../../devkit/documents/CreateNodesResult)\>
diff --git a/docs/generated/devkit/NxPluginV2.md b/docs/generated/devkit/NxPluginV2.md
@@ -1,20 +1,19 @@
-# Type alias: NxPluginV2<TOptions, TCreateNodes\>
+# Type alias: NxPluginV2<TOptions\>
 
-Ƭ **NxPluginV2**<`TOptions`, `TCreateNodes`\>: `Object`
+Ƭ **NxPluginV2**<`TOptions`\>: `Object`
 
 A plugin for Nx which creates nodes and dependencies for the [ProjectGraph](../../devkit/documents/ProjectGraph)
 
 #### Type parameters
 
-| Name           | Type                                                                                                                                                                                                                                                                                                    |
-| :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `TOptions`     | `unknown`                                                                                                                                                                                                                                                                                               |
-| `TCreateNodes` | extends [`CreateNodes`](../../devkit/documents/CreateNodes)<`TOptions`\> \| [`CreateNodesAsync`](../../devkit/documents/CreateNodesAsync)<`TOptions`\> = [`CreateNodes`](../../devkit/documents/CreateNodes)<`TOptions`\> \| [`CreateNodesAsync`](../../devkit/documents/CreateNodesAsync)<`TOptions`\> |
+| Name       | Type      |
+| :--------- | :-------- |
+| `TOptions` | `unknown` |
 
 #### Type declaration
 
 | Name                  | Type                                                                           | Description                                                                                                                                   |
 | :-------------------- | :----------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------- |
 | `createDependencies?` | [`CreateDependencies`](../../devkit/documents/CreateDependencies)<`TOptions`\> | Provides a function to analyze files to create dependencies for the [ProjectGraph](../../devkit/documents/ProjectGraph)                       |
-| `createNodes?`        | `TCreateNodes`                                                                 | Provides a file pattern and function that retrieves configuration info from those files. e.g. { '\*_/_.csproj': buildProjectsFromCsProjFile } |
+| `createNodes?`        | [`CreateNodes`](../../devkit/documents/CreateNodes)                            | Provides a file pattern and function that retrieves configuration info from those files. e.g. { '\*_/_.csproj': buildProjectsFromCsProjFile } |
 | `name`                | `string`                                                                       | -                                                                                                                                             |
diff --git a/docs/generated/devkit/README.md b/docs/generated/devkit/README.md
@@ -65,7 +65,6 @@ It only uses language primitives and immutable objects
 
 - [CreateDependencies](../../devkit/documents/CreateDependencies)
 - [CreateNodes](../../devkit/documents/CreateNodes)
-- [CreateNodesAsync](../../devkit/documents/CreateNodesAsync)
 - [CreateNodesFunction](../../devkit/documents/CreateNodesFunction)
 - [CustomHasher](../../devkit/documents/CustomHasher)
 - [DynamicDependency](../../devkit/documents/DynamicDependency)

diff --git a/docs/generated/packages/devkit/documents/nx_devkit.md b/docs/generated/packages/devkit/documents/nx_devkit.md
@@ -65,7 +65,6 @@ It only uses language primitives and immutable objects
 
 - [CreateDependencies](../../devkit/documents/CreateDependencies)
 - [CreateNodes](../../devkit/documents/CreateNodes)
-- [CreateNodesAsync](../../devkit/documents/CreateNodesAsync)
 - [CreateNodesFunction](../../devkit/documents/CreateNodesFunction)
 - [CustomHasher](../../devkit/documents/CustomHasher)
 - [DynamicDependency](../../devkit/documents/DynamicDependency)

diff --git a/docs/shared/recipes/plugins/project-graph-plugins.md b/docs/shared/recipes/plugins/project-graph-plugins.md
@@ -59,7 +59,7 @@ A simplified version of Nx's built-in `project.json` plugin is shown below, whic
 export const createNodes: CreateNodes = [
   '**/project.json',
   (projectConfigurationFile: string, opts, context: CreateNodesContext) => {
-    const projectConfiguration = readJson(projectConfigurationFile);
+    const projectConfiguration = readJsonFile(projectConfigurationFile);
     const root = dirname(projectConfigurationFile);
 
     return {

diff --git a/graph/client/tsconfig.app.json b/graph/client/tsconfig.app.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "types": ["node"],
-    "lib": ["DOM", "es2019"]
+    "lib": ["DOM", "es2022"]
   },
   "files": [
     "../../node_modules/@nx/react/typings/cssmodule.d.ts",

diff --git a/jest.preset.js b/jest.preset.js
@@ -13,4 +13,5 @@ module.exports = {
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageReporters: ['html'],
   maxWorkers: 1,
+  testEnvironment: 'node',
 };
diff --git a/nx-dev/models-document/jest.config.ts b/nx-dev/models-document/jest.config.ts
@@ -2,7 +2,6 @@
 export default {
   displayName: 'nx-dev-models-document',
   globals: {},
-  testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]sx?$': [
       'ts-jest',

diff --git a/nx-dev/models-menu/jest.config.ts b/nx-dev/models-menu/jest.config.ts
@@ -2,7 +2,6 @@
 export default {
   displayName: 'nx-dev-models-menu',
   globals: {},
-  testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]sx?$': [
       'ts-jest',

diff --git a/nx-dev/models-package/jest.config.ts b/nx-dev/models-package/jest.config.ts
@@ -2,7 +2,6 @@
 export default {
   displayName: 'nx-dev-models-package',
   globals: {},
-  testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]sx?$': [
       'ts-jest',

diff --git a/nx-dev/ui-sponsor-card/jest.config.ts b/nx-dev/ui-sponsor-card/jest.config.ts
@@ -8,4 +8,5 @@ export default {
   coverageDirectory: '../../coverage/nx-dev/ui-sponsor-card',
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   preset: '../../jest.preset.js',
+  testEnvironment: 'jsdom',
 };
diff --git a/nx-dev/util-ai/jest.config.ts b/nx-dev/util-ai/jest.config.ts
@@ -2,7 +2,6 @@
 export default {
   displayName: 'nx-dev-util-ai',
   preset: '../../jest.preset.js',
-  testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },

diff --git a/packages/angular/jest.config.ts b/packages/angular/jest.config.ts
@@ -6,7 +6,6 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'angular',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
 };
diff --git a/packages/create-nx-plugin/jest.config.ts b/packages/create-nx-plugin/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'create-nx-plugin',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/create-nx-workspace/jest.config.ts b/packages/create-nx-workspace/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'create-nx-workspace',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/cypress/jest.config.ts b/packages/cypress/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'cypress',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/cypress/src/migrations/update-17-2-0/add-nx-cypress-plugin.spec.ts b/packages/cypress/src/migrations/update-17-2-0/add-nx-cypress-plugin.spec.ts
@@ -58,6 +58,7 @@ describe('add-nx-cypress-plugin migration', () => {
       })
     );
     updateProjectConfiguration(tree, 'e2e', {
+      name: 'e2e',
       root: 'e2e',
       targets: {
         e2e: {

diff --git a/packages/detox/jest.config.ts b/packages/detox/jest.config.ts
@@ -6,7 +6,6 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
   globals: {},
   displayName: 'react-native',
-  testEnvironment: 'node',
   verbose: true,
   preset: '../../jest.preset.js',
 };
diff --git a/packages/devkit/jest.config.ts b/packages/devkit/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'cli',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts b/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts
@@ -3,7 +3,7 @@ import type {
   TargetConfiguration,
 } from 'nx/src/config/workspace-json-project-json';
 import type { Tree } from 'nx/src/generators/tree';
-import type { CreateNodes, CreateNodesAsync } from 'nx/src/utils/nx-plugin';
+import type { CreateNodes } from 'nx/src/utils/nx-plugin';
 import { requireNx } from '../../nx';
 const {
   readNxJson,
@@ -19,7 +19,7 @@ export async function replaceProjectConfigurationsWithPlugin<T = unknown>(
   tree: Tree,
   rootMappings: Map<string, string>,
   pluginPath: string,
-  createNodes: CreateNodes<T> | CreateNodesAsync<T>,
+  createNodes: CreateNodes<T>,
   pluginOptions: T
 ): Promise<void> {
   const nxJson = readNxJson(tree);

diff --git a/packages/esbuild/jest.config.ts b/packages/esbuild/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'esbuild',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/eslint-plugin/jest.config.ts b/packages/eslint-plugin/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'packages-eslint-plugin',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/eslint/jest.config.ts b/packages/eslint/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'eslint',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/expo/jest.config.ts b/packages/expo/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
   globals: {},
   displayName: 'expo',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/express/jest.config.ts b/packages/express/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'express',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/jest/jest.config.ts b/packages/jest/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'jest',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/js/jest.config.ts b/packages/js/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'js',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/nest/jest.config.ts b/packages/nest/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'nest',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/next/jest.config.ts b/packages/next/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'next',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/node/jest.config.ts b/packages/node/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'node',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/nx/jest.config.ts b/packages/nx/jest.config.ts
@@ -6,6 +6,5 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
   displayName: 'nx',
-  testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };