Merge pull request #69 from kieler/jep/fixBuild

updated node and vsce version to fix "yarn package"
kieler · Jan 14, 2025 · 1d39b64 · 1d39b64
2 parents 112b626 + 505a825
commit 1d39b64
Show file tree

Hide file tree

Showing 7 changed files with 623 additions and 60 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: 16.x
+                  node-version: 23.x
             - run: yarn
             - run: yarn lint
             - run: yarn build

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -6,6 +6,8 @@ name: package
 on:
     push:
         branches: [master]
+    pull_request:
+        branches: [master]   
 
 jobs:
     package:
@@ -16,7 +18,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: 16.x
+                  node-version: 23.x
                   registry-url: 'https://registry.npmjs.org'
                   scope: '@kieler'
             - run: yarn

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: "16.x"
+                  node-version: "23.x"
                   registry-url: 'https://registry.npmjs.org'
                   scope: '@kieler'
             - run: yarn
@@ -35,7 +35,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
-                  node-version: "16.x"
+                  node-version: "23.x"
             - run: yarn
             - run: yarn package
 

diff --git a/extension/.vscodeignore b/extension/.vscodeignore
diff --git a/extension/build-util/prepare-extension-config.js b/extension/build-util/prepare-extension-config.js
diff --git a/extension/package.json b/extension/package.json
@@ -535,14 +535,14 @@
         "onCommand:pasta.getLTLFormula"
     ],
     "files": [
-        "extension",
         "src",
         "src-context-table",
         "src-diagram-snippets",
         "src-language-server",
         "syntaxes",
         "src-webview",
-        "pack"
+        "pack",
+        "icon.png"
     ],
     "main": "./pack/src/extension.cjs",
     "dependencies": {
@@ -554,12 +554,12 @@
         "reflect-metadata": "^0.2.2",
         "feather-icons": "^4.28.0",
         "sprotty-vscode-webview": "^1.0.0",
-        "@kieler/table-webview": "^0.0.7",
+        "@kieler/table-webview": "^0.0.8",
         "snabbdom": "^3.5.1",
         "dayjs": "^1.11.8"
     },
     "devDependencies": {
-        "@types/node": "^14.17.3",
+        "@types/node": "^22.10.6",
         "@types/vscode": "^1.50.0",
         "@types/feather-icons": "^4.7.0",
         "rimraf": "^3.0.2",
@@ -573,7 +573,7 @@
         "file-loader": "^6.2.0",
         "langium-cli": "^3.0.3",
         "style-loader": "^3.3.3",
-        "vsce": "^2.15.0",
+        "@vscode/vsce": "^3.0.0",
         "ovsx": "^0.6.0",
         "esbuild": "^0.21.2"
     },
@@ -586,7 +586,7 @@
         "lint": "eslint .",
         "build": "yarn run langium:generate && tsc -b src src-diagram-snippets src-language-server src-webview src-context-table && node esbuild.mjs",
         "watch": "webpack --watch",
-        "package": "node build-util/prepare-extension-config.js && vsce package --yarn -o pasta.vsix",
+        "package": "vsce package --yarn -o pasta.vsix",
         "predistribute": "yarn run package",
         "distribute": "yarn run distribute:vsce && yarn run distribute:ovsx",
         "distribute:vsce": "vsce publish --yarn --packagePath pasta.vsix",