GLSP-1320: Update to latest glsp dev config

tortmayr · tortmayr · commit d6654e456ae3 · 2024-05-16T01:37:29.000+02:00
- Updates to latest version of @eclipse-glsp/dev - Add generate:index utility script - Regenerate index files - Fix codeActionsOnSave in vscode settings - Refactor upgrade:next script - Reformat code base with prettier - Fix copyright headers (by running a full check with glsp checkHeaders . -t full) Part of eclipse-glsp/glsp#1320
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,5 +25,5 @@ to learn how to report vulnerabilities.
 
 <!-- Please check, when if it applies to your change. -->
 
-- [ ] This PR should be mentioned in the changelog
-- [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)
+-   [ ] This PR should be mentioned in the changelog
+-   [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)
diff --git a/example/workflow/extension/src/workflow-extension.ts b/example/workflow/extension/src/workflow-extension.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/example/workflow/web-extension/src/workflow-extension.ts b/example/workflow/web-extension/src/workflow-extension.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/example/workflow/webview/src/app.ts b/example/workflow/webview/src/app.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/package.json b/package.json
@@ -13,19 +13,24 @@
     "check:pr": "yarn all && yarn check:headers",
     "clean": "lerna run clean && rimraf logs/*.log",
     "compile": "tsc -b",
+    "generate:index": "lerna run generate:index && yarn lint:fix",
     "lint": "eslint --ext .ts,.tsx .",
     "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
+    "lint:fix": "yarn lint --fix",
     "prepare": "yarn build",
     "publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-push",
     "publish:next": "lerna publish preminor --exact --canary --preid next --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes",
     "publish:prepare": "lerna version --ignore-scripts --yes --no-push",
-    "upgrade:next": "yarn upgrade -p \"@eclipse-glsp.*|sprotty.*\" --next ",
-    "watch":  "concurrently --kill-others -n tsc,extension,web-extension -c red,yellow.green \"tsc -b -w --preserveWatchOutput\" \"yarn -s workflow watch:bundle\" \"yarn -s workflow:web watch:bundle\"",
+    "upgrade:next": "glsp upgradeNext",
+    "watch": "concurrently --kill-others -n tsc,extension,web-extension -c red,yellow.green \"tsc -b -w --preserveWatchOutput\" \"yarn -s workflow watch:bundle\" \"yarn -s workflow:web watch:bundle\"",
     "workflow": "yarn --cwd example/workflow/extension",
     "workflow:web": "yarn --cwd example/workflow/web-extension"
   },
+  "resolutions": {
+    "snabbdom": "~3.5.1"
+  },
   "devDependencies": {
-    "@eclipse-glsp/dev": "2.0.0",
+    "@eclipse-glsp/dev": "next",
     "@types/node": "16",
     "@types/vscode": "^1.54.0",
     "concurrently": "^8.2.2",
diff --git a/packages/vscode-integration-webview/package.json b/packages/vscode-integration-webview/package.json
@@ -36,6 +36,7 @@
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo ",
+    "generate:index": "glsp generateIndex src -s -f",
     "lint": "eslint --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },
diff --git a/packages/vscode-integration-webview/src/features/copyPaste/copy-paste-module.ts b/packages/vscode-integration-webview/src/features/copyPaste/copy-paste-module.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration-webview/src/features/default/default-module.ts b/packages/vscode-integration-webview/src/features/default/default-module.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration-webview/src/features/default/extension-action-handler.ts b/packages/vscode-integration-webview/src/features/default/extension-action-handler.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration-webview/src/features/default/vscode-glsp-modelsource.ts b/packages/vscode-integration-webview/src/features/default/vscode-glsp-modelsource.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration-webview/src/glsp-diagram-widget.ts b/packages/vscode-integration-webview/src/glsp-diagram-widget.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018 TypeFox and others.
+ * Copyright (c) 2018-2024 TypeFox and others.
  * Modifications: (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
diff --git a/packages/vscode-integration-webview/src/glsp-starter.ts b/packages/vscode-integration-webview/src/glsp-starter.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018 TypeFox and others.
+ * Copyright (c) 2018-2024 TypeFox and others.
  * Modifications: (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
diff --git a/packages/vscode-integration-webview/src/index.ts b/packages/vscode-integration-webview/src/index.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2020-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@ export * from './diagram-identifier';
 export * from './features/copyPaste/copy-paste-module';
 export * from './features/copyPaste/copy-paste-startup';
 export * from './features/default/default-module';
+export * from './features/default/extension-action-handler';
 export * from './features/default/vscode-glsp-modelsource';
 export * from './features/export/export-module';
 export * from './features/navigation/navigation-module';
diff --git a/packages/vscode-integration/package.json b/packages/vscode-integration/package.json
@@ -41,6 +41,7 @@
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo ",
+    "generate:index": "glsp generateIndex src/browser src/common src/node -s -f",
     "lint": "eslint --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },
diff --git a/packages/vscode-integration/src/browser/index.ts b/packages/vscode-integration/src/browser/index.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-export * from '../common';
 export * from './quickstart-components/browser-glsp-vscode-server';
 export * from './quickstart-components/websocket-glsp-vscode-server';
+export * from './re-export';
diff --git a/packages/vscode-integration/src/browser/quickstart-components/browser-glsp-vscode-server.ts b/packages/vscode-integration/src/browser/quickstart-components/browser-glsp-vscode-server.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BaseGLSPClient, ContainerConfiguration, GLSPClientProxy, GLSPServer, initializeContainer } from '@eclipse-glsp/protocol';
+import { BaseGLSPClient, GLSPClientProxy, GLSPServer } from '@eclipse-glsp/protocol';
+import { ContainerConfiguration, initializeContainer } from '@eclipse-glsp/protocol/lib/di';
 import { Container, ContainerModule } from 'inversify';
 import { BaseGlspVscodeServer, GlspVscodeServerOptions } from '../../common/quickstart-components/base-glsp-vscode-server';
 
diff --git a/packages/vscode-integration/src/browser/re-export.ts b/packages/vscode-integration/src/browser/re-export.ts
@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '../common';
diff --git a/packages/vscode-integration/src/common/client-actions.ts b/packages/vscode-integration/src/common/client-actions.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/common/glsp-vscode-connector.ts b/packages/vscode-integration/src/common/glsp-vscode-connector.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/common/index.ts b/packages/vscode-integration/src/common/index.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '@eclipse-glsp/protocol';
 export * from './client-actions';
 export * from './glsp-vscode-connector';
-export * from './quickstart-components';
+export * from './quickstart-components/base-glsp-vscode-server';
+export * from './quickstart-components/configuration-util';
+export * from './quickstart-components/glsp-editor-provider';
+export * from './quickstart-components/webview-endpoint';
+export * from './re-export';
 export * from './types';
diff --git a/packages/vscode-integration/src/common/quickstart-components/configuration-util.ts b/packages/vscode-integration/src/common/quickstart-components/configuration-util.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/common/quickstart-components/glsp-editor-provider.ts b/packages/vscode-integration/src/common/quickstart-components/glsp-editor-provider.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/common/quickstart-components/webview-endpoint.ts b/packages/vscode-integration/src/common/quickstart-components/webview-endpoint.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/common/re-export.ts b/packages/vscode-integration/src/common/re-export.ts
@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '@eclipse-glsp/protocol';
diff --git a/packages/vscode-integration/src/common/types.ts b/packages/vscode-integration/src/common/types.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/packages/vscode-integration/src/node/index.ts b/packages/vscode-integration/src/node/index.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '../common';
 export * from './quickstart-components/glsp-socket-server-launcher';
 export * from './quickstart-components/node-glsp-vscode-server';
 export * from './quickstart-components/socket-glsp-vscode-server';
+export * from './re-export';
diff --git a/packages/vscode-integration/src/node/quickstart-components/node-glsp-vscode-server.ts b/packages/vscode-integration/src/node/quickstart-components/node-glsp-vscode-server.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BaseGLSPClient, ContainerConfiguration, GLSPClientProxy, GLSPServer, initializeContainer } from '@eclipse-glsp/protocol';
+import { BaseGLSPClient, GLSPClientProxy, GLSPServer } from '@eclipse-glsp/protocol';
+import { ContainerConfiguration, initializeContainer } from '@eclipse-glsp/protocol/lib/di';
 import { Container, ContainerModule } from 'inversify';
 import { BaseGlspVscodeServer, GlspVscodeServerOptions } from '../../common/quickstart-components/base-glsp-vscode-server';
 
diff --git a/packages/vscode-integration/src/node/re-export.ts b/packages/vscode-integration/src/node/re-export.ts
@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '../common';
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/********************************************************************************`
`2`		`- * Copyright (c) 2021-2022 EclipseSource and others.`
	`2`	`+ * Copyright (c) 2021-2024 EclipseSource and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials are made available under the`
`5`	`5`	`* terms of the Eclipse Public License v. 2.0 which is available at`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/********************************************************************************`
`2`		`- * Copyright (c) 2023 EclipseSource and others.`
	`2`	`+ * Copyright (c) 2023-2024 EclipseSource and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials are made available under the`
`5`	`5`	`* terms of the Eclipse Public License v. 2.0 which is available at`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/********************************************************************************`
`2`		`- * Copyright (c) 2020-2021 EclipseSource and others.`
	`2`	`+ * Copyright (c) 2020-2024 EclipseSource and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials are made available under the`
`5`	`5`	`* terms of the Eclipse Public License v. 2.0 which is available at`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/********************************************************************************`
`2`		`- * Copyright (c) 2021-2023 EclipseSource and others.`
	`2`	`+ * Copyright (c) 2021-2024 EclipseSource and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials are made available under the`
`5`	`5`	`* terms of the Eclipse Public License v. 2.0 which is available at`