Skip to content

Commit

Permalink
Merge branch 'master' into feature/nxc-75-jest-tests-fail-when-daemon…
Browse files Browse the repository at this point in the history
…-is-off-and-swc-nodecore-is-used
  • Loading branch information
FrozenPandaz authored Sep 22, 2023
2 parents df0ae47 + 903c4fe commit 1868b1a
Show file tree
Hide file tree
Showing 79 changed files with 835 additions and 3,880 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jest.debug.config.js
# Issues scraper creates these files, stored by github's cache
/scripts/issues-scraper/cached

# Lerna creates this
# We don't commit a CHANELGELOG.md file to the repo, we only create Github releases
CHANGELOG.md

# Next.js
Expand Down
1 change: 1 addition & 0 deletions .nx/workflows/agents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
SELECTED_PM: 'pnpm'
NX_E2E_RUN_E2E: 'true'
NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
steps:
- name: Git Clone
script: |
Expand Down
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@ Yarn Berry operates slightly differently than Yarn Classic. In order to publish
- localhost
```

- Run `pnpm nx-release --local` in Terminal 2 to publish next minor version. If this version already exists, you can
bump the minor version in `lerna.json` to toggle the next minor. The output will report the version of published
packages.
- Run `pnpm nx-release minor --local` in Terminal 2 to publish next minor version. The output will report the version of published packages.
- Go to your target folder (e.g. `cd ./tmp`) in Terminal 2
- Run `yarn dlx [email protected]` in Terminal 2 (replace `123.4.5` with the version that got published).

Expand Down
9 changes: 4 additions & 5 deletions docs/generated/devkit/NxJsonConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ Where new apps + libs should be placed

#### Type declaration

| Name | Type |
| :-------------------------- | :----------------------------- |
| `appsDir?` | `string` |
| `libsDir?` | `string` |
| `projectNameAndRootFormat?` | `"as-provided"` \| `"derived"` |
| Name | Type |
| :--------- | :------- |
| `appsDir?` | `string` |
| `libsDir?` | `string` |
9 changes: 4 additions & 5 deletions docs/generated/devkit/Workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,10 @@ Where new apps + libs should be placed

#### Type declaration

| Name | Type |
| :-------------------------- | :----------------------------- |
| `appsDir?` | `string` |
| `libsDir?` | `string` |
| `projectNameAndRootFormat?` | `"as-provided"` \| `"derived"` |
| Name | Type |
| :--------- | :------- |
| `appsDir?` | `string` |
| `libsDir?` | `string` |

#### Inherited from

Expand Down
202 changes: 0 additions & 202 deletions docs/generated/manifests/menus.json
Original file line number Diff line number Diff line change
Expand Up @@ -350,184 +350,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "React Monorepo Tutorial",
"path": "/react-tutorial",
"id": "react-tutorial",
"isExternal": false,
"children": [
{
"name": "1 - Code Generation",
"path": "/react-tutorial/1-code-generation",
"id": "1-code-generation",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "2 - Project Graph",
"path": "/react-tutorial/2-project-graph",
"id": "2-project-graph",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "3 - Task Running",
"path": "/react-tutorial/3-task-running",
"id": "3-task-running",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "4 - Workspace Optimization",
"path": "/react-tutorial/4-workspace-optimization",
"id": "4-workspace-optimization",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "5 - Summary",
"path": "/react-tutorial/5-summary",
"id": "5-summary",
"isExternal": false,
"children": [],
"disableCollapsible": false
}
],
"disableCollapsible": false
},
{
"name": "1 - Code Generation",
"path": "/react-tutorial/1-code-generation",
"id": "1-code-generation",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "2 - Project Graph",
"path": "/react-tutorial/2-project-graph",
"id": "2-project-graph",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "3 - Task Running",
"path": "/react-tutorial/3-task-running",
"id": "3-task-running",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "4 - Workspace Optimization",
"path": "/react-tutorial/4-workspace-optimization",
"id": "4-workspace-optimization",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "5 - Summary",
"path": "/react-tutorial/5-summary",
"id": "5-summary",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "React Standalone Tutorial",
"path": "/react-standalone-tutorial",
"id": "react-standalone-tutorial",
"isExternal": false,
"children": [
{
"name": "1 - Code Generation",
"path": "/react-standalone-tutorial/1-code-generation",
"id": "1-code-generation",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "2 - Project Graph",
"path": "/react-standalone-tutorial/2-project-graph",
"id": "2-project-graph",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "3 - Task Running",
"path": "/react-standalone-tutorial/3-task-running",
"id": "3-task-running",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "4 - Task Pipelines",
"path": "/react-standalone-tutorial/4-task-pipelines",
"id": "4-task-pipelines",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "5 - Summary",
"path": "/react-standalone-tutorial/5-summary",
"id": "5-summary",
"isExternal": false,
"children": [],
"disableCollapsible": false
}
],
"disableCollapsible": false
},
{
"name": "1 - Code Generation",
"path": "/react-standalone-tutorial/1-code-generation",
"id": "1-code-generation",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "2 - Project Graph",
"path": "/react-standalone-tutorial/2-project-graph",
"id": "2-project-graph",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "3 - Task Running",
"path": "/react-standalone-tutorial/3-task-running",
"id": "3-task-running",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "4 - Task Pipelines",
"path": "/react-standalone-tutorial/4-task-pipelines",
"id": "4-task-pipelines",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "5 - Summary",
"path": "/react-standalone-tutorial/5-summary",
"id": "5-summary",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Angular Standalone Tutorial",
"path": "/angular-standalone-tutorial",
Expand Down Expand Up @@ -4328,14 +4150,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Powering Up React Development With Nx",
"path": "/showcase/example-repos/react-nx",
"id": "react-nx",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Using Apollo GraphQL",
"path": "/showcase/example-repos/apollo-react",
Expand Down Expand Up @@ -4525,14 +4339,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Powering Up React Development With Nx",
"path": "/showcase/example-repos/react-nx",
"id": "react-nx",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Using Apollo GraphQL",
"path": "/showcase/example-repos/apollo-react",
Expand Down Expand Up @@ -4680,14 +4486,6 @@
"children": [],
"disableCollapsible": false
},
{
"name": "Powering Up React Development With Nx",
"path": "/showcase/example-repos/react-nx",
"id": "react-nx",
"isExternal": false,
"children": [],
"disableCollapsible": false
},
{
"name": "Using Apollo GraphQL",
"path": "/showcase/example-repos/apollo-react",
Expand Down
Loading

0 comments on commit 1868b1a

Please sign in to comment.