aml-org · tomsfernandez · Dec 28, 2023 · Dec 28, 2023 · Dec 28, 2023 · Dec 28, 2023
diff --git a/.gitignore b/.gitignore
@@ -25,13 +25,10 @@ vendor/
 # Don't store the wasm code
 wrappers/js/lib/main.wasm
 wrappers/js/lib/main.wasm.gz
-wrappers/js-web/lib/main.wasm.gz
-wrappers/js-web/dist/**
-
-# Don't store node moudles
+wrappers/js/dist
 wrappers/js/node_modules
-wrappers/js-web/node_modules
-wrappers/js-web/test/out
+wrappers/js/test/browser/out
+
 amf.jar
 acv
 

diff --git a/Dockerfile b/Dockerfile
@@ -22,29 +22,14 @@ RUN apt-get update && apt-get install make
 # Install
 RUN make ci-java
 
-FROM node:16 AS ci-js
-
-# First copy dependencies to enable Docker caching them
+FROM cypress/included:11.2.0 as ci-js
 COPY . ./src
 WORKDIR ./src/wrappers/js
-RUN npm install
-
-# JS-WEB
-WORKDIR ../js-web
-RUN npm install
-
-WORKDIR ../js
-
-# Copy generated WASM
 COPY --from=ci-go /go/src/wrappers/js/lib/main.wasm.gz ./lib
 
-WORKDIR ../../
-RUN make ci-js
-
-FROM cypress/included:11.2.0 as ci-browser
-COPY --from=ci-js /src ./src
-WORKDIR ./src
-RUN ./scripts/ci-browser.sh
+RUN npm install
+RUN npm run build
+RUN npm test
 
 FROM ci-go AS go-coverage
 RUN make go-coverage

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -42,18 +42,6 @@ pipeline {
                 echo "Success" // Tests are actually run when building the agent in the Dockerfile
             }
         }
-        stage('Test generated WASM (JS Browser)') {
-            agent {
-                dockerfile {
-                    filename 'Dockerfile'
-                    additionalBuildArgs  '--target ci-browser'
-                    registryCredentialsId 'dockerhub-pro-credentials'
-                }
-            }
-            steps {
-                echo "Success" // Tests are actually run when building the agent in the Dockerfile
-            }
-        }
         stage('Coverage') {
             agent {
                 dockerfile {
@@ -151,19 +139,13 @@ pipeline {
                           npm-snapshot $BUILD_NUMBER
                       fi
                       VERSION=$(node -pe "require('./package.json').version")
-                      npm publish --access public
-
-                      cd ../js-web
-                      if [ "$IS_SNAPSHOT" = true ]; then
-                          npm-snapshot $BUILD_NUMBER
-                      fi
+                      npm install
+                      npm run build
                       npm publish --access public
 
                       if [ "$IS_SNAPSHOT" = true ]; then
-                          npm dist-tag add @aml-org/amf-custom-validator-web@${VERSION} snapshot
                           npm dist-tag add @aml-org/amf-custom-validator@${VERSION} snapshot
                       else
-                          npm dist-tag add @aml-org/amf-custom-validator-web@${VERSION} release
                           npm dist-tag add @aml-org/amf-custom-validator@${VERSION} release
                       fi
 

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ go-coverage:
 
 # must run build-js first
 test-js:
-	cd ./wrappers/js && npm install && npm test
+	cd ./wrappers/js && npm install && npm run build && npm test
 
 # must have a downloaded AMF CLI
 test-profiles:
@@ -36,22 +36,18 @@ build-native:
 	go build -o acv ./cmd/main.go
 
 build-js:
-	./scripts/gen_js_package.sh
+	GOOS=js GOARCH=wasm go build -o wrappers/js/lib/main.wasm -ldflags "-s -w" js/validator.go &&\
+	gzip -9 -v -c wrappers/js/lib/main.wasm > wrappers/js/lib/main.wasm.gz &&\
+    rm wrappers/js/lib/main.wasm
 
 build-js-web: build-js bundle-web-js
 
-bundle-web-js:
-	./scripts/bundle_js_web_package.sh
-
 ## CI =====================================================================================
 
 ci-go: test-go build-native build-js
 
 ci-js: test-js
 
-ci-browser:
-	./scripts/ci-browser.sh
-
 ci-java:
 	./scripts/download-amf-cli.sh
 	./scripts/validate-profiles.sh

diff --git a/scripts/bundle_js_web_package.sh b/scripts/bundle_js_web_package.sh
diff --git a/scripts/ci-browser-local.sh b/scripts/ci-browser-local.sh
diff --git a/scripts/ci-browser.sh b/scripts/ci-browser.sh
diff --git a/scripts/gen_js_package.sh b/scripts/gen_js_package.sh
diff --git a/wrappers/js-web/index.js b/wrappers/js-web/index.js