chore: update dependencies

mathuo · Oct 22, 2023 · 8e6f7bf · 8e6f7bf
1 parent 318cbd6
commit 8e6f7bf
Show file tree

Hide file tree

Showing 12 changed files with 1,208 additions and 1,955 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,6 @@ jobs:
                       ${{ runner.os }}-node-
 
             - run: yarn
-            - run: npm run bootstrap
             - run: npm run build
             - run: npm run test:cov
             - name: SonarCloud Scan

diff --git a/jest-setup.ts b/jest-setup.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom';
diff --git a/jest.config.ts b/jest.config.ts
@@ -8,7 +8,7 @@ const config: JestConfigWithTsJest = {
     collectCoverageFrom: ['<rootDir>/packages/*/src/**/*.{js,jsx,ts,tsx}'],
     coveragePathIgnorePatterns: [
         '/node_modules/',
-        '<rootDir>packages/*/src/__tests__/',
+        '<rootDir>/packages/*/src/__tests__/',
     ],
     coverageDirectory: 'coverage',
     testResultsProcessor: 'jest-sonar-reporter',

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "useWorkspaces": true,
   "version": "1.8.4",
   "npmClient": "yarn",
   "command": {

diff --git a/package.json b/package.json
@@ -1,76 +1,71 @@
 {
   "name": "dockview-monorepo-root",
   "private": true,
+  "description": "Monorepo for https://github.com/mathuo/dockview",
+  "homepage": "https://github.com/mathuo/dockview#readme",
+  "bugs": {
+    "url": "https://github.com/mathuo/dockview/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mathuo/dockview.git"
+  },
+  "license": "MIT",
+  "author": "https://github.com/mathuo",
   "workspaces": [
     "packages/*"
   ],
-  "nohoist": [
-    "**/babel-jest",
-    "**/babel-jest/**"
-  ],
-  "description": "Monorepo for https://github.com/mathuo/dockview",
   "scripts": {
-    "test": "jest",
-    "lint": "eslint packages/**/src/** --ext .ts,.tsx,.js,.jsx",
-    "package": "node scripts/package.js",
-    "package-all": "lerna run docs --scope '{dockview-core,dockview}' && node scripts/package.js",
     "build": "lerna run build --scope '{dockview-core,dockview}'",
     "clean": "lerna run clean",
-    "bootstrap": "lerna bootstrap",
-    "test:cov": "jest --coverage",
-    "set-experimental-versions": "node scripts/set-experimental-versions",
-    "version-beta-build": "lerna version prerelease --preid beta",
-    "publish-app": "lerna publish",
     "docs": "typedoc",
+    "generate-docs": "node scripts/docs.mjs",
+    "lint": "eslint packages/**/src/** --ext .ts,.tsx,.js,.jsx",
+    "package": "node scripts/package.js",
     "package-docs": "node scripts/package-docs.js",
-    "generate-docs": "node scripts/docs.mjs"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mathuo/dockview.git"
+    "set-experimental-versions": "node scripts/set-experimental-versions",
+    "test": "jest",
+    "test:cov": "jest --coverage",
+    "version": "lerna version"
   },
-  "author": "https://github.com/mathuo",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/mathuo/dockview/issues"
+  "resolutions": {
+    "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14"
   },
-  "homepage": "https://github.com/mathuo/dockview#readme",
   "devDependencies": {
-    "@testing-library/dom": "^8.20.0",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.5",
+    "@testing-library/dom": "^9.3.3",
+    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/react": "^14.0.0",
     "@total-typescript/shoehorn": "^0.1.1",
-    "@types/jest": "^29.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
-    "codecov": "^3.8.3",
+    "@types/jest": "^29.5.6",
+    "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.7.3",
-    "eslint": "^8.34.0",
-    "fs-extra": "^11.1.0",
+    "eslint": "^8.52.0",
+    "fs-extra": "^11.1.1",
     "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",
-    "gulp-dart-sass": "^1.0.2",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.4.3",
+    "gulp-dart-sass": "^1.1.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-sonar-reporter": "^2.0.0",
-    "jsdom": "^21.1.0",
-    "lerna": "^6.5.1",
-    "merge2": "^1.4.1",
-    "rimraf": "^4.1.2",
-    "sass": "^1.58.1",
-    "sass-loader": "^13.2.0",
-    "style-loader": "^3.3.1",
-    "ts-jest": "^29.0.5",
-    "ts-loader": "^9.4.2",
+    "jsdom": "^22.1.0",
+    "lerna": "^7.4.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "rimraf": "^5.0.5",
+    "rollup": "^4.1.4",
+    "rollup-plugin-postcss": "^4.0.2",
+    "ts-jest": "^29.1.1",
+    "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
-    "tslib": "^2.5.0",
-    "typedoc": "^0.24.7",
-    "typescript": "^4.9.5",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
-  },
-  "dependencies": {
-    "@microsoft/tsdoc": "^0.14.2"
+    "tslib": "^2.6.2",
+    "typedoc": "^0.25.2",
+    "typescript": "^5.2.2"
   }
 }
diff --git a/packages/dockview-core/jest.config.ts b/packages/dockview-core/jest.config.ts
@@ -12,6 +12,7 @@ const config: JestConfigWithTsJest = {
     setupFiles: [
         '<rootDir>/packages/dockview-core/src/__tests__/__mocks__/resizeObserver.js',
     ],
+    setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
     coveragePathIgnorePatterns: ['/node_modules/'],
     modulePathIgnorePatterns: [
         '<rootDir>/packages/dockview-core/src/__tests__/__mocks__',

diff --git a/packages/dockview-core/package.json b/packages/dockview-core/package.json
@@ -2,35 +2,6 @@
   "name": "dockview-core",
   "version": "1.8.4",
   "description": "Zero dependency layout manager supporting tabs, grids and splitviews with ReactJS support",
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/cjs/index.d.ts",
-  "module": "./dist/esm/index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mathuo/dockview.git"
-  },
-  "bugs": {
-    "url": "https://github.com/mathuo/dockview/issues"
-  },
-  "homepage": "https://github.com/mathuo/dockview",
-  "scripts": {
-    "build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
-    "build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
-    "build:css": "gulp sass",
-    "build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
-    "build:bundles": "rollup -c",
-    "build": "npm run build:package && npm run build:bundles",
-    "clean": "rimraf dist/ .build/ .rollup.cache/",
-    "prepublishOnly": "npm run rebuild && npm run test",
-    "docs": "typedoc",
-    "rebuild": "npm run clean && npm run build",
-    "test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core",
-    "test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core --coverage"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
   "keywords": [
     "splitview",
     "split-view",
@@ -52,15 +23,34 @@
     "react",
     "react-component"
   ],
-  "author": "https://github.com/mathuo",
+  "homepage": "https://github.com/mathuo/dockview",
+  "bugs": {
+    "url": "https://github.com/mathuo/dockview/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mathuo/dockview.git"
+  },
   "license": "MIT",
-  "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.0",
-    "@rollup/plugin-typescript": "^11.0.0",
-    "cross-env": "^7.0.3",
-    "postcss": "^8.4.21",
-    "rimraf": "^4.1.2",
-    "rollup": "^3.15.0",
-    "rollup-plugin-postcss": "^4.0.2"
+  "author": "https://github.com/mathuo",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/cjs/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "npm run build:package && npm run build:bundles",
+    "build:bundles": "rollup -c",
+    "build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
+    "build:css": "gulp sass",
+    "build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
+    "build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
+    "clean": "rimraf dist/ .build/ .rollup.cache/",
+    "prepublishOnly": "npm run rebuild && npm run test",
+    "rebuild": "npm run clean && npm run build",
+    "test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core",
+    "test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview-core --coverage"
   }
 }
diff --git a/packages/dockview/jest.config.ts b/packages/dockview/jest.config.ts
@@ -1,7 +1,4 @@
 import { JestConfigWithTsJest } from 'ts-jest';
-import { join, normalize } from 'path';
-
-const tsconfig = normalize(join(__dirname, '..', '..', 'tsconfig.test.json'));
 
 const config: JestConfigWithTsJest = {
     preset: 'ts-jest',
@@ -15,7 +12,7 @@ const config: JestConfigWithTsJest = {
     setupFiles: [
         '<rootDir>/packages/dockview/src/__tests__/__mocks__/resizeObserver.js',
     ],
-    setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
+    setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
     coveragePathIgnorePatterns: ['/node_modules/'],
     modulePathIgnorePatterns: [
         '<rootDir>/packages/dockview/src/__tests__/__mocks__',

diff --git a/packages/dockview/package.json b/packages/dockview/package.json
@@ -2,35 +2,6 @@
   "name": "dockview",
   "version": "1.8.4",
   "description": "Zero dependency layout manager supporting tabs, grids and splitviews with ReactJS support",
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/cjs/index.d.ts",
-  "module": "./dist/esm/index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mathuo/dockview.git"
-  },
-  "bugs": {
-    "url": "https://github.com/mathuo/dockview/issues"
-  },
-  "homepage": "https://github.com/mathuo/dockview",
-  "scripts": {
-    "build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
-    "build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
-    "build:css": "gulp sass",
-    "build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
-    "build:bundles": "rollup -c",
-    "build": "npm run build:package && npm run build:bundles",
-    "clean": "rimraf dist/ .build/ .rollup.cache/",
-    "docs": "typedoc",
-    "prepublishOnly": "npm run rebuild && npm run test",
-    "rebuild": "npm run clean && npm run build",
-    "test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview",
-    "test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview --coverage"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
   "keywords": [
     "splitview",
     "split-view",
@@ -52,24 +23,37 @@
     "react",
     "react-component"
   ],
-  "author": "https://github.com/mathuo",
+  "homepage": "https://github.com/mathuo/dockview",
+  "bugs": {
+    "url": "https://github.com/mathuo/dockview/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mathuo/dockview.git"
+  },
   "license": "MIT",
+  "author": "https://github.com/mathuo",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/cjs/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "npm run build:package && npm run build:bundles",
+    "build:bundles": "rollup -c",
+    "build:cjs": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.json --extendedDiagnostics",
+    "build:css": "gulp sass",
+    "build:esm": "cross-env ../../node_modules/.bin/tsc --project ./tsconfig.esm.json --extendedDiagnostics",
+    "build:package": "npm run build:cjs && npm run build:esm && npm run build:css",
+    "clean": "rimraf dist/ .build/ .rollup.cache/",
+    "prepublishOnly": "npm run rebuild && npm run test",
+    "rebuild": "npm run clean && npm run build",
+    "test": "cross-env ../../node_modules/.bin/jest --selectProjects dockview",
+    "test:cov": "cross-env ../../node_modules/.bin/jest --selectProjects dockview --coverage"
+  },
   "dependencies": {
     "dockview-core": "^1.8.4"
-  },
-  "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-terser": "^0.4.0",
-    "@rollup/plugin-typescript": "^11.0.0",
-    "@testing-library/react": "^13.4.0",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "cross-env": "^7.0.3",
-    "postcss": "^8.4.21",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rimraf": "^4.1.2",
-    "rollup": "^3.15.0",
-    "rollup-plugin-postcss": "^4.0.2"
   }
 }