Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
benmccann authored Aug 8, 2023
2 parents 901d8eb + d7d3ebc commit 8b62904
Show file tree
Hide file tree
Showing 67 changed files with 2,073 additions and 2,877 deletions.
30 changes: 0 additions & 30 deletions community/approved-plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,11 @@
"description": "Nx plugin to generate and build Style Dictionary projects inside your Nx workspace",
"url": "https://github.com/nxkit/nxkit"
},
{
"name": "nx-plugin-esbuild",
"description": "Nx plugin integrations with ESBuild.",
"url": "https://nx-plugins.netlify.app/"
},
{
"name": "nx-plugin-vite",
"description": "Nx plugin integrations with Vite.",
"url": "https://nx-plugins.netlify.app/"
},
{
"name": "nx-plugin-snowpack",
"description": "Nx plugin integrations with Snowpack.",
"url": "https://nx-plugins.netlify.app/"
},
{
"name": "nx-plugin-prisma",
"description": "Nx plugin integrations with Snowpack.",
"url": "https://nx-plugins.netlify.app/"
},
{
"name": "@ago-dev/nx-aws-cdk-v2",
"description": "An nx plugin for the aws-cdk v2.",
Expand Down Expand Up @@ -159,11 +144,6 @@
"description": "Nx plugin to use SolidJS within nx workspaces",
"url": "https://github.com/nxext/nx-extensions/tree/master/packages/solid"
},
{
"name": "@joelcode/gcp-function",
"description": "Nx plugin to generate, test, lint, build, serve, & deploy Google Cloud Function",
"url": "https://github.com/JoelCode/gcp-function"
},
{
"name": "@nx-go/nx-go",
"description": "Nx plugin to use Go in a Nx workspace",
Expand Down Expand Up @@ -214,11 +194,6 @@
"description": "Publish your libraries to NPM with just one command.",
"url": "https://github.com/bikecoders/ngx-deploy-npm"
},
{
"name": "@trafilea/nx-shopify",
"description": "Nx plugin for developing performance-first Shopify themes",
"url": "https://github.com/trafilea/nx-shopify"
},
{
"name": "@nx-dotnet/core",
"description": "Nx plugin for developing and housing .NET projects within an Nx workspace.",
Expand Down Expand Up @@ -299,11 +274,6 @@
"description": "Nx Plugin adding first class support for NativeScript in your Nx workspace",
"url": "https://github.com/nativescript/nx"
},
{
"name": "@nx-clean/plugin-core",
"description": "Nx Plugin to generate projects following Clean Architecture practices",
"url": "https://github.com/guiseek/nx-clean/tree/main/libs/plugin/core"
},
{
"name": "@jnxplus/nx-boot-gradle",
"description": "Nx plugin to add Spring Boot and Gradle multi-project builds support to Nx workspace",
Expand Down
8 changes: 8 additions & 0 deletions docs/generated/cli/create-nx-workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ Type: `boolean`

Generate a Dockerfile for the Node API

### e2eTestRunner

Type: `string`

Choices: [cypress, playwright, none]

Test runner to use for end to end (E2E) tests.

### framework

Type: `string`
Expand Down
24 changes: 24 additions & 0 deletions docs/generated/manifests/menus.json
Original file line number Diff line number Diff line change
Expand Up @@ -2148,6 +2148,14 @@
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Using Yarn PnP",
"path": "/recipes/tips-n-tricks/yarn-pnp",
"id": "yarn-pnp",
"isExternal": false,
"children": [],
"disableCollapsible": false
}
],
"disableCollapsible": false
Expand Down Expand Up @@ -3188,6 +3196,14 @@
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Using Yarn PnP",
"path": "/recipes/tips-n-tricks/yarn-pnp",
"id": "yarn-pnp",
"isExternal": false,
"children": [],
"disableCollapsible": false
}
],
"disableCollapsible": false
Expand Down Expand Up @@ -3312,6 +3328,14 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Using Yarn PnP",
"path": "/recipes/tips-n-tricks/yarn-pnp",
"id": "yarn-pnp",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Troubleshooting",
"path": "/recipes/troubleshooting",
Expand Down
30 changes: 30 additions & 0 deletions docs/generated/manifests/nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2678,6 +2678,16 @@
"isExternal": false,
"path": "/recipes/tips-n-tricks/run-commands-executor",
"tags": ["use-task-executors"]
},
{
"id": "yarn-pnp",
"name": "Using Yarn PnP",
"description": "",
"file": "shared/recipes/yarn-pnp",
"itemList": [],
"isExternal": false,
"path": "/recipes/tips-n-tricks/yarn-pnp",
"tags": ["yarn", "Plug and Play"]
}
],
"isExternal": false,
Expand Down Expand Up @@ -3976,6 +3986,16 @@
"isExternal": false,
"path": "/recipes/tips-n-tricks/run-commands-executor",
"tags": ["use-task-executors"]
},
{
"id": "yarn-pnp",
"name": "Using Yarn PnP",
"description": "",
"file": "shared/recipes/yarn-pnp",
"itemList": [],
"isExternal": false,
"path": "/recipes/tips-n-tricks/yarn-pnp",
"tags": ["yarn", "Plug and Play"]
}
],
"isExternal": false,
Expand Down Expand Up @@ -4132,6 +4152,16 @@
"path": "/recipes/tips-n-tricks/run-commands-executor",
"tags": ["use-task-executors"]
},
"/recipes/tips-n-tricks/yarn-pnp": {
"id": "yarn-pnp",
"name": "Using Yarn PnP",
"description": "",
"file": "shared/recipes/yarn-pnp",
"itemList": [],
"isExternal": false,
"path": "/recipes/tips-n-tricks/yarn-pnp",
"tags": ["yarn", "Plug and Play"]
},
"/recipes/troubleshooting": {
"id": "troubleshooting",
"name": "Troubleshooting",
Expand Down
18 changes: 18 additions & 0 deletions docs/generated/manifests/tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,24 @@
"path": "/packages/nx/documents/watch"
}
],
"yarn": [
{
"description": "",
"file": "shared/recipes/yarn-pnp",
"id": "yarn-pnp",
"name": "Using Yarn PnP",
"path": "/recipes/tips-n-tricks/yarn-pnp"
}
],
"Plug and Play": [
{
"description": "",
"file": "shared/recipes/yarn-pnp",
"id": "yarn-pnp",
"name": "Using Yarn PnP",
"path": "/recipes/tips-n-tricks/yarn-pnp"
}
],
"deno": [
{
"description": "",
Expand Down
8 changes: 8 additions & 0 deletions docs/generated/packages/nx/documents/create-nx-workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ Type: `boolean`

Generate a Dockerfile for the Node API

### e2eTestRunner

Type: `string`

Choices: [cypress, playwright, none]

Test runner to use for end to end (E2E) tests.

### framework

Type: `string`
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/workspace/generators/new.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"e2eTestRunner": {
"description": "The tool to use for running e2e tests.",
"type": "string",
"enum": ["cypress", "jest", "detox", "none"]
"enum": ["cypress", "playwright", "jest", "detox", "none"]
}
},
"additionalProperties": true,
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/workspace/generators/preset.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"e2eTestRunner": {
"description": "The tool to use for running e2e tests.",
"type": "string",
"enum": ["cypress", "jest", "detox", "none"]
"enum": ["cypress", "playwright", "jest", "detox", "none"]
}
},
"required": ["preset", "name"],
Expand Down
6 changes: 6 additions & 0 deletions docs/map.json
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,12 @@
"id": "run-commands-executor",
"tags": ["use-task-executors"],
"file": "shared/running-custom-commands"
},
{
"name": "Using Yarn PnP",
"id": "yarn-pnp",
"tags": ["yarn", "Plug and Play"],
"file": "shared/recipes/yarn-pnp"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion docs/shared/core-features/enforce-module-boundaries.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ With these constraints in place, `scope:client` projects can only depend on proj

Projects without any tags cannot depend on any other projects. If you try to violate the constraints, you will get an error when linting:

```shell
```plaintext
A project tagged with "scope:admin" can only depend on projects
tagged with "scoped:shared" or "scope:admin".
```
Expand Down
2 changes: 1 addition & 1 deletion docs/shared/core-tutorial/02-create-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func main() {

`packages/cli/src/cow.txt`:

```shell
```plaintext
_____
< moo >
-----
Expand Down
2 changes: 1 addition & 1 deletion docs/shared/core-tutorial/03-share-assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Then move `cow.txt` out of the `cli` project to:

`packages/ascii/assets/cow.txt`:

```shell
```plaintext
_____
< moo >
-----
Expand Down
2 changes: 1 addition & 1 deletion docs/shared/core-tutorial/04-build-affected-projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ git checkout .

Update `packages/ascii/assets/cow.txt`:

```shell
```plaintext
_____
< Hi! >
-----
Expand Down
7 changes: 3 additions & 4 deletions docs/shared/core-tutorial/05-auto-detect-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,10 @@ console.log(

Now if you run `nx serve cow`, you'll see this:

```shell
$ node index.js
______________________________________________________
```shell {% command="node index.js" %}
______________________________________________________
< Welcome to the Restaurant at the End of the Universe >
------------------------------------------------------
------------------------------------------------------
\ ^__^
\ (oo)\_______
(__)\ )\/\
Expand Down
5 changes: 5 additions & 0 deletions docs/shared/getting-started/why-nx.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Why Nx?

{% youtube
src="https://www.youtube.com/embed/-_4WMl-Fn0w"
title="What is Nx?"
width="100%" /%}

We created Nx because developers struggle to configure, maintain and especially integrate various tools and frameworks. Setting up a system that works well for a handful of developers and at the same time, easily scales up to an entire organization is hard. This includes setting up low-level build tooling, configuring fast CI, and keeping your codebase healthy, up-to-date, and maintainable.

We wanted to provide a solution that is easy to adopt and scale.
Expand Down
2 changes: 1 addition & 1 deletion docs/shared/monorepo-nx-enterprise.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Since Nx allows us to group apps and libs in directories, those directories can
why the structure of an Nx workspace often reflects the structure of an organization. GitHub users can use
the `CODEOWNERS` file for that.

```shell
```plaintext
/libs/happynrwlapp julie-happynrwlapp-lead
/apps/happynrwlapp julie-happynrwlapp-lead
/libs/shared/ui hank-the-ui-guy
Expand Down
Loading

0 comments on commit 8b62904

Please sign in to comment.