From 1442800172dbd420ebfdb6aa9687bc474de84325 Mon Sep 17 00:00:00 2001 From: Arek Kubaczkowski Date: Wed, 28 Feb 2024 09:58:21 +0100 Subject: [PATCH 1/3] fix(react-native): storybook relative paths --- .../src/executors/storybook/storybook.impl.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/react-native/src/executors/storybook/storybook.impl.ts b/packages/react-native/src/executors/storybook/storybook.impl.ts index ed480ecefe8be..808ae5bbe3279 100644 --- a/packages/react-native/src/executors/storybook/storybook.impl.ts +++ b/packages/react-native/src/executors/storybook/storybook.impl.ts @@ -1,4 +1,4 @@ -import { join } from 'path'; +import { join, relative, resolve, dirname } from 'path'; import { ExecutorContext, logger, readJsonFile } from '@nx/devkit'; import { fileExists } from '@nx/workspace/src/utilities/fileutils'; import * as chalk from 'chalk'; @@ -66,9 +66,15 @@ export function runCliStorybook( workspaceRoot: string, options: ReactNativeStorybookOptions ) { - const storiesFiles: string[] = options.searchDir.flatMap((dir) => - globSync(join(dir, options.pattern)) - ); + const storiesFiles: string[] = options.searchDir.flatMap((dir) => { + const storyFilePaths: string[] = globSync(join(dir, options.pattern)); + + return storyFilePaths.map((storyFilePath) => { + const loaderPath: string = resolve(dirname(options.outputFile)); + return relative(loaderPath, storyFilePath); + }); + }); + if (storiesFiles.length === 0) { logger.warn(`${chalk.bold.yellow('warn')} No stories found.`); } From df97f95d785487780a917db97c2c319b764c50f2 Mon Sep 17 00:00:00 2001 From: Arek Kubaczkowski Date: Tue, 19 Mar 2024 20:55:42 +0100 Subject: [PATCH 2/3] fix(react-native): rebase --- docs/generated/devkit/CreateDependencies.md | 6 +++--- docs/generated/devkit/CreateNodesFunction.md | 6 +++--- docs/generated/devkit/Executor.md | 4 ++-- docs/generated/devkit/Generator.md | 4 ++-- docs/generated/devkit/GeneratorCallback.md | 4 ++-- docs/generated/devkit/ProjectTargetConfigurator.md | 8 ++++---- docs/generated/devkit/TaskGraphExecutor.md | 4 ++-- docs/generated/devkit/defaultTasksRunner.md | 3 +++ 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/docs/generated/devkit/CreateDependencies.md b/docs/generated/devkit/CreateDependencies.md index 0800b0dbc2c3f..091dfb6da31ae 100644 --- a/docs/generated/devkit/CreateDependencies.md +++ b/docs/generated/devkit/CreateDependencies.md @@ -2,9 +2,6 @@ Ƭ **CreateDependencies**\<`T`\>: (`options`: `T` \| `undefined`, `context`: [`CreateDependenciesContext`](../../devkit/documents/CreateDependenciesContext)) => [`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[] \| `Promise`\<[`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[]\> -A function which parses files in the workspace to create dependencies in the [ProjectGraph](../../devkit/documents/ProjectGraph) -Use [validateDependency](../../devkit/documents/validateDependency) to validate dependencies - #### Type parameters | Name | Type | @@ -15,6 +12,9 @@ Use [validateDependency](../../devkit/documents/validateDependency) to validate ▸ (`options`, `context`): [`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[] \| `Promise`\<[`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[]\> +A function which parses files in the workspace to create dependencies in the [ProjectGraph](../../devkit/documents/ProjectGraph) +Use [validateDependency](../../devkit/documents/validateDependency) to validate dependencies + ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/CreateNodesFunction.md b/docs/generated/devkit/CreateNodesFunction.md index 5ebf292988068..274fe008ba434 100644 --- a/docs/generated/devkit/CreateNodesFunction.md +++ b/docs/generated/devkit/CreateNodesFunction.md @@ -2,9 +2,6 @@ Ƭ **CreateNodesFunction**\<`T`\>: (`projectConfigurationFile`: `string`, `options`: `T` \| `undefined`, `context`: [`CreateNodesContext`](../../devkit/documents/CreateNodesContext)) => [`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) - #### Type parameters | Name | Type | @@ -15,6 +12,9 @@ Used for creating nodes for the [ProjectGraph](../../devkit/documents/ProjectGra ▸ (`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) + ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/Executor.md b/docs/generated/devkit/Executor.md index 3e44f1f533bdb..8340dbf18f4ae 100644 --- a/docs/generated/devkit/Executor.md +++ b/docs/generated/devkit/Executor.md @@ -2,8 +2,6 @@ Ƭ **Executor**\<`T`\>: (`options`: `T`, `context`: [`ExecutorContext`](../../devkit/documents/ExecutorContext)) => `Promise`\<\{ `success`: `boolean` }\> \| `AsyncIterableIterator`\<\{ `success`: `boolean` }\> -Implementation of a target of a project - #### Type parameters | Name | Type | @@ -14,6 +12,8 @@ Implementation of a target of a project ▸ (`options`, `context`): `Promise`\<\{ `success`: `boolean` }\> \| `AsyncIterableIterator`\<\{ `success`: `boolean` }\> +Implementation of a target of a project + ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/Generator.md b/docs/generated/devkit/Generator.md index 32d0ac57b4991..8ec10e6fa6da6 100644 --- a/docs/generated/devkit/Generator.md +++ b/docs/generated/devkit/Generator.md @@ -2,8 +2,6 @@ Ƭ **Generator**\<`T`\>: (`tree`: `any`, `schema`: `T`) => `void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback) \| `Promise`\<`void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback)\> -A function that schedules updates to the filesystem to be done atomically - #### Type parameters | Name | Type | @@ -14,6 +12,8 @@ A function that schedules updates to the filesystem to be done atomically ▸ (`tree`, `schema`): `void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback) \| `Promise`\<`void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback)\> +A function that schedules updates to the filesystem to be done atomically + ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/GeneratorCallback.md b/docs/generated/devkit/GeneratorCallback.md index da7b25c41d3e3..baa591f2a6619 100644 --- a/docs/generated/devkit/GeneratorCallback.md +++ b/docs/generated/devkit/GeneratorCallback.md @@ -2,12 +2,12 @@ Ƭ **GeneratorCallback**: () => `void` \| `Promise`\<`void`\> -A callback function that is executed after changes are made to the file system - #### Type declaration ▸ (): `void` \| `Promise`\<`void`\> +A callback function that is executed after changes are made to the file system + ##### Returns `void` \| `Promise`\<`void`\> diff --git a/docs/generated/devkit/ProjectTargetConfigurator.md b/docs/generated/devkit/ProjectTargetConfigurator.md index b4bf537e7af29..434422163b379 100644 --- a/docs/generated/devkit/ProjectTargetConfigurator.md +++ b/docs/generated/devkit/ProjectTargetConfigurator.md @@ -2,10 +2,6 @@ Ƭ **ProjectTargetConfigurator**: (`file`: `string`) => `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> -**`Deprecated`** - -Add targets to the projects in a [CreateNodes](../../devkit/documents/CreateNodes) function instead. This will be removed in Nx 19 - #### Type declaration ▸ (`file`): `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> @@ -19,3 +15,7 @@ Add targets to the projects in a [CreateNodes](../../devkit/documents/CreateNode ##### Returns `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> + +**`Deprecated`** + +Add targets to the projects in a [CreateNodes](../../devkit/documents/CreateNodes) function instead. This will be removed in Nx 19 diff --git a/docs/generated/devkit/TaskGraphExecutor.md b/docs/generated/devkit/TaskGraphExecutor.md index 30ddccaef84d4..d573690504bba 100644 --- a/docs/generated/devkit/TaskGraphExecutor.md +++ b/docs/generated/devkit/TaskGraphExecutor.md @@ -2,8 +2,6 @@ Ƭ **TaskGraphExecutor**\<`T`\>: (`taskGraph`: [`TaskGraph`](../../devkit/documents/TaskGraph), `options`: `Record`\<`string`, `T`\>, `overrides`: `T`, `context`: [`ExecutorContext`](../../devkit/documents/ExecutorContext)) => `Promise`\<`BatchExecutorResult` \| `AsyncIterableIterator`\<`BatchExecutorTaskResult`\>\> -Implementation of a target of a project that handles multiple projects to be batched - #### Type parameters | Name | Type | @@ -14,6 +12,8 @@ Implementation of a target of a project that handles multiple projects to be bat ▸ (`taskGraph`, `options`, `overrides`, `context`): `Promise`\<`BatchExecutorResult` \| `AsyncIterableIterator`\<`BatchExecutorTaskResult`\>\> +Implementation of a target of a project that handles multiple projects to be batched + ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/defaultTasksRunner.md b/docs/generated/devkit/defaultTasksRunner.md index c28df12f4be1b..f881631ab327f 100644 --- a/docs/generated/devkit/defaultTasksRunner.md +++ b/docs/generated/devkit/defaultTasksRunner.md @@ -2,6 +2,9 @@ ▸ **defaultTasksRunner**(`tasks`, `options`, `context?`): `any` +`any | Promise<{ [id: string]: TaskStatus }>` +will change to Promise<{ [id: string]: TaskStatus }> after Nx 15 is released. + #### Parameters | Name | Type | From 56453c17133ca48f695b92185a4876ea6ab134d6 Mon Sep 17 00:00:00 2001 From: Arek Kubaczkowski Date: Fri, 22 Mar 2024 07:56:46 +0100 Subject: [PATCH 3/3] fix(react-native): revert doc files --- docs/generated/devkit/CreateDependencies.md | 6 +++--- docs/generated/devkit/CreateNodesFunction.md | 6 +++--- docs/generated/devkit/Executor.md | 4 ++-- docs/generated/devkit/Generator.md | 4 ++-- docs/generated/devkit/GeneratorCallback.md | 4 ++-- docs/generated/devkit/ProjectTargetConfigurator.md | 8 ++++---- docs/generated/devkit/TaskGraphExecutor.md | 4 ++-- docs/generated/devkit/defaultTasksRunner.md | 3 --- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/docs/generated/devkit/CreateDependencies.md b/docs/generated/devkit/CreateDependencies.md index 091dfb6da31ae..0800b0dbc2c3f 100644 --- a/docs/generated/devkit/CreateDependencies.md +++ b/docs/generated/devkit/CreateDependencies.md @@ -2,6 +2,9 @@ Ƭ **CreateDependencies**\<`T`\>: (`options`: `T` \| `undefined`, `context`: [`CreateDependenciesContext`](../../devkit/documents/CreateDependenciesContext)) => [`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[] \| `Promise`\<[`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[]\> +A function which parses files in the workspace to create dependencies in the [ProjectGraph](../../devkit/documents/ProjectGraph) +Use [validateDependency](../../devkit/documents/validateDependency) to validate dependencies + #### Type parameters | Name | Type | @@ -12,9 +15,6 @@ ▸ (`options`, `context`): [`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[] \| `Promise`\<[`RawProjectGraphDependency`](../../devkit/documents/RawProjectGraphDependency)[]\> -A function which parses files in the workspace to create dependencies in the [ProjectGraph](../../devkit/documents/ProjectGraph) -Use [validateDependency](../../devkit/documents/validateDependency) to validate dependencies - ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/CreateNodesFunction.md b/docs/generated/devkit/CreateNodesFunction.md index 274fe008ba434..5ebf292988068 100644 --- a/docs/generated/devkit/CreateNodesFunction.md +++ b/docs/generated/devkit/CreateNodesFunction.md @@ -2,6 +2,9 @@ Ƭ **CreateNodesFunction**\<`T`\>: (`projectConfigurationFile`: `string`, `options`: `T` \| `undefined`, `context`: [`CreateNodesContext`](../../devkit/documents/CreateNodesContext)) => [`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) + #### Type parameters | Name | Type | @@ -12,9 +15,6 @@ ▸ (`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) - ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/Executor.md b/docs/generated/devkit/Executor.md index 8340dbf18f4ae..3e44f1f533bdb 100644 --- a/docs/generated/devkit/Executor.md +++ b/docs/generated/devkit/Executor.md @@ -2,6 +2,8 @@ Ƭ **Executor**\<`T`\>: (`options`: `T`, `context`: [`ExecutorContext`](../../devkit/documents/ExecutorContext)) => `Promise`\<\{ `success`: `boolean` }\> \| `AsyncIterableIterator`\<\{ `success`: `boolean` }\> +Implementation of a target of a project + #### Type parameters | Name | Type | @@ -12,8 +14,6 @@ ▸ (`options`, `context`): `Promise`\<\{ `success`: `boolean` }\> \| `AsyncIterableIterator`\<\{ `success`: `boolean` }\> -Implementation of a target of a project - ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/Generator.md b/docs/generated/devkit/Generator.md index 8ec10e6fa6da6..32d0ac57b4991 100644 --- a/docs/generated/devkit/Generator.md +++ b/docs/generated/devkit/Generator.md @@ -2,6 +2,8 @@ Ƭ **Generator**\<`T`\>: (`tree`: `any`, `schema`: `T`) => `void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback) \| `Promise`\<`void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback)\> +A function that schedules updates to the filesystem to be done atomically + #### Type parameters | Name | Type | @@ -12,8 +14,6 @@ ▸ (`tree`, `schema`): `void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback) \| `Promise`\<`void` \| [`GeneratorCallback`](../../devkit/documents/GeneratorCallback)\> -A function that schedules updates to the filesystem to be done atomically - ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/GeneratorCallback.md b/docs/generated/devkit/GeneratorCallback.md index baa591f2a6619..da7b25c41d3e3 100644 --- a/docs/generated/devkit/GeneratorCallback.md +++ b/docs/generated/devkit/GeneratorCallback.md @@ -2,12 +2,12 @@ Ƭ **GeneratorCallback**: () => `void` \| `Promise`\<`void`\> +A callback function that is executed after changes are made to the file system + #### Type declaration ▸ (): `void` \| `Promise`\<`void`\> -A callback function that is executed after changes are made to the file system - ##### Returns `void` \| `Promise`\<`void`\> diff --git a/docs/generated/devkit/ProjectTargetConfigurator.md b/docs/generated/devkit/ProjectTargetConfigurator.md index 434422163b379..b4bf537e7af29 100644 --- a/docs/generated/devkit/ProjectTargetConfigurator.md +++ b/docs/generated/devkit/ProjectTargetConfigurator.md @@ -2,6 +2,10 @@ Ƭ **ProjectTargetConfigurator**: (`file`: `string`) => `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> +**`Deprecated`** + +Add targets to the projects in a [CreateNodes](../../devkit/documents/CreateNodes) function instead. This will be removed in Nx 19 + #### Type declaration ▸ (`file`): `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> @@ -15,7 +19,3 @@ ##### Returns `Record`\<`string`, [`TargetConfiguration`](../../devkit/documents/TargetConfiguration)\> - -**`Deprecated`** - -Add targets to the projects in a [CreateNodes](../../devkit/documents/CreateNodes) function instead. This will be removed in Nx 19 diff --git a/docs/generated/devkit/TaskGraphExecutor.md b/docs/generated/devkit/TaskGraphExecutor.md index d573690504bba..30ddccaef84d4 100644 --- a/docs/generated/devkit/TaskGraphExecutor.md +++ b/docs/generated/devkit/TaskGraphExecutor.md @@ -2,6 +2,8 @@ Ƭ **TaskGraphExecutor**\<`T`\>: (`taskGraph`: [`TaskGraph`](../../devkit/documents/TaskGraph), `options`: `Record`\<`string`, `T`\>, `overrides`: `T`, `context`: [`ExecutorContext`](../../devkit/documents/ExecutorContext)) => `Promise`\<`BatchExecutorResult` \| `AsyncIterableIterator`\<`BatchExecutorTaskResult`\>\> +Implementation of a target of a project that handles multiple projects to be batched + #### Type parameters | Name | Type | @@ -12,8 +14,6 @@ ▸ (`taskGraph`, `options`, `overrides`, `context`): `Promise`\<`BatchExecutorResult` \| `AsyncIterableIterator`\<`BatchExecutorTaskResult`\>\> -Implementation of a target of a project that handles multiple projects to be batched - ##### Parameters | Name | Type | diff --git a/docs/generated/devkit/defaultTasksRunner.md b/docs/generated/devkit/defaultTasksRunner.md index f881631ab327f..c28df12f4be1b 100644 --- a/docs/generated/devkit/defaultTasksRunner.md +++ b/docs/generated/devkit/defaultTasksRunner.md @@ -2,9 +2,6 @@ ▸ **defaultTasksRunner**(`tasks`, `options`, `context?`): `any` -`any | Promise<{ [id: string]: TaskStatus }>` -will change to Promise<{ [id: string]: TaskStatus }> after Nx 15 is released. - #### Parameters | Name | Type |