From 6467e1069093654dc66343bbe85f578a09520a8f Mon Sep 17 00:00:00 2001 From: Brooooooklyn Date: Mon, 25 Mar 2024 07:11:49 +0000 Subject: [PATCH] ci: fix lint oom (#6295) --- .eslintrc.js | 7 ++----- package.json | 5 +++-- packages/frontend/graphql/src/schema.ts | 1 + yarn.lock | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 63b0a7288f..fbfa3ef26a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,4 @@ -const { resolve } = require('node:path'); +const { join } = require('node:path'); const createPattern = packageName => [ { @@ -88,7 +88,7 @@ const config = { }, ecmaVersion: 'latest', sourceType: 'module', - project: resolve(__dirname, './tsconfig.eslint.json'), + project: join(__dirname, 'tsconfig.eslint.json'), }, plugins: [ 'react', @@ -235,9 +235,6 @@ const config = { }, ...allPackages.map(pkg => ({ files: [`${pkg}/src/**/*.ts`, `${pkg}/src/**/*.tsx`], - parserOptions: { - project: resolve(__dirname, './tsconfig.eslint.json'), - }, rules: { '@typescript-eslint/no-restricted-imports': [ 'error', diff --git a/package.json b/package.json index b131fa1645..9398b5ef70 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "start:web-static": "yarn workspace @affine/web static-server", "start:storybook": "yarn exec serve tests/storybook/storybook-static -l 6006", "serve:test-static": "yarn exec serve tests/fixtures --cors -p 8081", - "lint:eslint": "eslint . --ext .js,mjs,.ts,.tsx --cache", + "lint:eslint": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" eslint . --ext .js,mjs,.ts,.tsx --cache", "lint:eslint:fix": "yarn lint:eslint --fix", "lint:prettier": "prettier --ignore-unknown --cache --check .", "lint:prettier:fix": "prettier --ignore-unknown --cache --write .", @@ -44,7 +44,7 @@ "*": "prettier --write --ignore-unknown --cache", "*.{ts,tsx,mjs,js,jsx}": [ "prettier --ignore-unknown --write", - "eslint --cache --fix" + "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" eslint --cache --fix" ], "*.toml": [ "taplo format" @@ -76,6 +76,7 @@ "@vitejs/plugin-react-swc": "^3.6.0", "@vitest/coverage-istanbul": "1.4.0", "@vitest/ui": "1.4.0", + "cross-env": "^7.0.3", "electron": "^29.0.1", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", diff --git a/packages/frontend/graphql/src/schema.ts b/packages/frontend/graphql/src/schema.ts index 288f58d08e..c3a40dd9be 100644 --- a/packages/frontend/graphql/src/schema.ts +++ b/packages/frontend/graphql/src/schema.ts @@ -87,6 +87,7 @@ export enum ServerFeature { } export enum SubscriptionPlan { + AI = 'AI', Enterprise = 'Enterprise', Free = 'Free', Pro = 'Pro', diff --git a/yarn.lock b/yarn.lock index 517f2b5c27..9367cf5026 100644 --- a/yarn.lock +++ b/yarn.lock @@ -582,6 +582,7 @@ __metadata: "@vitejs/plugin-react-swc": "npm:^3.6.0" "@vitest/coverage-istanbul": "npm:1.4.0" "@vitest/ui": "npm:1.4.0" + cross-env: "npm:^7.0.3" electron: "npm:^29.0.1" eslint: "npm:^8.56.0" eslint-config-prettier: "npm:^9.1.0"