Skip to content

Commit

Permalink
Merge branch 'master' into deprecations-workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
AgentEnder authored Oct 13, 2023
2 parents 63f2155 + 2fb735d commit 40a9633
Show file tree
Hide file tree
Showing 344 changed files with 931 additions and 2,561 deletions.
6 changes: 6 additions & 0 deletions docs/generated/cli/affected.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ Type: `string`

Base of the current branch (usually main)

### batch

Type: `boolean`

Default: `false`

### configuration

Type: `string`
Expand Down
6 changes: 6 additions & 0 deletions docs/generated/cli/run-many.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ Default: `true`

[deprecated] `run-many` runs all targets on all projects in the workspace if no projects are provided. This option is no longer required.

### batch

Type: `boolean`

Default: `false`

### configuration

Type: `string`
Expand Down
18 changes: 0 additions & 18 deletions docs/generated/cli/workspace-lint.md

This file was deleted.

7 changes: 7 additions & 0 deletions docs/generated/devkit/DefaultTasksRunnerOptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Properties

- [batch](../../devkit/documents/DefaultTasksRunnerOptions#batch): boolean
- [cacheDirectory](../../devkit/documents/DefaultTasksRunnerOptions#cachedirectory): string
- [cacheableOperations](../../devkit/documents/DefaultTasksRunnerOptions#cacheableoperations): string[]
- [cacheableTargets](../../devkit/documents/DefaultTasksRunnerOptions#cacheabletargets): string[]
Expand All @@ -16,6 +17,12 @@

## Properties

### batch

`Optional` **batch**: `boolean`

---

### cacheDirectory

`Optional` **cacheDirectory**: `string`
Expand Down
1 change: 0 additions & 1 deletion docs/generated/devkit/ngcli_adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
### Functions

- [mockSchematicsForTesting](../../devkit/documents/ngcli_adapter/mockSchematicsForTesting)
- [overrideCollectionResolutionForTesting](../../devkit/documents/ngcli_adapter/overrideCollectionResolutionForTesting)
- [wrapAngularDevkitSchematic](../../devkit/documents/ngcli_adapter/wrapAngularDevkitSchematic)

This file was deleted.

8 changes: 0 additions & 8 deletions docs/generated/manifests/menus.json
Original file line number Diff line number Diff line change
Expand Up @@ -7550,14 +7550,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "workspace-lint",
"path": "/nx-api/nx/documents/workspace-lint",
"id": "workspace-lint",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "connect-to-nx-cloud",
"path": "/nx-api/nx/documents/connect-to-nx-cloud",
Expand Down
11 changes: 0 additions & 11 deletions docs/generated/manifests/nx-api.json
Original file line number Diff line number Diff line change
Expand Up @@ -1675,17 +1675,6 @@
"tags": [],
"originalFilePath": "generated/cli/list"
},
"/nx-api/nx/documents/workspace-lint": {
"id": "workspace-lint",
"name": "workspace-lint",
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
"file": "generated/packages/nx/documents/workspace-lint",
"itemList": [],
"isExternal": false,
"path": "/nx-api/nx/documents/workspace-lint",
"tags": ["enforce-module-boundaries"],
"originalFilePath": "generated/cli/workspace-lint"
},
"/nx-api/nx/documents/connect-to-nx-cloud": {
"id": "connect-to-nx-cloud",
"name": "connect-to-nx-cloud",
Expand Down
7 changes: 0 additions & 7 deletions docs/generated/manifests/tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,6 @@
"id": "format-write",
"name": "format:write",
"path": "/nx-api/nx/documents/format-write"
},
{
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
"file": "generated/packages/generated/packages/nx/documents/workspace-lint",
"id": "workspace-lint",
"name": "workspace-lint",
"path": "/nx-api/nx/documents/workspace-lint"
}
],
"integrate-with-editors": [
Expand Down
11 changes: 0 additions & 11 deletions docs/generated/packages-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -1656,17 +1656,6 @@
"tags": [],
"originalFilePath": "generated/cli/list"
},
{
"id": "workspace-lint",
"name": "workspace-lint",
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
"file": "generated/packages/nx/documents/workspace-lint",
"itemList": [],
"isExternal": false,
"path": "nx/documents/workspace-lint",
"tags": ["enforce-module-boundaries"],
"originalFilePath": "generated/cli/workspace-lint"
},
{
"id": "connect-to-nx-cloud",
"name": "connect-to-nx-cloud",
Expand Down
24 changes: 15 additions & 9 deletions docs/generated/packages/angular/generators/directive.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"cli": "nx",
"title": "Nx Angular Directive Options Schema",
"type": "object",
"description": "Creates a new, generic directive definition in the given project.",
"description": "Creates a new Angular directive.",
"additionalProperties": false,
"properties": {
"name": {
Expand All @@ -16,18 +16,23 @@
"$default": { "$source": "argv", "index": 0 },
"x-prompt": "What name would you like to use for the directive?"
},
"path": {
"directory": {
"type": "string",
"format": "path",
"$default": { "$source": "workingDirectory" },
"description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
"visible": false
"description": "The directory at which to create the directive file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
"aliases": ["dir", "path"],
"x-priority": "important"
},
"nameAndDirectoryFormat": {
"description": "Whether to generate the directive in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
"type": "string",
"enum": ["as-provided", "derived"]
},
"project": {
"type": "string",
"description": "The name of the project.",
"$default": { "$source": "projectName" },
"x-dropdown": "projects"
"x-dropdown": "projects",
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
},
"prefix": {
"type": "string",
Expand Down Expand Up @@ -61,7 +66,8 @@
"flat": {
"type": "boolean",
"description": "When true (the default), creates the new files at the top level of the current project.",
"default": true
"default": true,
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
},
"module": {
"type": "string",
Expand All @@ -79,7 +85,7 @@
"description": "Skip formatting of files."
}
},
"required": ["name", "project"],
"required": ["name"],
"presets": []
},
"aliases": ["d"],
Expand Down
24 changes: 15 additions & 9 deletions docs/generated/packages/angular/generators/pipe.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,37 @@
"type": "object",
"cli": "nx",
"additionalProperties": false,
"description": "Creates a new, generic pipe definition in the given project.",
"description": "Creates an Angular pipe.",
"properties": {
"name": {
"type": "string",
"description": "The name of the pipe.",
"$default": { "$source": "argv", "index": 0 },
"x-prompt": "What name would you like to use for the pipe?"
},
"path": {
"directory": {
"type": "string",
"format": "path",
"$default": { "$source": "workingDirectory" },
"description": "The path at which to create the pipe, relative to the workspace root.",
"visible": false
"description": "The directory at which to create the pipe file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
"aliases": ["dir", "path"],
"x-priority": "important"
},
"nameAndDirectoryFormat": {
"description": "Whether to generate the pipe in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
"type": "string",
"enum": ["as-provided", "derived"]
},
"project": {
"type": "string",
"description": "The name of the project.",
"$default": { "$source": "projectName" },
"x-dropdown": "projects"
"x-dropdown": "projects",
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
},
"flat": {
"type": "boolean",
"default": true,
"description": "When true (the default) creates files at the top level of the project."
"description": "When true (the default) creates files at the top level of the project.",
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
},
"skipTests": {
"type": "boolean",
Expand Down Expand Up @@ -65,7 +71,7 @@
"description": "Skip formatting of files."
}
},
"required": ["name", "project"],
"required": ["name"],
"presets": []
},
"description": "Generate an Angular Pipe",
Expand Down
37 changes: 22 additions & 15 deletions docs/generated/packages/angular/generators/scam-directive.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,38 @@
"type": "object",
"examples": [
{
"command": "nx g @nx/angular:scam-directive --project=my-lib --flat=false my-sample",
"command": "nx g @nx/angular:scam-directive my-sample --directory=my-lib/src/lib/my-sample",
"description": "Generate a `MySampleDirective` directive in a `my-sample` folder in the `my-lib` library"
}
],
"description": "Creates a new, generic Angular directive definition in the given or default project.",
"additionalProperties": false,
"properties": {
"path": {
"type": "string",
"format": "path",
"description": "The path at which to create the directive file, relative to the current workspace. Default is a folder with the same name as the directive in the project root.",
"visible": false
},
"project": {
"type": "string",
"description": "The name of the project.",
"$default": { "$source": "projectName" },
"x-dropdown": "projects"
},
"name": {
"type": "string",
"description": "The name of the directive.",
"$default": { "$source": "argv", "index": 0 },
"x-prompt": "What name would you like to use for the directive?",
"x-priority": "important"
},
"directory": {
"type": "string",
"description": "The directory at which to create the SCAM Directive files. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
"aliases": ["dir", "path"],
"x-priority": "important"
},
"nameAndDirectoryFormat": {
"description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
"type": "string",
"enum": ["as-provided", "derived"]
},
"project": {
"type": "string",
"description": "The name of the project.",
"$default": { "$source": "projectName" },
"x-dropdown": "projects",
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
},
"skipTests": {
"type": "boolean",
"description": "Do not create `spec.ts` test files for the new directive.",
Expand All @@ -49,7 +55,8 @@
"flat": {
"type": "boolean",
"description": "Create the new files at the top level of the current project.",
"default": true
"default": true,
"x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
},
"selector": {
"type": "string",
Expand All @@ -72,7 +79,7 @@
"x-priority": "important"
}
},
"required": ["name", "project"],
"required": ["name"],
"presets": []
},
"description": "Generate a directive with an accompanying Single Component Angular Module (SCAM).",
Expand Down
Loading

0 comments on commit 40a9633

Please sign in to comment.