From d07e7b834831230b53860d0919a68edc2d36193d Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 8 Jan 2022 21:36:43 +0100 Subject: build: Eslint fixes for multi-module project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristóf Marussy --- packages/service-shared/.eslintrc.cjs | 7 +++++++ packages/service-shared/esbuild.config.js | 6 +++--- packages/service-shared/package.json | 7 ++----- packages/service-shared/src/index.ts | 2 +- packages/service-shared/src/ipc.ts | 3 +++ packages/service-shared/tsconfig.build.json | 12 ++++++++++++ packages/service-shared/tsconfig.json | 14 ++++++++------ 7 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 packages/service-shared/.eslintrc.cjs create mode 100644 packages/service-shared/tsconfig.build.json (limited to 'packages/service-shared') diff --git a/packages/service-shared/.eslintrc.cjs b/packages/service-shared/.eslintrc.cjs new file mode 100644 index 0000000..71d6ec4 --- /dev/null +++ b/packages/service-shared/.eslintrc.cjs @@ -0,0 +1,7 @@ +module.exports = { + env: { + // We must run in both node and browser, so we can't depend on either of them. + node: false, + browser: false, + }, +}; diff --git a/packages/service-shared/esbuild.config.js b/packages/service-shared/esbuild.config.js index 08941a4..ccee72c 100644 --- a/packages/service-shared/esbuild.config.js +++ b/packages/service-shared/esbuild.config.js @@ -1,8 +1,8 @@ import { chrome, node } from '../../config/buildConstants.js'; -import { getConfig } from '../../config/esbuildConfig.js'; -import { fileURLToDirname } from '../../config/utils.js'; +import fileURLToDirname from '../../config/fileURLToDirname.js'; +import getEsbuildConfig from '../../config/getEsbuildConfig.js'; -export default getConfig({ +export default getEsbuildConfig({ absWorkingDir: fileURLToDirname(import.meta.url), entryPoints: [ 'src/index.ts', diff --git a/packages/service-shared/package.json b/packages/service-shared/package.json index 9d75fc8..5338c8c 100644 --- a/packages/service-shared/package.json +++ b/packages/service-shared/package.json @@ -7,13 +7,10 @@ "exports": "./dist/index.mjs", "types": "dist/index.d.ts", "scripts": { - "typecheck": "tsc" + "typecheck:workspace": "yarn g:typecheck", + "types": "yarn g:types" }, "dependencies": { "zod": "^3.11.6" - }, - "devDependencies": { - "rimraf": "^3.0.2", - "typescript": "^4.5.4" } } diff --git a/packages/service-shared/src/index.ts b/packages/service-shared/src/index.ts index 564ebe8..e111347 100644 --- a/packages/service-shared/src/index.ts +++ b/packages/service-shared/src/index.ts @@ -18,7 +18,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -export { ServiceToMainIpcMessage } from './ipc'; +export { MainToServiceIpcMessage, ServiceToMainIpcMessage } from './ipc'; export type { UnreadCount, diff --git a/packages/service-shared/src/ipc.ts b/packages/service-shared/src/ipc.ts index 4f991c5..c0dab11 100644 --- a/packages/service-shared/src/ipc.ts +++ b/packages/service-shared/src/ipc.ts @@ -18,6 +18,9 @@ * SPDX-License-Identifier: AGPL-3.0-only */ +export enum MainToServiceIpcMessage { +} + export enum ServiceToMainIpcMessage { ApiExposedInMainWorld = 'sophie-service-to-main:api-exposed-in-main-world', SetUnreadCount = 'sophie-service-to-main:set-unread-count', diff --git a/packages/service-shared/tsconfig.build.json b/packages/service-shared/tsconfig.build.json new file mode 100644 index 0000000..9a0c835 --- /dev/null +++ b/packages/service-shared/tsconfig.build.json @@ -0,0 +1,12 @@ +{ + "extends": "../../config/tsconfig.base.json", + "compilerOptions": { + "composite": true, + "declarationDir": "dist", + "emitDeclarationOnly": true, + "rootDir": "src" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/service-shared/tsconfig.json b/packages/service-shared/tsconfig.json index ff5a29b..79889d2 100644 --- a/packages/service-shared/tsconfig.json +++ b/packages/service-shared/tsconfig.json @@ -1,12 +1,14 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.build.json", "compilerOptions": { - "composite": true, - "declarationDir": "dist", - "emitDeclarationOnly": true, - "rootDir": "src" + "composite": false, + "emitDeclarationOnly": false, + "declarationDir": null, + "noEmit": true, + "rootDir": null }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "esbuild.config.js" ] } -- cgit v1.2.3-54-g00ecf