Skip to content

Commit

Permalink
Merge pull request #315 from mizdra/refactoring-tsconfig
Browse files Browse the repository at this point in the history
Refactoring tsconfig.json
  • Loading branch information
mizdra authored Nov 8, 2023
2 parents d279c18 + c5d4574 commit 6424d18
Show file tree
Hide file tree
Showing 20 changed files with 150 additions and 243 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/coverage
/dist
/tsconfig.src.tsbuildinfo
/tsconfig.test.tsbuildinfo
/bin
/static
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = {
files: ['*.ts', '*.tsx', '*.cts', '*.mts'],
extends: ['@mizdra/mizdra/+typescript', '@mizdra/mizdra/+prettier'],
parserOptions: {
project: ['./tsconfig.src.json', './tsconfig.test.json', './e2e-test/import-as-esm-from-esm/tsconfig.json'],
project: ['./tsconfig.json', './e2e-test/import-as-esm-from-esm/tsconfig.json'],
},
},
// for test
Expand Down
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/coverage
/dist
/fixtures
/tsconfig.src.tsbuildinfo
/tsconfig.test.tsbuildinfo
pnpm-lock.yaml
/.pnpm-store
1 change: 0 additions & 1 deletion babel.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @ts-check
'use strict';

/** @type {import('@babel/core').TransformOptions} */
const config = {
presets: ['@babel/preset-typescript'],
};
Expand Down
3 changes: 2 additions & 1 deletion e2e-test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"include": ["**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "./dist/",
// Compatible for Node.js v12 (ref: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping)
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@
}
},
"scripts": {
"build": "tsc -p tsconfig.src.json",
"dev": "tsc-watch -p tsconfig.src.json --onSuccess 'bin/eslint-interactive.js fixtures --rulesdir fixtures/rules --ext .js,.jsx,.mjs'",
"build": "tsc -p tsconfig.build.json",
"dev": "tsc-watch -p tsconfig.build.json --onSuccess 'bin/eslint-interactive.js fixtures --rulesdir fixtures/rules --ext .js,.jsx,.mjs'",
"lint": "run-s -c lint:*",
"lint:tsc": "run-s -c lint:tsc:*",
"lint:tsc:src": "tsc -p tsconfig.src.json --noEmit",
"lint:tsc:test": "tsc -p tsconfig.test.json --noEmit",
"lint:tsc": "tsc -p tsconfig.json --noEmit",
"lint:eslint": "eslint --ignore-pattern '/fixtures/' --ignore-pattern '/e2e-test/' .",
"lint:prettier": "prettier --check .",
"test": "cross-env FORCE_HYPERLINK=1 NODE_OPTIONS=\"--experimental-vm-modules --experimental-import-meta-resolve $NODE_OPTIONS\" jest --colors",
Expand All @@ -33,9 +31,12 @@
"devDependencies": {
"@babel/core": "^7.23.2",
"@babel/preset-typescript": "^7.23.2",
"@jest/globals": "^29.7.0",
"@jest/types": "^29.6.3",
"@mizdra/eslint-config-mizdra": "^2.0.0",
"@mizdra/eslint-config-mizdra": "2.1.0-alpha.0",
"@mizdra/prettier-config-mizdra": "^1.0.0",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@types/eslint": "^8.44.6",
"@types/estraverse": "^5.1.5",
"@types/estree": "^1.0.4",
Expand Down
Loading

0 comments on commit 6424d18

Please sign in to comment.