Skip to content

Commit

Permalink
Merge branch 'main' into member-ordering-natural-order
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Oct 13, 2022
2 parents 8503b5c + 9ffdb05 commit a918d3b
Show file tree
Hide file tree
Showing 35 changed files with 306 additions and 774 deletions.
1 change: 0 additions & 1 deletion .github/actions/prepare-install/action.yml
Expand Up @@ -33,7 +33,6 @@ runs:
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
~/.cache/Cypress
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
Expand Down
5 changes: 0 additions & 5 deletions .github/renovate.json5
Expand Up @@ -56,11 +56,6 @@
matchPackagePrefixes: ['@types/jest'],
groupName: 'jest',
},
{
matchPackageNames: ['cypress', 'cypress-axe'],
matchUpdateTypes: ['minor', 'patch', 'pin', 'digest'],
groupName: 'cypress',
},
],
postUpdateOptions: [
// run yarn dedupe to cleanup the lockfile after updates
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/ci.yml
Expand Up @@ -175,7 +175,6 @@ jobs:
website_tests:
permissions:
contents: read # to fetch code (actions/checkout)
actions: read # to correctly identify workflow run (cypress-io/github-action)

name: Website tests
needs: [build]
Expand All @@ -192,23 +191,18 @@ jobs:
- name: Build
uses: ./.github/actions/prepare-build

- name: Install Cypress
run: yarn cypress install
- name: Install Playwright Browsers
run: npx playwright install --with-deps

- env:
DEBUG: '@cypress/github-action'
name: Cypress run
uses: cypress-io/github-action@v2
with:
project: ./packages/website
start: yarn start
- name: Run Playwright tests
run: yarn playwright test --reporter=list
working-directory: packages/website

- uses: actions/upload-artifact@v3
- if: always()
uses: actions/upload-artifact@v3
with:
name: screenshots
path: |
packages/website/cypress/screenshots/
packages/website/cypress/videos/
name: playwright-report
path: packages/website/playwright-report

upload_coverage:
name: Upload Codecov Coverage
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -9,9 +9,10 @@ yarn-error.log*
packages/website/.docusaurus
packages/website/.cache-loader
packages/website/build
packages/website/cypress/screenshots
packages/website/cypress/videos
packages/website/playwright-report
packages/website/playwright/.cache
packages/website/static/sandbox
packages/website/test-results

# Runtime data
pids
Expand Down
12 changes: 5 additions & 7 deletions nx.json
@@ -1,4 +1,5 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"npmScope": "typescript-eslint",
"implicitDependencies": {
"package.json": {
Expand Down Expand Up @@ -26,12 +27,9 @@
}
}
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
"targetDefaults": {
"build": {
"dependsOn": ["^build"]
}
}
}
7 changes: 3 additions & 4 deletions package.json
Expand Up @@ -53,10 +53,8 @@
"@babel/eslint-parser": "^7.18.2",
"@babel/parser": "^7.18.0",
"@babel/types": "^7.18.2",
"@nrwl/cli": "14.1.4",
"@nrwl/nx-cloud": "14.0.3",
"@nrwl/tao": "14.1.4",
"@nrwl/workspace": "14.1.4",
"@nrwl/nx-cloud": "14.7.0",
"@nrwl/workspace": "14.8.4",
"@swc/core": "^1.3.1",
"@swc/jest": "^0.2.21",
"@types/babel__code-frame": "^7.0.3",
Expand Down Expand Up @@ -98,6 +96,7 @@
"make-dir": "^3.1.0",
"markdownlint-cli": "^0.32.0",
"ncp": "^2.0.0",
"nx": "14.8.4",
"patch-package": "^6.4.7",
"prettier": "2.7.1",
"pretty-format": "^29.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/ast-spec/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/ast-spec",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin-internal/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/eslint-plugin-internal",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin-tslint/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/eslint-plugin-tslint",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/eslint-plugin",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/experimental-utils/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/experimental-utils",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/parser/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/parser",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
12 changes: 6 additions & 6 deletions packages/scope-manager/project.json
@@ -1,10 +1,10 @@
{
"root": "packages/scope-manager",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/scope-manager/src",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"outputs": [
"packages/scope-manager/dist",
"packages/scope-manager/_ts3.4"
Expand All @@ -20,7 +20,7 @@
}
},
"typecheck": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": true,
"cwd": "packages/scope-manager",
Expand All @@ -31,7 +31,7 @@
}
},
"clean": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": false,
"cwd": "packages/scope-manager",
Expand All @@ -44,7 +44,7 @@
}
},
"clean-fixtures": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": false,
"cwd": "packages/scope-manager",
Expand All @@ -68,7 +68,7 @@
}
},
"generate-lib": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": false,
"cwd": "packages/scope-manager",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-fixtures/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/shared-fixtures",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/type-utils/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/type-utils",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/types/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/types",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": ["@typescript-eslint/ast-spec"]
}
2 changes: 1 addition & 1 deletion packages/typescript-estree/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/typescript-estree",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": ["@typescript-eslint/types"]
}
2 changes: 1 addition & 1 deletion packages/utils/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/utils",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
2 changes: 1 addition & 1 deletion packages/visitor-keys/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/visitor-keys",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
6 changes: 3 additions & 3 deletions packages/website-eslint/package.json
Expand Up @@ -21,9 +21,9 @@
},
"devDependencies": {
"@rollup/plugin-commonjs": "^23.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/pluginutils": "^4.2.1",
"@rollup/plugin-json": "^5.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"@rollup/pluginutils": "^5.0.0",
"@typescript-eslint/eslint-plugin": "5.40.0",
"@typescript-eslint/parser": "5.40.0",
"@typescript-eslint/scope-manager": "5.40.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/website-eslint/project.json
@@ -1,5 +1,5 @@
{
"root": "packages/website-eslint",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"type": "library",
"implicitDependencies": []
}
1 change: 1 addition & 0 deletions packages/website/.eslintrc.js
Expand Up @@ -9,6 +9,7 @@ module.exports = {
overrides: [
{
files: [
'./*.config.*',
'./src/pages/*.tsx',
'./src/components/**/*.tsx',
'./src/components/hooks/*.ts',
Expand Down
15 changes: 0 additions & 15 deletions packages/website/cypress/integration/index.spec.js

This file was deleted.

17 changes: 0 additions & 17 deletions packages/website/cypress/plugins/index.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/website/cypress/support/commands.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/website/cypress/support/index.js

This file was deleted.

28 changes: 0 additions & 28 deletions packages/website/cypress/utils.js

This file was deleted.

7 changes: 3 additions & 4 deletions packages/website/package.json
Expand Up @@ -10,8 +10,7 @@
"serve": "docusaurus serve",
"start": "docusaurus start",
"swizzle": "docusaurus swizzle",
"test": "cypress run",
"test:open": "cypress open",
"test": "playwright test",
"typecheck": "tsc"
},
"dependencies": {
Expand Down Expand Up @@ -43,14 +42,14 @@
"react": "^18.0.0"
},
"devDependencies": {
"@axe-core/playwright": "^4.4.5",
"@docusaurus/module-type-aliases": "~2.1.0",
"@playwright/test": "^1.27.1",
"@types/react": "^18.0.9",
"@types/react-helmet": "^6.1.5",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "5.40.0",
"copy-webpack-plugin": "^11.0.0",
"cypress": "8.7.0",
"cypress-axe": "^0.14.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
Expand Down

0 comments on commit a918d3b

Please sign in to comment.