Skip to content

Commit

Permalink
Merge branch 'master' into fix/21649-fix-rev-parse
Browse files Browse the repository at this point in the history
  • Loading branch information
fahslaj authored Feb 12, 2024
2 parents 711ec5d + c8866ac commit 7ebe1c1
Show file tree
Hide file tree
Showing 199 changed files with 2,381 additions and 1,324 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions community/approved-plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,11 @@
"description": "Nx plugin to support Firebase Apps and Cloud Functions in Nx workspaces",
"url": "https://github.com/simondotm/nx-firebase"
},
{
"name": "@dman926/nx-python-pdm",
"description": "Use Python in NX workspaces with PDM",
"url": "https://github.com/dman926/nx-python-pdm"
},
{
"name": "@gnuechtel/nx-cucumber",
"description": "Plugin to use Cucumber within Nx workspaces",
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/manifests/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
},
{
"id": "split-e2e-tasks",
"name": "Automatically Split E2E Tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"description": "",
"mediaImage": "",
"file": "nx-cloud/features/split-e2e-tasks",
Expand Down Expand Up @@ -258,7 +258,7 @@
},
"/ci/features/split-e2e-tasks": {
"id": "split-e2e-tasks",
"name": "Automatically Split E2E Tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"description": "",
"mediaImage": "",
"file": "nx-cloud/features/split-e2e-tasks",
Expand Down
28 changes: 2 additions & 26 deletions docs/generated/manifests/menus.json
Original file line number Diff line number Diff line change
Expand Up @@ -798,14 +798,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Illustrated Distributed Task Execution",
"path": "/concepts/more-concepts/illustrated-dte",
"id": "illustrated-dte",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Nx and Turborepo",
"path": "/concepts/more-concepts/turbo-and-nx",
Expand Down Expand Up @@ -1083,14 +1075,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Illustrated Distributed Task Execution",
"path": "/concepts/more-concepts/illustrated-dte",
"id": "illustrated-dte",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Nx and Turborepo",
"path": "/concepts/more-concepts/turbo-and-nx",
Expand Down Expand Up @@ -1222,14 +1206,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Illustrated Distributed Task Execution",
"path": "/concepts/more-concepts/illustrated-dte",
"id": "illustrated-dte",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Nx and Turborepo",
"path": "/concepts/more-concepts/turbo-and-nx",
Expand Down Expand Up @@ -5779,7 +5755,7 @@
"disableCollapsible": false
},
{
"name": "Automatically Split E2E Tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"path": "/ci/features/split-e2e-tasks",
"id": "split-e2e-tasks",
"isExternal": false,
Expand Down Expand Up @@ -5838,7 +5814,7 @@
"disableCollapsible": false
},
{
"name": "Automatically Split E2E Tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"path": "/ci/features/split-e2e-tasks",
"id": "split-e2e-tasks",
"isExternal": false,
Expand Down
33 changes: 0 additions & 33 deletions docs/generated/manifests/nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -1088,17 +1088,6 @@
"path": "/concepts/more-concepts/incremental-builds",
"tags": []
},
{
"id": "illustrated-dte",
"name": "Illustrated Distributed Task Execution",
"description": "",
"mediaImage": "",
"file": "shared/concepts/illustrated-dte-guide",
"itemList": [],
"isExternal": false,
"path": "/concepts/more-concepts/illustrated-dte",
"tags": ["distribute-task-execution"]
},
{
"id": "turbo-and-nx",
"name": "Nx and Turborepo",
Expand Down Expand Up @@ -1480,17 +1469,6 @@
"path": "/concepts/more-concepts/incremental-builds",
"tags": []
},
{
"id": "illustrated-dte",
"name": "Illustrated Distributed Task Execution",
"description": "",
"mediaImage": "",
"file": "shared/concepts/illustrated-dte-guide",
"itemList": [],
"isExternal": false,
"path": "/concepts/more-concepts/illustrated-dte",
"tags": ["distribute-task-execution"]
},
{
"id": "turbo-and-nx",
"name": "Nx and Turborepo",
Expand Down Expand Up @@ -1672,17 +1650,6 @@
"path": "/concepts/more-concepts/incremental-builds",
"tags": []
},
"/concepts/more-concepts/illustrated-dte": {
"id": "illustrated-dte",
"name": "Illustrated Distributed Task Execution",
"description": "",
"mediaImage": "",
"file": "shared/concepts/illustrated-dte-guide",
"itemList": [],
"isExternal": false,
"path": "/concepts/more-concepts/illustrated-dte",
"tags": ["distribute-task-execution"]
},
"/concepts/more-concepts/turbo-and-nx": {
"id": "turbo-and-nx",
"name": "Nx and Turborepo",
Expand Down
67 changes: 30 additions & 37 deletions docs/generated/manifests/tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -701,43 +701,6 @@
"path": "/recipes/react/module-federation-with-ssr"
}
],
"distribute-task-execution": [
{
"description": "",
"file": "shared/concepts/illustrated-dte-guide",
"id": "illustrated-dte",
"name": "Illustrated Distributed Task Execution",
"path": "/concepts/more-concepts/illustrated-dte"
},
{
"description": "",
"file": "",
"id": "ci",
"name": "CI Documentation",
"path": "/ci/intro/ci-with-nx"
},
{
"description": "",
"file": "nx-cloud/concepts/parallelization-distribution",
"id": "parallelization-distribution",
"name": "Parallelization and Distribution",
"path": "/ci/concepts/parallelization-distribution"
},
{
"description": "Learn how to set up Nx Cloud for your workspace.",
"file": "",
"id": "set-up",
"name": "Set Up CI",
"path": "/ci/recipes/set-up"
},
{
"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/connect-to-nx-cloud",
"id": "connect-to-nx-cloud",
"name": "connect-to-nx-cloud",
"path": "/nx-api/nx/documents/connect-to-nx-cloud"
}
],
"workspace-watching": [
{
"description": "",
Expand Down Expand Up @@ -1130,6 +1093,36 @@
"path": "/showcase/example-repos/serverless-fastify-planetscale"
}
],
"distribute-task-execution": [
{
"description": "",
"file": "",
"id": "ci",
"name": "CI Documentation",
"path": "/ci/intro/ci-with-nx"
},
{
"description": "",
"file": "nx-cloud/concepts/parallelization-distribution",
"id": "parallelization-distribution",
"name": "Parallelization and Distribution",
"path": "/ci/concepts/parallelization-distribution"
},
{
"description": "Learn how to set up Nx Cloud for your workspace.",
"file": "",
"id": "set-up",
"name": "Set Up CI",
"path": "/ci/recipes/set-up"
},
{
"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/connect-to-nx-cloud",
"id": "connect-to-nx-cloud",
"name": "connect-to-nx-cloud",
"path": "/nx-api/nx/documents/connect-to-nx-cloud"
}
],
"remote-cache": [
{
"description": "Learn how to enable remote caching s.t. you don't just benefit locally from it but also in CI.",
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/angular/documents/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ In any Nx workspace, you can install `@nx/angular` by running the following comm
{% tabs %}
{% tab label="Nx 18+" %}

```shell
```shell {% skipRescope=true %}
nx add @nx/angular
```

Expand Down
5 changes: 5 additions & 0 deletions docs/generated/packages/angular/executors/dev-server.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
"type": "number",
"description": "Enable and define the file watching poll time period in milliseconds."
},
"forceEsbuild": {
"type": "boolean",
"description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system. _Note: this is only supported in Angular versions >= 16.1.0_.",
"default": false
},
"buildLibsFromSource": {
"type": "boolean",
"description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
Expand Down
36 changes: 30 additions & 6 deletions docs/generated/packages/cypress/documents/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ In any Nx workspace, you can install `@nx/cypress` by running the following comm
{% tabs %}
{% tab label="Nx 18+" %}

```shell
```shell {% skipRescope=true %}
nx add @nx/cypress
```

Expand Down Expand Up @@ -75,6 +75,30 @@ The `@nx/cypress/plugin` is configured in the `plugins` array in `nx.json`.

The `@nx/cypress/plugin` will automatically split your e2e tasks by file. You can read more about this feature [here](/ci/features/split-e2e-tasks).

To enable e2e task splitting, make sure there is a `ciWebServerCommand` property set in your `cypress.config.ts` file. It will look something like this:

```ts {% fileName="apps/my-project-e2e/cypress.config.ts" highlightLines=[13] %}
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: {
...nxE2EPreset(__filename, {
cypressDir: 'src',
bundler: 'vite',
webServerCommands: {
default: 'nx run my-project:serve',
production: 'nx run my-project:preview',
},
ciWebServerCommand: 'nx run my-project:serve-static',
}),
baseUrl: 'http://localhost:4200',
},
});
```

Note: The `nxE2EPreset` is a collection of default settings, but is not necessary for task splitting.

{% /tab %}
{% tab label="Nx < 18" %}

Expand All @@ -95,18 +119,18 @@ By default, when creating a new frontend application, Nx will use Cypress to cre
nx g @nx/web:app frontend
```

### Creating a Cypress E2E project for an existing project
### Configure Cypress for an existing project

To generate an E2E project based on an existing project, run the following generator
To configure Cypress for an existing project, run the following generator

```shell
nx g @nx/cypress:configuration your-app-name-e2e --project=your-app-name
nx g @nx/cypress:configuration --project=your-app-name
```

Optionally, you can use the `--baseUrl` option if you don't want cypress plugin to serve `your-app-name`.
Optionally, you can use the `--baseUrl` option if you don't want the Cypress plugin to serve `your-app-name`.

```shell
nx g @nx/cypress:configuration your-app-name-e2e --baseUrl=http://localhost:4200
nx g @nx/cypress:configuration --project=your-app-name --baseUrl=http://localhost:4200
```

Replace `your-app-name` with the app's name as defined in your `tsconfig.base.json` file or the `name` property of your `package.json`.
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/detox/documents/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ In any Nx workspace, you can install `@nx/detox` by running the following comman
{% tabs %}
{% tab label="Nx 18+" %}

```shell
```shell {% skipRescope=true %}
nx add @nx/detox
```

Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/esbuild/documents/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ In any Nx workspace, you can install `@nx/esbuild` by running the following comm
{% tabs %}
{% tab label="Nx 18+" %}

```shell
```shell {% skipRescope=true %}
nx add @nx/esbuild
```

Expand Down
19 changes: 18 additions & 1 deletion docs/generated/packages/eslint-plugin/documents/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,27 @@ Make sure to install the `@nx/eslint-plugin` version that matches the version of

In any Nx workspace, you can install `@nx/eslint-plugin` by running the following commands if the package is not already installed:

```shell
{% tabs %}
{% tab label="Nx 18+" %}

```shell {% skipRescope=true %}
nx add @nx/eslint-plugin
```

This will install the correct version of `@nx/eslint-plugin`.

{% /tab %}
{% tab label="Nx < 18" %}

Install the `@nx/eslint-plugin` package with your package manager.

```shell
npm add -D @nx/eslint-plugin
```

{% /tab %}
{% /tabs %}

## Included plugins

The plugin contains the following rule configurations divided into sub-plugins.
Expand Down
Loading

0 comments on commit 7ebe1c1

Please sign in to comment.