Skip to content

Commit

Permalink
Merge branch 'main' into test/add-landing-snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
yjaaidi committed Dec 9, 2024
2 parents 846e2fd + 538afa9 commit 1e7399d
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 56 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

41 changes: 0 additions & 41 deletions .eslintrc.json

This file was deleted.

10 changes: 5 additions & 5 deletions .nx/workflows/bun.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
launch-templates:
linux-large-js-bun:
resource-class: 'docker_linux_amd64/large'
image: 'ubuntu22.04-node20.11-v7'
image: 'ubuntu22.04-node20.11-v10'
init-steps:
- name: Add bun bin to PATH
script: echo "PATH=$HOME/.bun/bin:$PATH" >> $NX_CLOUD_ENV
- name: Checkout
uses: 'nrwl/nx-cloud-workflows/v3.6/workflow-steps/checkout/main.yaml'
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/checkout/main.yaml'
- name: Restore Node Modules Cache
uses: 'nrwl/nx-cloud-workflows/v3.6/workflow-steps/cache/main.yaml'
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml'
env:
KEY: 'bun.lockb'
PATHS: 'node_modules'
BASE_BRANCH: 'main'
- name: Restore Browser Binary Cache
uses: 'nrwl/nx-cloud-workflows/v3.6/workflow-steps/cache/main.yaml'
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml'
env:
KEY: 'bun.lockb|"browsers"'
PATHS: |
Expand All @@ -28,4 +28,4 @@ launch-templates:
- name: Install Node Modules (with Bun)
script: bun install --frozen-lockfile --ignore-scripts
- name: Install Browsers (if needed)
uses: 'nrwl/nx-cloud-workflows/v3.6/workflow-steps/install-browsers/main.yaml'
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-browsers/main.yaml'
1 change: 0 additions & 1 deletion apps/cookbook/.eslintignore

This file was deleted.

22 changes: 22 additions & 0 deletions apps/cookbook/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const baseConfig = require('../../eslint.config.js');
const nx = require('@nx/eslint-plugin');
const playwright = require('eslint-plugin-playwright');

console.log();

module.exports = [
...baseConfig,
...nx.configs['flat/react'],
{
ignores: ['.docusaurus'],
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
// Override or add rules here
rules: {},
},
{
...playwright.configs['flat/recommended'],
files: ['e2e/**/*.ts'],
},
];
Binary file modified bun.lockb
Binary file not shown.
28 changes: 28 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
const nx = require('@nx/eslint-plugin');

module.exports = [
...nx.configs['flat/base'],
...nx.configs['flat/typescript'],
...nx.configs['flat/javascript'],
{
ignores: ['**/dist'],
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
rules: {
'@nx/enforce-module-boundaries': [
'error',
{
enforceBuildableLibDependency: true,
allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?js$'],
depConstraints: [
{
sourceTag: '*',
onlyDependOnLibsWithTags: ['*'],
},
],
},
],
},
},
];
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json"
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/eslint.config.js"
]
},
"defaultBase": "main",
Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"@docusaurus/module-type-aliases": "3.6.3",
"@docusaurus/tsconfig": "3.6.3",
"@docusaurus/types": "3.6.3",
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.16.0",
"@nx/devkit": "19.8.9",
"@nx/eslint": "19.8.9",
"@nx/eslint-plugin": "19.8.9",
Expand All @@ -29,22 +31,23 @@
"@playwright/test": "^1.36.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.6",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@typescript-eslint/eslint-plugin": "8.17.0",
"@typescript-eslint/parser": "8.17.0",
"@vitest/ui": "1.4.0",
"eslint": "8.57.0",
"eslint": "9.16.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.1",
"eslint-plugin-playwright": "^1.6.2",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-playwright": "2.1.0",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react-hooks": "5.1.0",
"firebase-tools": "13.10.2",
"jsdom": "24.0.0",
"nx": "19.8.9",
"nx-cloud": "19.1.0",
"prettier": "3.2.5",
"typescript": "5.5.4",
"typescript-eslint": "8.17.0",
"vite": "5.2.8",
"vitest": "1.4.0"
},
Expand Down

0 comments on commit 1e7399d

Please sign in to comment.