eclipse-sprotty · spoenemann · Jun 19, 2024 · Jun 17, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,17 +19,7 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '16'
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: adopt
-    - name: Build Xtext Example
-      shell: bash
-      run: |
-        cd examples/states-xtext/language-server
-        ./gradlew build
+        node-version: '18'
     - name: Build Packages
       shell: bash
       run: yarn
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,7 +1,5 @@
 tasks:
-  - init: |
-      examples/states-xtext/language-server/gradlew -p examples/states-xtext/language-server/ build
-      yarn
+  - init: yarn
 
 vscode:
   extensions:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -59,21 +59,6 @@
             ],
             "sourceMaps": true
         },
-        {
-            "name": "States Example (Xtext)",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "${workspaceFolder}/examples/workspace",
-                "--extensionDevelopmentPath=${workspaceFolder}/examples/states-xtext/extension"
-            ],
-            "outFiles": [
-                "${workspaceFolder}/examples/states-xtext/extension/pack/*.js",
-                "${workspaceFolder}/packages/sprotty-vscode/lib/**/*.js"
-            ],
-            "sourceMaps": true
-        },
         {
             "name": "Attach to Language Server",
             "type": "node",

diff --git a/examples/states-langium/extension/esbuild.mjs b/examples/states-langium/extension/esbuild.mjs
@@ -45,7 +45,7 @@ const nodeContext = await esbuild.context({
 });
 
 const browserContext = await esbuild.context({
-    entryPoints: ['../../states-webview/src/main.ts'],
+    entryPoints: ['../webview/src/main.ts'],
     outdir: 'pack/diagram',
     bundle: true,
     target: 'es6',

diff --git a/examples/states-webview/css/diagram.css → ...es/states-langium/webview/css/diagram.css b/examples/states-webview/css/diagram.css → ...es/states-langium/webview/css/diagram.css
diff --git a/examples/states-webview/css/popup.css → ...ples/states-langium/webview/css/popup.css b/examples/states-webview/css/popup.css → ...ples/states-langium/webview/css/popup.css
diff --git a/examples/states-webview/package.json → examples/states-langium/webview/package.json b/examples/states-webview/package.json → examples/states-langium/webview/package.json
diff --git a/.../states-webview/src/custom-edge-router.ts → ...langium/webview/src/custom-edge-router.ts b/.../states-webview/src/custom-edge-router.ts → ...langium/webview/src/custom-edge-router.ts
diff --git a/examples/states-webview/src/di.config.ts → ...s/states-langium/webview/src/di.config.ts b/examples/states-webview/src/di.config.ts → ...s/states-langium/webview/src/di.config.ts
diff --git a/examples/states-webview/src/html-views.tsx → ...states-langium/webview/src/html-views.tsx b/examples/states-webview/src/html-views.tsx → ...states-langium/webview/src/html-views.tsx
diff --git a/examples/states-webview/src/main.ts → examples/states-langium/webview/src/main.ts b/examples/states-webview/src/main.ts → examples/states-langium/webview/src/main.ts
diff --git a/examples/states-webview/src/model.ts → examples/states-langium/webview/src/model.ts b/examples/states-webview/src/model.ts → examples/states-langium/webview/src/model.ts
diff --git a/examples/states-webview/src/views.tsx → ...ples/states-langium/webview/src/views.tsx b/examples/states-webview/src/views.tsx → ...ples/states-langium/webview/src/views.tsx
diff --git a/examples/states-webview/tsconfig.json → ...ples/states-langium/webview/tsconfig.json b/examples/states-webview/tsconfig.json → ...ples/states-langium/webview/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../configs/base.tsconfig.json",
+	"extends": "../../../configs/base.tsconfig.json",
 	"compilerOptions": {
     "jsx": "react",
     "rootDir": "src",

diff --git a/examples/states-webview/webpack.config.js → .../states-langium/webview/webpack.config.js b/examples/states-webview/webpack.config.js → .../states-langium/webview/webpack.config.js
diff --git a/examples/states-xtext/README.md b/examples/states-xtext/README.md
diff --git a/examples/states-xtext/extension/.vscodeignore b/examples/states-xtext/extension/.vscodeignore
diff --git a/examples/states-xtext/extension/README.md b/examples/states-xtext/extension/README.md
diff --git a/examples/states-xtext/extension/icon.png b/examples/states-xtext/extension/icon.png
diff --git a/examples/states-xtext/extension/icon.svg b/examples/states-xtext/extension/icon.svg
diff --git a/examples/states-xtext/extension/language-configuration.json b/examples/states-xtext/extension/language-configuration.json
diff --git a/examples/states-xtext/extension/package.json b/examples/states-xtext/extension/package.json
diff --git a/examples/states-xtext/extension/server/.gitignore b/examples/states-xtext/extension/server/.gitignore