Skip to content

Commit 8e6f7bf

Browse files
mathuomathuo
committed
chore: update dependencies
1 parent 318cbd6 commit 8e6f7bf

12 files changed

+1208
-1955
lines changed

‎.github/workflows/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
${{ runner.os }}-node-
2525
2626
- run: yarn
27-
- run: npm run bootstrap
2827
- run: npm run build
2928
- run: npm run test:cov
3029
- name: SonarCloud Scan

‎jest-setup.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import '@testing-library/jest-dom';

‎jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const config: JestConfigWithTsJest = {
88
collectCoverageFrom: ['<rootDir>/packages/*/src/**/*.{js,jsx,ts,tsx}'],
99
coveragePathIgnorePatterns: [
1010
'/node_modules/',
11-
'<rootDir>packages/*/src/__tests__/',
11+
'<rootDir>/packages/*/src/__tests__/',
1212
],
1313
coverageDirectory: 'coverage',
1414
testResultsProcessor: 'jest-sonar-reporter',

‎lerna.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"packages": [
33
"packages/*"
44
],
5-
"useWorkspaces": true,
65
"version": "1.8.4",
76
"npmClient": "yarn",
87
"command": {

‎package.json

+49-54
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,71 @@
11
{
22
"name": "dockview-monorepo-root",
33
"private": true,
4+
"description": "Monorepo for https://github.com/mathuo/dockview",
5+
"homepage": "https://github.com/mathuo/dockview#readme",
6+
"bugs": {
7+
"url": "https://github.com/mathuo/dockview/issues"
8+
},
9+
"repository": {
10+
"type": "git",
11+
"url": "git+https://github.com/mathuo/dockview.git"
12+
},
13+
"license": "MIT",
14+
"author": "https://github.com/mathuo",
415
"workspaces": [
516
"packages/*"
617
],
7-
"nohoist": [
8-
"**/babel-jest",
9-
"**/babel-jest/**"
10-
],
11-
"description": "Monorepo for https://github.com/mathuo/dockview",
1218
"scripts": {
13-
"test": "jest",
14-
"lint": "eslint packages/**/src/** --ext .ts,.tsx,.js,.jsx",
15-
"package": "node scripts/package.js",
16-
"package-all": "lerna run docs --scope '{dockview-core,dockview}' && node scripts/package.js",
1719
"build": "lerna run build --scope '{dockview-core,dockview}'",
1820
"clean": "lerna run clean",
19-
"bootstrap": "lerna bootstrap",
20-
"test:cov": "jest --coverage",
21-
"set-experimental-versions": "node scripts/set-experimental-versions",
22-
"version-beta-build": "lerna version prerelease --preid beta",
23-
"publish-app": "lerna publish",
2421
"docs": "typedoc",
22+
"generate-docs": "node scripts/docs.mjs",
23+
"lint": "eslint packages/**/src/** --ext .ts,.tsx,.js,.jsx",
24+
"package": "node scripts/package.js",
2525
"package-docs": "node scripts/package-docs.js",
26-
"generate-docs": "node scripts/docs.mjs"
27-
},
28-
"repository": {
29-
"type": "git",
30-
"url": "git+https://github.com/mathuo/dockview.git"
26+
"set-experimental-versions": "node scripts/set-experimental-versions",
27+
"test": "jest",
28+
"test:cov": "jest --coverage",
29+
"version": "lerna version"
3130
},
32-
"author": "https://github.com/mathuo",
33-
"license": "MIT",
34-
"bugs": {
35-
"url": "https://github.com/mathuo/dockview/issues"
31+
"resolutions": {
32+
"@types/react": "^18.2.31",
33+
"@types/react-dom": "^18.2.14"
3634
},
37-
"homepage": "https://github.com/mathuo/dockview#readme",
3835
"devDependencies": {
39-
"@testing-library/dom": "^8.20.0",
40-
"@testing-library/jest-dom": "^5.16.5",
36+
"@rollup/plugin-node-resolve": "^15.2.3",
37+
"@rollup/plugin-terser": "^0.4.4",
38+
"@rollup/plugin-typescript": "^11.1.5",
39+
"@testing-library/dom": "^9.3.3",
40+
"@testing-library/jest-dom": "^6.1.4",
41+
"@testing-library/react": "^14.0.0",
4142
"@total-typescript/shoehorn": "^0.1.1",
42-
"@types/jest": "^29.4.0",
43-
"@typescript-eslint/eslint-plugin": "^5.52.0",
44-
"@typescript-eslint/parser": "^5.52.0",
45-
"codecov": "^3.8.3",
43+
"@types/jest": "^29.5.6",
44+
"@types/react": "^18.2.31",
45+
"@types/react-dom": "^18.2.14",
46+
"@typescript-eslint/eslint-plugin": "^6.8.0",
47+
"@typescript-eslint/parser": "^6.8.0",
4648
"cross-env": "^7.0.3",
47-
"css-loader": "^6.7.3",
48-
"eslint": "^8.34.0",
49-
"fs-extra": "^11.1.0",
49+
"eslint": "^8.52.0",
50+
"fs-extra": "^11.1.1",
5051
"gulp": "^4.0.2",
5152
"gulp-concat": "^2.6.1",
52-
"gulp-dart-sass": "^1.0.2",
53-
"jest": "^29.5.0",
54-
"jest-environment-jsdom": "^29.4.3",
53+
"gulp-dart-sass": "^1.1.0",
54+
"jest": "^29.7.0",
55+
"jest-environment-jsdom": "^29.7.0",
5556
"jest-sonar-reporter": "^2.0.0",
56-
"jsdom": "^21.1.0",
57-
"lerna": "^6.5.1",
58-
"merge2": "^1.4.1",
59-
"rimraf": "^4.1.2",
60-
"sass": "^1.58.1",
61-
"sass-loader": "^13.2.0",
62-
"style-loader": "^3.3.1",
63-
"ts-jest": "^29.0.5",
64-
"ts-loader": "^9.4.2",
57+
"jsdom": "^22.1.0",
58+
"lerna": "^7.4.1",
59+
"react": "^18.2.0",
60+
"react-dom": "^18.2.0",
61+
"rimraf": "^5.0.5",
62+
"rollup": "^4.1.4",
63+
"rollup-plugin-postcss": "^4.0.2",
64+
"ts-jest": "^29.1.1",
65+
"ts-loader": "^9.5.0",
6566
"ts-node": "^10.9.1",
66-
"tslib": "^2.5.0",
67-
"typedoc": "^0.24.7",
68-
"typescript": "^4.9.5",
69-
"webpack": "^5.75.0",
70-
"webpack-cli": "^5.0.1",
71-
"webpack-dev-server": "^4.11.1"
72-
},
73-
"dependencies": {
74-
"@microsoft/tsdoc": "^0.14.2"
67+
"tslib": "^2.6.2",
68+
"typedoc": "^0.25.2",
69+
"typescript": "^5.2.2"
7570
}
7671
}

‎packages/dockview-core/jest.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const config: JestConfigWithTsJest = {
1212
setupFiles: [
1313
'<rootDir>/packages/dockview-core/src/__tests__/__mocks__/resizeObserver.js',
1414
],
15+
setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
1516
coveragePathIgnorePatterns: ['/node_modules/'],
1617
modulePathIgnorePatterns: [
1718
'<rootDir>/packages/dockview-core/src/__tests__/__mocks__',

‎packages/dockview-core/package.json

+28-38
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,6 @@
22
"name": "dockview-core",
33
"version": "1.8.4",
44
"description": "Zero dependency layout manager supporting tabs, grids and splitviews with ReactJS support",
5-
"main": "./dist/cjs/index.js",
6-
"types": "./dist/cjs/index.d.ts",
7-
"module": "./dist/esm/index.js",
8-
"repository": {
9-
"type": "git",
10-
"url": "https://github.com/mathuo/dockview.git"
11-
},
12-
"bugs": {
13-
"url": "https://github.com/mathuo/dockview/issues"
14-
},
15-
"homepage": "https://github.com/mathuo/dockview",
16-
"scripts": {
17-
"build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
18-
"build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
19-
"build:css": "gulp sass",
20-
"build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
21-
"build:bundles": "rollup -c",
22-
"build": "npm run build:package && npm run build:bundles",
23-
"clean": "rimraf dist/ .build/ .rollup.cache/",
24-
"prepublishOnly": "npm run rebuild && npm run test",
25-
"docs": "typedoc",
26-
"rebuild": "npm run clean && npm run build",
27-
"test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core",
28-
"test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core --coverage"
29-
},
30-
"files": [
31-
"dist",
32-
"README.md"
33-
],
345
"keywords": [
356
"splitview",
367
"split-view",
@@ -52,15 +23,34 @@
5223
"react",
5324
"react-component"
5425
],
55-
"author": "https://github.com/mathuo",
26+
"homepage": "https://github.com/mathuo/dockview",
27+
"bugs": {
28+
"url": "https://github.com/mathuo/dockview/issues"
29+
},
30+
"repository": {
31+
"type": "git",
32+
"url": "https://github.com/mathuo/dockview.git"
33+
},
5634
"license": "MIT",
57-
"devDependencies": {
58-
"@rollup/plugin-terser": "^0.4.0",
59-
"@rollup/plugin-typescript": "^11.0.0",
60-
"cross-env": "^7.0.3",
61-
"postcss": "^8.4.21",
62-
"rimraf": "^4.1.2",
63-
"rollup": "^3.15.0",
64-
"rollup-plugin-postcss": "^4.0.2"
35+
"author": "https://github.com/mathuo",
36+
"main": "./dist/cjs/index.js",
37+
"module": "./dist/esm/index.js",
38+
"types": "./dist/cjs/index.d.ts",
39+
"files": [
40+
"dist",
41+
"README.md"
42+
],
43+
"scripts": {
44+
"build": "npm run build:package && npm run build:bundles",
45+
"build:bundles": "rollup -c",
46+
"build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
47+
"build:css": "gulp sass",
48+
"build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
49+
"build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
50+
"clean": "rimraf dist/ .build/ .rollup.cache/",
51+
"prepublishOnly": "npm run rebuild && npm run test",
52+
"rebuild": "npm run clean && npm run build",
53+
"test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core",
54+
"test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core --coverage"
6555
}
6656
}

‎packages/dockview/jest.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import { JestConfigWithTsJest } from 'ts-jest';
2-
import { join, normalize } from 'path';
3-
4-
const tsconfig = normalize(join(__dirname, '..', '..', 'tsconfig.test.json'));
52

63
const config: JestConfigWithTsJest = {
74
preset: 'ts-jest',
@@ -15,7 +12,7 @@ const config: JestConfigWithTsJest = {
1512
setupFiles: [
1613
'<rootDir>/packages/dockview/src/__tests__/__mocks__/resizeObserver.js',
1714
],
18-
setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
15+
setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
1916
coveragePathIgnorePatterns: ['/node_modules/'],
2017
modulePathIgnorePatterns: [
2118
'<rootDir>/packages/dockview/src/__tests__/__mocks__',

‎packages/dockview/package.json

+29-45
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,6 @@
22
"name": "dockview",
33
"version": "1.8.4",
44
"description": "Zero dependency layout manager supporting tabs, grids and splitviews with ReactJS support",
5-
"main": "./dist/cjs/index.js",
6-
"types": "./dist/cjs/index.d.ts",
7-
"module": "./dist/esm/index.js",
8-
"repository": {
9-
"type": "git",
10-
"url": "https://github.com/mathuo/dockview.git"
11-
},
12-
"bugs": {
13-
"url": "https://github.com/mathuo/dockview/issues"
14-
},
15-
"homepage": "https://github.com/mathuo/dockview",
16-
"scripts": {
17-
"build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
18-
"build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
19-
"build:css": "gulp sass",
20-
"build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
21-
"build:bundles": "rollup -c",
22-
"build": "npm run build:package && npm run build:bundles",
23-
"clean": "rimraf dist/ .build/ .rollup.cache/",
24-
"docs": "typedoc",
25-
"prepublishOnly": "npm run rebuild && npm run test",
26-
"rebuild": "npm run clean && npm run build",
27-
"test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview",
28-
"test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview --coverage"
29-
},
30-
"files": [
31-
"dist",
32-
"README.md"
33-
],
345
"keywords": [
356
"splitview",
367
"split-view",
@@ -52,24 +23,37 @@
5223
"react",
5324
"react-component"
5425
],
55-
"author": "https://github.com/mathuo",
26+
"homepage": "https://github.com/mathuo/dockview",
27+
"bugs": {
28+
"url": "https://github.com/mathuo/dockview/issues"
29+
},
30+
"repository": {
31+
"type": "git",
32+
"url": "https://github.com/mathuo/dockview.git"
33+
},
5634
"license": "MIT",
35+
"author": "https://github.com/mathuo",
36+
"main": "./dist/cjs/index.js",
37+
"module": "./dist/esm/index.js",
38+
"types": "./dist/cjs/index.d.ts",
39+
"files": [
40+
"dist",
41+
"README.md"
42+
],
43+
"scripts": {
44+
"build": "npm run build:package && npm run build:bundles",
45+
"build:bundles": "rollup -c",
46+
"build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
47+
"build:css": "gulp sass",
48+
"build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
49+
"build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
50+
"clean": "rimraf dist/ .build/ .rollup.cache/",
51+
"prepublishOnly": "npm run rebuild && npm run test",
52+
"rebuild": "npm run clean && npm run build",
53+
"test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview",
54+
"test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview --coverage"
55+
},
5756
"dependencies": {
5857
"dockview-core": "^1.8.4"
59-
},
60-
"devDependencies": {
61-
"@rollup/plugin-node-resolve": "^15.0.1",
62-
"@rollup/plugin-terser": "^0.4.0",
63-
"@rollup/plugin-typescript": "^11.0.0",
64-
"@testing-library/react": "^13.4.0",
65-
"@types/react": "^18.0.28",
66-
"@types/react-dom": "^18.0.11",
67-
"cross-env": "^7.0.3",
68-
"postcss": "^8.4.21",
69-
"react": "^18.2.0",
70-
"react-dom": "^18.2.0",
71-
"rimraf": "^4.1.2",
72-
"rollup": "^3.15.0",
73-
"rollup-plugin-postcss": "^4.0.2"
7458
}
7559
}

0 commit comments

Comments
 (0)