Merge pull request #13 from lstreckeisen/setup-cml-grammar

cleanup && fix build output

Author: lstreckeisen

.github/workflows/build.yml

@@ -52,7 +52,7 @@ jobs:
         run: yarn build
 
       - name: Bundle
-        run: yarn bundle:language-server && cp cml-ls.package.json cml-ls/package.json
+        run: yarn bundle:language-server
 
       - name: Upload language server artifact
         uses: actions/upload-artifact@v4

.yarn/install-state.gz

@@ -20,7 +20,9 @@ const ctx = await esbuild.context({
     entryPoints: ['src/language/main.ts'],
     outdir: 'dist',
     bundle: true,
-    target: "ES2017",
+    target: "ESNext",
+    format: 'cjs',
+    outExtension: { '.js': '.cjs' },
     // VSCode's extension host is still using cjs, so we need to transform the code
     loader: { '.ts': 'ts' },
     platform: 'node',

cml-ls.package.json

@@ -15,9 +15,9 @@
         "type": "url",
         "url": "https://github.com/lstreckeisen/context-mapper-language-server.git"
     },
-    "main": "cml-ls/index.js",
+    "main": "cml-ls/index.cjs",
     "bin": {
-        "cml-language-server": "cml-ls/index.js"
+        "cml-language-server": "cml-ls/index.cjs"
     },
     "scripts": {
         "build": "tsc -b tsconfig.src.json && node esbuild.mjs",
@@ -27,7 +27,7 @@
         "langium:generate": "langium generate",
         "langium:generate:production": "langium generate --mode=production",
         "langium:watch": "langium generate --watch",
-        "bundle:language-server": "npx ncc build dist/main.js -o cml-ls",
+        "bundle:language-server": "npx ncc build dist/main.cjs -o cml-ls",
         "test": "vitest run",
         "clean": "rm -rf src/language/generated && rm -rf cml-ls/ && rm -rf dist/"
     },

esbuild.mjs

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "ES2017",
+        "target": "ESNext",
         "module": "Node16",
         "lib": [
             "ESNext",

package.json

@@ -506,7 +506,7 @@ __metadata:
     vscode-languageserver: "npm:~9.0.1"
     vscode-languageserver-types: "npm:~3.17.5"
   bin:
-    cml-language-server: cml-ls/index.js
+    cml-language-server: cml-ls/index.cjs
   languageName: unknown
   linkType: soft