Revert build changes (#95)

* Revert "tests: fix loading wasm when targeting external deps (#94)"

This reverts commit bcc6ce4.

* Revert "fix: cannot resolve path when build with EXTERNAL_PATH (#93)"

This reverts commit 8ea767a.

* Revert "Support building for externally shared js builtins (#91)"

This reverts commit 1c5072c.

Author: guybedford

.babelrc

@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    [
+      "@babel/plugin-transform-modules-commonjs",
+      {
+        "strict": true
+      },
+    ]
+  ]
+}

.github/workflows/build.yml

@@ -2,72 +2,79 @@ name: Test
 
 on:
   push:
+    branches: main
   pull_request:
     branches: main
 
+env:
+  WASI_VERSION: 12
+  WASI_VERSION_FULL: "12.0"
+  WABT_VERSION: "1.0.24"
+  EMCC_VERSION: "1.40.1-fastcomp"
+
 jobs:
   build:
-    runs-on: ubuntu-latest
-    env:
-      WASI_SDK_VERSION: "21"
-      WASI_SDK_PATH: /opt/wasi-sdk
-      WABT_VERSION: "1.0.34"
-      WABT_PATH: /opt/wabt
-      BINARYEN_VERSION: "117"
-      BINARYEN_PATH: /opt/binaryen
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          cache: 'npm'
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: preparation
+        run: |
+          export PWD=$(pwd);
+          echo "::set-output name=PROJ_ROOT::$PWD";
 
       - name: Install
-        run: npm ci
+        run: npm install
 
-      - name: "Restore WASI SDK"
-        id: cache-wasi-sdk
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.WASI_SDK_PATH }}
-          key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}
-      - name: "Install WASI SDK"
-        if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
-        run: |
-          mkdir ${{ env.WASI_SDK_PATH }} && \
-          curl -s -S --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${{ env.WASI_SDK_VERSION }}/wasi-sdk-${{ env.WASI_SDK_VERSION }}.0-linux.tar.gz | \
-          tar --strip-components 1 --directory ${{ env.WASI_SDK_PATH }} --extract --gunzip
-      - name: "Restore WABT"
-        id: cache-wabt
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.WABT_PATH }}
-          key: ${{ runner.os }}-wabt-${{ env.WABT_VERSION }}
-      - name: "Install WABT"
-        if: steps.cache-wabt.outputs.cache-hit != 'true'
+      - name: Install wasi-sdk
+        env:
+          PROJ_ROOT: ${{ steps.preparation.outputs.PROJ_ROOT }}
         run: |
-          mkdir ${{ env.WABT_PATH }} && \
-          curl -s -S --location https://github.com/WebAssembly/wabt/releases/download/${{ env.WABT_VERSION }}/wabt-${{ env.WABT_VERSION }}-ubuntu.tar.gz | \
-          tar --strip-components 1 --directory ${{ env.WABT_PATH }} --extract --gunzip
-      - name: "Restore Binaryen"
-        id: cache-binaryen
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.BINARYEN_PATH }}
-          key: ${{ runner.os }}-binaryen-${{ env.BINARYEN_VERSION }}
-      - name: "Install Binaryen"
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
+          cd $PROJ_ROOT;
+          cd ../;
+          export WASI_OS="linux"
+          curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-${WASI_OS}.tar.gz -O
+          # check if package downloaded
+          ls -la
+          tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_OS}.tar.gz
+          # print clang version
+          ./wasi-sdk-${WASI_VERSION_FULL}/bin/clang --version
+      - name: Install wabt
+        env:
+          PROJ_ROOT: ${{ steps.preparation.outputs.PROJ_ROOT }}
         run: |
-          mkdir ${{ env.BINARYEN_PATH }} && \
-          curl -s -S --location https://github.com/WebAssembly/binaryen/releases/download/version_${{ env.BINARYEN_VERSION }}/binaryen-version_${{ env.BINARYEN_VERSION }}-x86_64-linux.tar.gz | \
-          tar --strip-components 1 --directory ${{ env.WABT_PATH }} --extract --gunzip
+          cd $PROJ_ROOT;
+          cd ../;
+          if [[ "$RUNNER_OS" == "Linux" ]]; then
+            export WABT_OS="ubuntu";
+          fi
+          if [[ "$RUNNER_OS" == "macOS" ]]; then
+            export WABT_OS="macos";
+          fi
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            export WABT_OS="windows";
+          fi
+          curl -sL https://github.com/WebAssembly/wabt/releases/download/${WABT_VERSION}/wabt-${WABT_VERSION}-${WABT_OS}.tar.gz -O
+          # check if package downloaded
+          ls -la
+          tar xvf wabt-${WABT_VERSION}-${WABT_OS}.tar.gz
+          # check if wabt binaries installed
+          ls -la ./wabt-${WABT_VERSION}/bin/
       - name: Compile to Wasm & Test Wasm
+        env:
+          PROJ_ROOT: ${{ steps.preparation.outputs.PROJ_ROOT }}
         run: |
+          cd $PROJ_ROOT;
           rm lib/lexer.wasm;
           npm run build-wasm;
           npm run build;
           # test
           npm run test;
       - name: Benchmark Wasm
-        run: npm run bench;
+        env:
+          PROJ_ROOT: ${{ steps.preparation.outputs.PROJ_ROOT }}
+        run: |
+          cd $PROJ_ROOT;
+          npm run bench;

.github/workflows/node.js.yml

@@ -0,0 +1,30 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

Makefile

@@ -1,26 +1,10 @@
 # These flags depend on the system and may be overridden
-
-ifeq ($(WASI_SDK_PATH),)
 WASM_CC := ../wasi-sdk-12.0/bin/clang
 WASM_CFLAGS := --sysroot=../wasi-sdk-12.0/share/wasi-sysroot
-else
-WASM_CC := $(WASI_SDK_PATH)/bin/clang
-WASM_CFLAGS := --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot
-endif
-
 WASM_LDFLAGS := -nostartfiles
 
-ifeq ($(WABT_PATH),)
 WASM2WAT := ../wabt/bin/wasm2wat
-else
-WASM2WAT := $(WABT_PATH)/bin/wasm2wat
-endif
-
-ifeq ($(BINARYEN_PATH),)
 WASM_OPT := ../binaryen/bin/wasm-opt
-else
-WASM_OPT := $(BINARYEN_PATH)/bin/wasm-opt
-endif
 
 # These are project-specific and are expected to be kept intact
 WASM_EXTRA_CFLAGS := -I include-wasm/ -Wno-logical-op-parentheses -Wno-parentheses -Oz

build.js

@@ -1,73 +1,25 @@
 const fs = require('fs');
-const { buildSync } = require('esbuild');
-const path = require('path/posix')
+const terser = require('terser');
 
-const { EXTERNAL_PATH } = process.env;
-const MINIFY = !EXTERNAL_PATH;
+const MINIFY = true;
 
 try { fs.mkdirSync('./dist'); }
 catch (e) {}
 
 const wasmBuffer = fs.readFileSync('./lib/lexer.wasm');
+const jsSource = fs.readFileSync('./src/lexer.js').toString();
 const pjson = JSON.parse(fs.readFileSync('./package.json').toString());
 
-buildSync({
-  entryPoints: ['./src/lexer.js'],
-  outfile: './dist/lexer.mjs',
-  bundle: true,
-  minify: MINIFY,
-  platform: 'node',
-  format: 'esm',
-  banner: {
-    js: `/* cjs-module-lexer ${pjson.version} */`
-  },
-  define: EXTERNAL_PATH ? {
-    WASM_BINARY: 'undefined',
-    EXTERNAL_PATH: `'${path.join(EXTERNAL_PATH, 'lib/lexer.wasm')}'`,
-  } : {
-    WASM_BINARY: `'${wasmBuffer.toString('base64')}'`,
-    EXTERNAL_PATH: 'undefined'
-  }
-})
+const jsSourceProcessed = jsSource.replace('WASM_BINARY', wasmBuffer.toString('base64'));
 
-if (EXTERNAL_PATH) {
-  buildSync({
-    stdin: {
-      contents: `'use strict';
-let lazy;
-async function init () {
-  if (!lazy) {
-    lazy = await import(require('node:url').pathToFileURL(require('node:module').createRequire('${EXTERNAL_PATH}/dist/lexer.js').resolve('./lexer.mjs')));
+const minified = MINIFY && terser.minify(jsSourceProcessed, {
+  module: true,
+  output: {
+    preamble: `/* cjs-module-lexer ${pjson.version} */`
   }
-  module.exports = lazy;
-  return lazy.init();
-}
-
-function parse (source, name = '@') {
-  if (!lazy)
-    throw new Error('Not initialized');
-
-  return lazy.parse(source, name);
-}
+});
 
-module.exports = { init, parse };`,
-      loader: 'js',
-    },
-    outfile: './dist/lexer.js',
-    minify: MINIFY,
-    platform: 'node',
-    format: 'cjs',
-  });
-} else {
-  buildSync({
-    entryPoints: ['./dist/lexer.mjs'],
-    outfile: './dist/lexer.js',
-    minify: MINIFY,
-    platform: 'node',
-    format: 'cjs',
-    banner: {
-      js: `/* cjs-module-lexer ${pjson.version} */`
-    }
-  })
-}
+if (minified.error)
+  throw minified.error;
 
+fs.writeFileSync('./dist/lexer.mjs', minified ? minified.code : jsSourceProcessed);

package-lock.json

@@ -16,18 +16,21 @@
     "test-wasm": "cross-env WASM=1 mocha -b -u tdd test/*.js",
     "test": "npm run test-wasm && npm run test-js",
     "bench": "node --expose-gc bench/index.mjs",
-    "build": "node build.js",
+    "build": "node build.js ; babel dist/lexer.mjs -o dist/lexer.js ; terser dist/lexer.js -o dist/lexer.js",
     "build-wasm": "make lib/lexer.wasm && node build.js",
     "prepublishOnly": "make && npm run build",
     "footprint": "npm run build && cat dist/lexer.js | gzip -9f | wc -c"
   },
   "author": "Guy Bedford",
   "license": "MIT",
   "devDependencies": {
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.12",
     "kleur": "^2.0.2",
-    "mocha": "^9.1.3"
+    "mocha": "^9.1.3",
+    "terser": "^4.1.4"
   },
   "files": [
     "dist",
@@ -41,4 +44,4 @@
     "url": "https://github.com/nodejs/cjs-module-lexer/issues"
   },
   "homepage": "https://github.com/nodejs/cjs-module-lexer#readme"
-}
+}

package.json

@@ -90,29 +90,14 @@ function copyLE (src, outBuf16) {
     outBuf16[i] = src.charCodeAt(i++);
 }
 
-const loadWasm = (typeof EXTERNAL_PATH === "string" && (async () => {
-  return (await import("node:fs/promises"))
-    .readFile(
-      (await import("node:url")).fileURLToPath(
-        import.meta.resolve("../lib/lexer.wasm")
-      )
-  );
-})) || (async () => {
-  const binary = WASM_BINARY
-  if (typeof window !== "undefined" && typeof atob === "function") {
-    return Uint8Array.from(atob(binary), (x) => x.charCodeAt(0));
-  } else {
-    return Buffer.from(binary, "base64");
-  }
-});
-
 let initPromise;
 export function init () {
   if (initPromise)
     return initPromise;
   return initPromise = (async () => {
     const compiled = await WebAssembly.compile(
-      await loadWasm()
+      (binary => typeof window !== 'undefined' && typeof atob === 'function' ? Uint8Array.from(atob(binary), x => x.charCodeAt(0)) : Buffer.from(binary, 'base64'))
+      ('WASM_BINARY')
     )
     const { exports } = await WebAssembly.instantiate(compiled);
     wasm = exports;