Skip to content

Commit

Permalink
chore: update typescript version and tsconfigs
Browse files Browse the repository at this point in the history
- Simplify devDependencies
  - Move all eslint related devDependencies to main package.json
- Update typescript and rimraf versions
- Update lerna version

Part of GH-2
  • Loading branch information
ndoschek committed Oct 15, 2024
1 parent 9f3c5e5 commit e3694fa
Show file tree
Hide file tree
Showing 37 changed files with 1,659 additions and 1,920 deletions.
6 changes: 2 additions & 4 deletions examples/guide/model-hub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/guide/model-hub/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
5 changes: 2 additions & 3 deletions examples/guide/model-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"rimraf": "^6.0.1",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"scripts": {
"example:advancedcommands": "ts-node src/model-commands-advanced.ts",
Expand Down
3 changes: 1 addition & 2 deletions examples/guide/model-management/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion examples/theia/browser-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"devDependencies": {
"@theia/cli": "*",
"rimraf": "^4.1.2"
"rimraf": "^6.0.1"
},
"scripts": {
"build": "theia build --mode development",
Expand Down
3 changes: 2 additions & 1 deletion examples/theia/electron-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
},
"devDependencies": {
"@theia/cli": "*",
"electron": "^23.2.4"
"electron": "^23.3.13",
"rimraf": "^6.0.1"
},
"scripts": {
"build": "theia build --mode development",
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-a-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@eclipse-emfcloud/model-manager": "*"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-a-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-a-model-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"fast-json-patch": "^3.1.1"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-a-model-service/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-a-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-a-view/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-b-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@eclipse-emfcloud/model-manager": "*"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-b-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-b-model-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"fast-json-patch": "^3.1.1"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-b-model-service/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-b-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-b-view/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions examples/theia/model-hub-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@eclipse-emfcloud/model-service-theia": "*"
},
"devDependencies": {
"rimraf": "^4.1.2",
"typescript": "~4.9.5"
"rimraf": "^6.0.1",
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
Expand Down
3 changes: 1 addition & 2 deletions examples/theia/model-hub-integration/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
4 changes: 2 additions & 2 deletions ext/model-service-theia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.1.2",
"rimraf": "^6.0.1",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"theiaExtensions": [
{
Expand Down
3 changes: 1 addition & 2 deletions ext/model-service-theia/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"version": "independent",
"useWorkspaces": true,
"useNx": false,
"npmClient": "yarn",
"command": {
Expand Down
14 changes: 2 additions & 12 deletions npm/model-accessor-bus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,16 @@
"@types/node": "^16.10.3",
"@types/sinon": "^10.0.13",
"@types/sinon-chai": "^3.2.9",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"chai": "^4.3.4",
"chai-like": "^1.1.1",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-chai-friendly": "0.7.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.1.2",
"rimraf": "^6.0.1",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn clean && yarn build",
Expand Down
3 changes: 1 addition & 2 deletions npm/model-accessor-bus/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
15 changes: 2 additions & 13 deletions npm/model-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,17 @@
"@types/node": "^16.10.3",
"@types/sinon": "^10.0.13",
"@types/sinon-chai": "^3.2.9",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
"chai-like": "^1.1.1",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-chai-friendly": "0.7.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.1.2",
"rimraf": "^6.0.1",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn clean && yarn build",
Expand Down
2 changes: 1 addition & 1 deletion npm/model-manager/src/impl/core-command-stack-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ const appendForOp = <K = string>(

let result: AppendableCompoundCommand<K>;

if (base instanceof AppendableCompoundCommand<K>) {
if (base instanceof AppendableCompoundCommand) {
result = base;
base.append(...commands);
} else {
Expand Down
3 changes: 1 addition & 2 deletions npm/model-manager/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
13 changes: 2 additions & 11 deletions npm/model-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,14 @@
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
"chai-like": "^1.1.1",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-chai-friendly": "0.7.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.1.2",
"rimraf": "^6.0.1",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn clean && yarn build",
Expand Down
3 changes: 1 addition & 2 deletions npm/model-service/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
15 changes: 2 additions & 13 deletions npm/model-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,15 @@
"@types/mocha": "^9.0.0",
"@types/node": "^16.10.3",
"@types/sinon": "^10.0.13",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"chai": "^4.3.4",
"chai-like": "^1.1.1",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-chai-friendly": "0.7.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.1.2",
"rimraf": "^6.0.1",
"sinon": "^15.0.1",
"ts-node": "^10.9.1",
"typescript": "~4.9.5"
"typescript": "~5.6.3"
},
"scripts": {
"prepare": "yarn clean && yarn build",
Expand Down
Loading

0 comments on commit e3694fa

Please sign in to comment.