diff --git a/packages/sw/eslint.config.js b/packages/sw/eslint.config.js index eb86c0c106..5b894ee2b5 100644 --- a/packages/sw/eslint.config.js +++ b/packages/sw/eslint.config.js @@ -19,7 +19,7 @@ export default [ }, parserOptions: { parser: tsParser, - project: ['./jsconfig.scripts.json'], + project: ['./tsconfig.scripts.json'], sourceType: 'module', tsconfigRootDir: import.meta.dirname, }, diff --git a/packages/sw/jsconfig.scripts.json b/packages/sw/jsconfig.scripts.json deleted file mode 100644 index 587593b0cf..0000000000 --- a/packages/sw/jsconfig.scripts.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "../shared/jsconfig.node.json", - "compilerOptions": { - "typeRoots": [ - "./node_modules/@types", - "./src/@types" - ] - }, - "include": [ - "*.js" - ], - "exclude": [ - "node_modules" - ] -} diff --git a/packages/sw/package.json b/packages/sw/package.json index 65996f3945..dfe32ff829 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -7,7 +7,7 @@ "typecheck-all": "pnpm run --no-bail typecheck:sw && pnpm run --no-bail typecheck:scripts", "typecheck": "pnpm run typecheck:sw && pnpm run typecheck:scripts", "typecheck:sw": "tsc -p tsconfig.sw.json --noEmit", - "typecheck:scripts": "tsc -p jsconfig.scripts.json --noEmit", + "typecheck:scripts": "tsc -p tsconfig.scripts.json --noEmit", "eslint": "eslint --quiet --cache -c eslint.config.js", "lint": "pnpm typecheck && pnpm eslint" }, diff --git a/packages/sw/tsconfig.json b/packages/sw/tsconfig.json index bba3202fc1..7839fb024c 100644 --- a/packages/sw/tsconfig.json +++ b/packages/sw/tsconfig.json @@ -4,6 +4,6 @@ // WebStorm only reads one tsconfig per directory, so this tricks it into loading both. "references": [ { "path": "./tsconfig.sw.json" }, - { "path": "./jsconfig.scripts.json" } + { "path": "./tsconfig.scripts.json"} ] } diff --git a/packages/sw/tsconfig.scripts.json b/packages/sw/tsconfig.scripts.json new file mode 100644 index 0000000000..a479a70325 --- /dev/null +++ b/packages/sw/tsconfig.scripts.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "../shared/tsconfig.scripts.jsonc", + "include": [ + "*.js", + "*.ts" + ] +} diff --git a/packages/sw/tsconfig.sw.json b/packages/sw/tsconfig.sw.json index a8c1eb1dd9..8aac3a3955 100644 --- a/packages/sw/tsconfig.sw.json +++ b/packages/sw/tsconfig.sw.json @@ -1,11 +1,9 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "../shared/tsconfig.webworker.json", + "extends": "../shared/tsconfig.webworker.jsonc", "compilerOptions": { "declaration": true, "declarationMap": true, - "sourceMap": true, - "inlineSources": true, "removeComments": false, "baseUrl": ".", "outDir": "../../built/_sw_dist_",