From a61bb4f8bc9b9ff6d29ee5c01138d973fca24965 Mon Sep 17 00:00:00 2001 From: hehe Date: Fri, 3 Mar 2023 02:01:09 +0800 Subject: [PATCH] chore: update `lint` script to include the `.mjs` (#1267) --- .../scripts/generateTsTypingsFromJsonSchema.mjs | 2 +- apps/web/next.config.mjs | 10 ++++++---- apps/web/preset.config.mjs | 3 ++- package.json | 11 +++++------ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs b/apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs index b1452013ef..cc883f10ab 100644 --- a/apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs +++ b/apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs @@ -1,7 +1,7 @@ import fs from 'fs'; -import path from 'path'; // TODO: use https://github.com/quicktype/quicktype#installation instead import { compileFromFile } from 'json-schema-to-typescript'; +import path from 'path'; import { cd } from 'zx/core'; const projectRoot = path.join(__dirname, '..', '..'); diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs index 6077c0166a..c2dfa59896 100644 --- a/apps/web/next.config.mjs +++ b/apps/web/next.config.mjs @@ -1,10 +1,12 @@ // @ts-check -import path from 'node:path'; -import debugLocal from 'next-debug-local'; -import preset from './preset.config.mjs'; import { createRequire } from 'node:module'; -import { getCommitHash, getGitVersion } from './scripts/gitInfo.mjs'; +import path from 'node:path'; + import { PerfseePlugin } from '@perfsee/webpack'; +import debugLocal from 'next-debug-local'; + +import preset from './preset.config.mjs'; +import { getCommitHash, getGitVersion } from './scripts/gitInfo.mjs'; const require = createRequire(import.meta.url); diff --git a/apps/web/preset.config.mjs b/apps/web/preset.config.mjs index b8e9b4f458..b4e85e47a1 100644 --- a/apps/web/preset.config.mjs +++ b/apps/web/preset.config.mjs @@ -1,6 +1,6 @@ import 'dotenv/config'; -export default { +const config = { enableIndexedDBProvider: Boolean(process.env.ENABLE_IDB_PROVIDER ?? '1'), enableBroadCastChannelProvider: Boolean( process.env.ENABLE_BC_PROVIDER ?? '1' @@ -8,3 +8,4 @@ export default { prefetchWorkspace: Boolean(process.env.PREFETCH_WORKSPACE ?? '1'), exposeInternal: Boolean(process.env.EXPOSE_INTERNAL ?? '1'), }; +export default config; diff --git a/package.json b/package.json index c5b4b1732c..4ac5dd5f7a 100644 --- a/package.json +++ b/package.json @@ -9,19 +9,18 @@ "dev:ac": "cross-env NODE_API_SERVER=ac pnpm --filter @affine/app dev", "dev:local": "cross-env NODE_API_SERVER=local pnpm --filter @affine/app dev", "build": "pnpm --filter @affine/app build", - "build:client": " pnpm --filter=@affine/client-app build:app", - "build:storybook": " pnpm -r build-storybook", + "build:client": "pnpm --filter @affine/client-app build:app", + "build:storybook": "pnpm -r build-storybook", "export": "pnpm --filter @affine/app export", - "export:rem": "pnpm --filter @affine/rem export", "start": "pnpm --filter @affine/app start", - "lint": "eslint . --ext .js,.ts,.mts,.tsx", - "lint:fix": "eslint . --ext .js,.ts,.mts,.tsx --fix", + "lint": "eslint . --ext .js,mjs,.ts,.tsx", + "lint:fix": "pnpm lint --fix", "test": "playwright test", "test:coverage": "cross-env COVERAGE=true pnpm test -- --forbid-only", "test:unit": "vitest --run", "test:unit:coverage": "vitest run --coverage", "postinstall": "husky install", - "notify": "node --experimental-modules scripts/notify.mjs", + "notify": "node scripts/notify.mjs", "update:core": "pnpm up @blocksuite/*@nightly !@blocksuite/icons -r" }, "lint-staged": {