Skip to content

Commit

Permalink
Merge branch 'master' into depends-on-wildcard
Browse files Browse the repository at this point in the history
  • Loading branch information
fxposter committed May 7, 2024
2 parents cfd6c22 + 0e56533 commit 9f8139c
Show file tree
Hide file tree
Showing 1,798 changed files with 56,456 additions and 38,799 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ jobs:
NX_NATIVE_LOGGING: 'false'
NX_E2E_RUN_E2E: 'true'
NX_CI_EXECUTION_ENV: 'linux'
NX_CLOUD_DTE_V2: 'true'
steps:
- checkout
- nx/set-shas:
Expand Down Expand Up @@ -162,7 +163,7 @@ jobs:
pids+=($!)
(pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
pnpm nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
pnpm nx affected --targets=e2e,e2e-ci --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
pids+=($!)
for pid in "${pids[@]}"; do
Expand Down Expand Up @@ -205,7 +206,7 @@ jobs:
- run:
name: Run E2E Tests for macOS
command: |
pnpm nx affected -t e2e-macos --parallel=1 --base=$NX_BASE --head=$NX_HEAD
pnpm nx affected -t e2e-macos-ci --parallel=1 --base=$NX_BASE --head=$NX_HEAD
no_output_timeout: 45m

# -------------------------
Expand Down
35 changes: 35 additions & 0 deletions .eslintrc.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
}
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@
{
"group": ["nx/src/plugins/js*"],
"message": "Imports from 'nx/src/plugins/js' are not allowed. Use '@nx/js' instead"
},
{
"group": ["**/native-bindings", "**/native-bindings.js", ""],
"message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
}
]
}
],
"storybook/no-uninstalled-addons": [
"error",
{
"ignore": ["@nx/react/plugins/storybook"]
"ignore": ["@nx/react/plugins/storybook"],
"packageJsonLocation": "../../package.json"
}
]
},
Expand Down
File renamed without changes.
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/2-feature.md

This file was deleted.

17 changes: 10 additions & 7 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
blank_issues_enabled: false
contact_links:
- name: Read the community guidelines
about: "Please make sure you have read the submission guidelines before posting an issue"
url: https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-an-issue
- name: Want to start a discussion?
about: "Want to start a thread to discuss an idea? Use the discussions feature provided by GitHub."
url: https://github.com/nrwl/nx/discussions
- name: Have a question?
- name: "\U0001F680 Feature Request"
about: "Suggest a new feature to make Nx better"
url: https://github.com/nrwl/nx/discussions/new?category=feature-requests
- name: Start a Discussion
about: "Start a discussion to share your experience with Nx"
url: https://github.com/nrwl/nx/discussions/new/choose
- name: Join the Discord
url: https://go.nx.dev/community
about: "The Nx Official Discord Server is a great place for questions to be asked and answered. Please use the #forum if you need help with your workspace!"
- name: Are you looking for integration with a new tool?
url: https://nx.dev/community
about: "There are a lot of awesome Plugins for Nx provided by the community! Check here to see if there is a community plugin to integrate your tool."
- name: Read the community guidelines
about: "Please make sure you have read the submission guidelines before posting an issue"
url: https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-an-issue
62 changes: 15 additions & 47 deletions .github/workflows/e2e-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env:
permissions: { }
jobs:
preinstall:
if: ${{ github.repository_owner == 'nrwl' }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -86,6 +87,7 @@ jobs:
run: npx cypress install

e2e:
if: ${{ github.repository_owner == 'nrwl' }}
needs: preinstall
permissions:
contents: read
Expand All @@ -104,9 +106,7 @@ jobs:
- yarn
- pnpm
project:
- e2e-angular-core
- e2e-angular-extensions
- e2e-angular-module-federation
- e2e-angular
- e2e-cypress
- e2e-detox
- e2e-esbuild
Expand All @@ -116,30 +116,24 @@ jobs:
- e2e-jest
- e2e-js
- e2e-lerna-smoke-tests
- e2e-next-core
- e2e-next-extensions
- e2e-next
- e2e-node
- e2e-nuxt
- e2e-nx-init
- e2e-nx-misc
- e2e-nx-run
- e2e-nx
- e2e-playwright
- e2e-plugin
- e2e-react-core
- e2e-react-module-federation
- e2e-react-extensions
- e2e-react
- e2e-react-native
- e2e-release
- e2e-remix
- e2e-rollup
- e2e-storybook
- e2e-storybook-angular
- e2e-vite
- e2e-vue
- e2e-web
- e2e-webpack
- e2e-workspace-create
- e2e-workspace-create-npm
include:
# os short names
- os: ubuntu-latest
Expand All @@ -152,11 +146,7 @@ jobs:
- os: macos-latest
os_timeout: 90
# codeowner groups
- project: e2e-angular-core
codeowners: 'S04SS457V38'
- project: e2e-angular-extensions
codeowners: 'S04SS457V38'
- project: e2e-angular-module-federation
- project: e2e-angular
codeowners: 'S04SS457V38'
- project: e2e-cypress
codeowners: 'S04T16BTJJY'
Expand All @@ -176,25 +166,19 @@ jobs:
codeowners: 'S04TNCVEETS'
- project: e2e-eslint
codeowners: 'S04SYJGKSCT'
- project: e2e-next-core
codeowners: 'S04TNCNJG5N'
- project: e2e-next-extensions
- project: e2e-next
codeowners: 'S04TNCNJG5N'
- project: e2e-node
codeowners: 'S04SJ6HHP0X'
- project: e2e-nx-init
codeowners: 'S04SYHYKGNP'
- project: e2e-nx-misc
- project: e2e-nx
codeowners: 'S04SYHYKGNP'
- project: e2e-plugin
codeowners: 'S04SYHYKGNP'
- project: e2e-release
codeowners: 'S04SYHYKGNP'
- project: e2e-nx-run
codeowners: 'S04SYHYKGNP'
- project: e2e-react-core
codeowners: 'S04TNCNJG5N'
- project: e2e-react-extensions
- project: e2e-react
codeowners: 'S04TNCNJG5N'
- project: e2e-react-native
codeowners: 'S04TNCNJG5N'
Expand All @@ -206,8 +190,6 @@ jobs:
codeowners: 'S04SVQ8H0G5'
- project: e2e-playwright
codeowners: 'S04SVQ8H0G5'
- project: e2e-storybook-angular
codeowners: 'S04SVQ8H0G5'
- project: e2e-remix
codeowners: 'S04SVQ8H0G5'
- project: e2e-vite
Expand All @@ -220,8 +202,6 @@ jobs:
codeowners: 'S04SJ6PL98X'
- project: e2e-workspace-create
codeowners: 'S04SYHYKGNP'
- project: e2e-workspace-create-npm
codeowners: 'S04SYHYKGNP'
exclude:
# exclude react-native tests from ubuntu
- os: ubuntu-latest
Expand All @@ -232,11 +212,7 @@ jobs:
project: e2e-expo
# exclude non-CNW/Lerna tests from non-LTS node versions
- node_version: 18
project: e2e-angular-core
- node_version: 18
project: e2e-angular-extensions
- node_version: 18
project: e2e-angular-module-federation
project: e2e-angular
- node_version: 18
project: e2e-cypress
- node_version: 18
Expand All @@ -254,27 +230,21 @@ jobs:
- node_version: 18
project: e2e-eslint
- node_version: 18
project: e2e-next-core
- node_version: 18
project: e2e-next-extensions
project: e2e-next
- node_version: 18
project: e2e-node
- node_version: 18
project: e2e-nuxt
- node_version: 18
project: e2e-nx-init
- node_version: 18
project: e2e-nx-misc
project: e2e-nx
- node_version: 18
project: e2e-plugin
- node_version: 18
project: e2e-playwright
- node_version: 18
project: e2e-react-core
- node_version: 18
project: e2e-react-module-federation
- node_version: 18
project: e2e-react-extensions
project: e2e-react
- node_version: 18
project: e2e-react-native
- node_version: 18
Expand All @@ -285,8 +255,6 @@ jobs:
project: e2e-rollup
- node_version: 18
project: e2e-storybook
- node_version: 18
project: e2e-storybook-angular
- node_version: 18
project: e2e-vite
- node_version: 18
Expand Down Expand Up @@ -386,7 +354,7 @@ jobs:
- name: Run e2e tests
id: e2e-run
run: pnpm nx run-many -t e2e,e2e-macos -p ${{ matrix.project }}
run: pnpm nx run-many -t e2e-local -p ${{ matrix.project }}
timeout-minutes: ${{ matrix.os_timeout }}
env:
GIT_AUTHOR_EMAIL: test@test.com
Expand Down

0 comments on commit 9f8139c

Please sign in to comment.