[LS] Restore WASM build (#345)

onflow · Apr 16, 2024 · 804d55b · 804d55b
1 parent fe1e785
commit 804d55b
Show file tree

Hide file tree

Showing 6 changed files with 648 additions and 524 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,6 +45,8 @@ jobs:
       with:
         fetch-depth: 0
     - uses: actions/setup-go@v3
+      with:
+        go-version: '1.20'
     - uses: actions/cache@v1
       with:
         path: ~/go/pkg/mod
@@ -66,6 +68,8 @@ jobs:
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v3
+        with:
+          go-version: '1.20'
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
@@ -89,6 +93,8 @@ jobs:
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v3
+        with:
+          go-version: '1.20'
       - uses: actions/setup-node@v2
         with:
           node-version: '15'
@@ -118,6 +124,8 @@ jobs:
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v3
+        with:
+          go-version: '1.20'
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
@@ -137,6 +145,8 @@ jobs:
       with:
         fetch-depth: 0
     - uses: actions/setup-go@v3
+      with:
+        go-version: '1.20'
     - uses: actions/cache@v1
       with:
         path: ~/go/pkg/mod

diff --git a/languageserver/Makefile b/languageserver/Makefile
@@ -25,7 +25,7 @@ PATH := $(PATH):$(GOPATH)/bin
 .PHONY: build
 build:
 	go build -o ./cmd/languageserver/languageserver ./cmd/languageserver
-	# TODO: GOARCH=wasm GOOS=js go build -o ./cmd/languageserver/languageserver.wasm ./cmd/languageserver
+	GOARCH=wasm GOOS=js go build -o ./cmd/languageserver/languageserver.wasm -tags no_cgo ./cmd/languageserver
 
 .PHONY: generate
 generate:
@@ -34,7 +34,7 @@ generate:
 	go mod tidy
 
 .PHONY: test
-test: e2e-test generate unit-test # TODO: wasm-test
+test: e2e-test generate unit-test wasm-test
 
 .PHONY: unit-test
 unit-test:

diff --git a/npm-packages/cadence-language-server/jest.config.js b/npm-packages/cadence-language-server/jest.config.js
@@ -4,5 +4,6 @@ module.exports = {
       "^.+\\.[tj]s$": "ts-jest"
   },
   setupFilesAfterEnv: [ './tests/setup.js' ],
-  testPathIgnorePatterns: ["/node_modules/", "/dist/"]
+  testPathIgnorePatterns: ["/node_modules/", "/dist/"],
+  testTimeout: 10000,
 };
diff --git a/npm-packages/cadence-language-server/package.json b/npm-packages/cadence-language-server/package.json
@@ -9,7 +9,7 @@
   },
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc && cd ../../languageserver && GOARCH=wasm GOOS=js go build -o ../npm-packages/cadence-language-server/dist/cadence-language-server.wasm ./cmd/languageserver && cd ../npm-packages/cadence-language-server",
+    "build": "tsc && cd ../../languageserver && GOARCH=wasm GOOS=js go build -o ../npm-packages/cadence-language-server/dist/cadence-language-server.wasm -tags no_cgo ./cmd/languageserver && cd ../npm-packages/cadence-language-server",
     "test": "jest"
   },
   "license": "Apache-2.0",