Skip to content

Commit

Permalink
Merge pull request #4539 from relative-ci/dependabot/npm_and_yarn/mas…
Browse files Browse the repository at this point in the history
…ter/typescript-5.5.3

build(deps-dev): Bump typescript from 5.1.6 to 5.5.3
  • Loading branch information
vio committed Jul 20, 2024
2 parents e6bf742 + 3806813 commit 77762f7
Show file tree
Hide file tree
Showing 28 changed files with 68 additions and 55 deletions.
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prettier": "3.3.3",
"rimraf": "6.0.1",
"react-is": "^16.13.1",
"typescript": "5.1.6",
"typescript": "5.5.3",
"verdaccio": "^5.26.2"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"memfs": "4.9.3",
"rimraf": "6.0.1",
"ts-jest": "29.2.3",
"typescript": "5.1.6"
"typescript": "5.5.3"
}
}
4 changes: 2 additions & 2 deletions packages/cli-utils/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "bundler",
"target": "ES2019",
"module": "ES6",
"declaration": true,
"declarationDir": "./types",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
3 changes: 2 additions & 1 deletion packages/cli-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
"include": ["src/**/*"],
"exclude": ["**/*.test.ts"]
}
5 changes: 3 additions & 2 deletions packages/cli-utils/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"module": "commonjs",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
"http-server": "14.1.1",
"jest": "29.7.0",
"rimraf": "6.0.1",
"typescript": "5.1.6"
"typescript": "5.5.3"
}
}
2 changes: 2 additions & 0 deletions packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"module": "commonjs",
"noEmit": false
},
"include": ["src/**/*"],
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-webpack-filter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"regenerator-runtime": "0.14.1",
"rimraf": "6.0.1",
"ts-jest": "29.2.3",
"typescript": "5.1.6"
"typescript": "5.5.3"
},
"peerDependencies": {
"core-js": "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-webpack-filter/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "bundler",
"target": "ES2019",
"module": "ES6",
"declaration": true,
"declarationDir": "./types",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
3 changes: 2 additions & 1 deletion packages/plugin-webpack-filter/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
"include": ["src/**/*"],
"exclude": ["**/*.test.ts"]
}
5 changes: 3 additions & 2 deletions packages/plugin-webpack-filter/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"module": "commonjs",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
16 changes: 9 additions & 7 deletions packages/plugin-webpack-validate/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
module.exports = {
preset: 'ts-jest/presets/js-with-ts',
testEnvironment: 'node',
testPathIgnorePatterns: [
'/__fixtures__/',
'/node_modules/',
'/lib/',
'/lib-esm/',
'/types/',
],
testPathIgnorePatterns: ['/__fixtures__/', '/node_modules/', '/lib/', '/lib-esm/', '/types/'],
transform: {
'.*.ts$': [
'ts-jest',
{
tsConfig: 'tsconfig.lib.json',
},
],
},
};
2 changes: 1 addition & 1 deletion packages/plugin-webpack-validate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"regenerator-runtime": "0.14.1",
"rimraf": "6.0.1",
"ts-jest": "29.2.3",
"typescript": "5.1.6"
"typescript": "5.5.3"
},
"dependencies": {
"lodash": "4.17.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-webpack-validate/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "bundler",
"target": "ES2019",
"module": "ES6",
"declaration": true,
"declarationDir": "./types",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
3 changes: 2 additions & 1 deletion packages/plugin-webpack-validate/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
"include": ["src/**/*"],
"exclude": ["**/*.test.ts"]
}
5 changes: 3 additions & 2 deletions packages/plugin-webpack-validate/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"module": "commonjs",
"noEmit": false
},
"exclude": ["**/*.test.ts"]
}
}
2 changes: 1 addition & 1 deletion packages/rollup-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"rimraf": "6.0.1",
"rollup": "4.18.1",
"ts-jest": "29.2.3",
"typescript": "5.1.6"
"typescript": "5.5.3"
},
"peerDependencies": {
"rollup": "^3.0.0 || ^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"react-router-dom": "5.3.4",
"rimraf": "6.0.1",
"storybook": "8.2.4",
"typescript": "5.1.6",
"typescript": "5.5.3",
"typescript-plugin-css-modules": "5.1.0"
},
"peerDependencies": {
Expand Down
6 changes: 4 additions & 2 deletions packages/ui/src/components/bundle-modules/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,16 @@ export const BundleModules = (props: BundleModulesProps) => {
});

const { rows, totalRowCount } = useMemo(() => {
let result;
let result: Array<types.ReportMetricModuleRow> = [];

if (moduleMetric === ModuleMetric.TOTAL_SIZE) {
result = webpack.compareModuleDuplicateSize(jobs, [addRowFlags]);
} else if (moduleMetric === ModuleMetric.SIZE) {
result = webpack.compareBySection.modules(jobs, [addRowFlags]);
}

return {
rows: result as Array<types.ReportMetricModuleRow>,
rows: result,
totalRowCount: result.length,
};
}, [jobs, moduleMetric]);
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"compilerOptions": {
"jsx": "react",
"resolveJsonModule": true,
"moduleResolution": "bundler",
"target": "ES2019",
"module": "ES6",
"declaration": true,
"declarationDir": "./types",
"noEmit": false
},
"exclude": ["**/__tests__/*", "**/*.stories.*"]
}
}
5 changes: 3 additions & 2 deletions packages/ui/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*", "globals.d.ts"],
"plugins": [{"name": "typescript-plugin-css-modules"}],
"compilerOptions": {
"jsx": "react"
}
},
"include": ["src/**/*", "globals.d.ts"],
"exclude": ["**/__tests__/*", "**/*.stories.*"]
}
3 changes: 1 addition & 2 deletions packages/ui/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
"jsx": "react",
"resolveJsonModule": true,
"noEmit": false
},
"exclude": ["**/__tests__/*", "**/*.stories.*"]
}
}
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"regenerator-runtime": "0.14.1",
"rimraf": "6.0.1",
"ts-jest": "29.2.3",
"typescript": "5.1.6"
"typescript": "5.5.3"
},
"peerDependencies": {
"core-js": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "bundler",
"target": "ES2019",
"module": "ES6",
"declaration": true,
"declarationDir": "./types",
"noEmit": false
},
"exclude": ["**/__tests__/*"]
}
}
3 changes: 2 additions & 1 deletion packages/utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
"include": ["src/**/*"],
"exclude": ["**/__tests__/*"]
}
5 changes: 3 additions & 2 deletions packages/utils/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"module": "commonjs",
"noEmit": false
},
"exclude": ["**/__tests__/*"]
}
}
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "@tsconfig/node14/tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node",
"allowSyntheticDefaultImports": true,
"noImplicitAny": true,
"removeComments": true,
Expand Down

0 comments on commit 77762f7

Please sign in to comment.