Remove wasm workaround

Author: magic-akari

Cargo.lock

@@ -62,7 +62,7 @@ lsp-types = { version = "0.97", optional = true }
 lsp-textdocument = { version = "0.4.2", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = { version = "0.2.81", optional = true }
+wasm-bindgen = { version = "0.2.108", optional = true }
 
 # full-moon should be compiled to release optimisations in debug mode due to stack overflows
 # https://github.com/Kampfkarren/full-moon/issues/140

Cargo.toml

@@ -1,5 +1,5 @@
-stylua.web/
-stylua_lib.cjs
+stylua.*
+stylua_*
 LICENSE.md
 README.md
 *.tgz

wasm/.gitignore

@@ -1,10 +1,38 @@
+PROJECT_ROOT=$(dirname $0)/..
+CURRENT_DIR=$PROJECT_ROOT/wasm
+
 # TODO: Ensure that version is up to date
-cp README.md wasm/
-cp LICENSE.md wasm/
-npx wasm-pack@0.10.3 build --target web --out-dir wasm/stylua.web -- --features lua52,lua53,lua54,luajit,luau,cfxlua
+cp $PROJECT_ROOT/README.md $CURRENT_DIR/
+cp $PROJECT_ROOT/LICENSE.md $CURRENT_DIR/
+
+cargo build --target wasm32-unknown-unknown --release --features lua52,lua53,lua54,luajit,luau,cfxlua
+
+WASM_PATH=$PROJECT_ROOT/target/wasm32-unknown-unknown/release/stylua_lib.wasm
+
+# install wasm-bindgen if needed
+command -v wasm-bindgen || cargo install wasm-bindgen-cli
+
+# check wasm-bindgen version
+wasm-bindgen --version
+
+wasm-bindgen $WASM_PATH --target bundler --out-dir $CURRENT_DIR/stylua.bundler
+wasm-bindgen $WASM_PATH --target nodejs --out-dir $CURRENT_DIR/stylua.node-cjs
+wasm-bindgen $WASM_PATH --target experimental-nodejs-module --out-dir $CURRENT_DIR/stylua.node-esm
+wasm-bindgen $WASM_PATH --target deno --out-dir $CURRENT_DIR/stylua.deno
+wasm-bindgen $WASM_PATH --target web --out-dir $CURRENT_DIR/stylua.web
+
+cp -R $CURRENT_DIR/stylua.bundler/. $CURRENT_DIR/
+
+cp $CURRENT_DIR/stylua.node-cjs/stylua_lib.js $CURRENT_DIR/stylua_lib_node.cjs
+cp $CURRENT_DIR/stylua.node-cjs/stylua_lib.d.ts $CURRENT_DIR/stylua_lib_node.d.cts
+
+cp $CURRENT_DIR/stylua.node-esm/stylua_lib.js $CURRENT_DIR/stylua_lib_node.mjs
+cp $CURRENT_DIR/stylua.node-esm/stylua_lib.d.ts $CURRENT_DIR/stylua_lib_node.d.mts
+
+cp $CURRENT_DIR/stylua.deno/stylua_lib.js $CURRENT_DIR/stylua_lib_deno.js
+cp $CURRENT_DIR/stylua.deno/stylua_lib.d.ts $CURRENT_DIR/stylua_lib_deno.d.ts
 
-# workaround for bundler usage
-echo "export { getImports as __getImports, finalizeInit as __finalizeInit }" >> wasm/stylua.web/stylua_lib.js
+cp $CURRENT_DIR/stylua.web/stylua_lib.js $CURRENT_DIR/stylua_lib_web.js
+cp $CURRENT_DIR/stylua.web/stylua_lib.d.ts $CURRENT_DIR/stylua_lib_web.d.ts
 
-# bundle for node CommonJS
-npx rollup@4.9.5 wasm/src/stylua_lib_node.cjs --file wasm/stylua_lib.cjs --format cjs
+echo "Done"

wasm/build-wasm.sh

@@ -12,65 +12,40 @@
     "url": "https://github.com/johnnymorganz/stylua"
   },
   "files": [
-    "stylua.web/stylua_lib_bg.wasm.d.ts",
-    "stylua.web/stylua_lib_bg.wasm",
-    "stylua.web/stylua_lib.d.ts",
-    "stylua.web/stylua_lib.js",
-    "stylua_lib_bundler_wbg.cjs",
-    "stylua_lib_bundler.d.ts",
-    "stylua_lib_bundler.js",
-    "stylua_lib.cjs",
-    "stylua_lib.d.cts",
-    "stylua_lib.d.mts",
-    "stylua_lib.mjs",
-    "LICENSE.md"
+    "stylua_lib_*",
+    "stylua_lib.*",
+    "*.md"
   ],
   "type": "module",
-  "main": "stylua_lib.cjs",
-  "module": "stylua_lib_bundler.js",
-  "types": "stylua.web/stylua_lib.d.ts",
+  "main": "stylua_lib_node.cjs",
+  "module": "stylua_lib.js",
+  "types": "stylua_lib.d.ts",
   "exports": {
     ".": {
-      "webpack": {
-        "node": "./stylua_lib.mjs",
-        "default": "./stylua_lib_bundler.js"
-      },
-      "require": {
-        "types": "./stylua_lib.d.cts",
-        "default": "./stylua_lib.cjs"
-      },
+      "types": "./stylua_lib.d.ts",
+      "webpack": "./stylua_lib.js",
       "node": {
-        "types": "./stylua_lib.d.mts",
-        "default": "./stylua_lib.mjs"
-      },
-      "deno": {
-        "types": "./stylua_lib.d.mts",
-        "default": "./stylua_lib.mjs"
+        "module-sync": "./stylua_lib_node.mjs",
+        "require": "./stylua_lib_node.cjs",
+        "default": "./stylua_lib_node.mjs"
       },
-      "bun": {
-        "types": "./stylua_lib.d.mts",
-        "default": "./stylua_lib.mjs"
-      },
-      "default": {
-        "types": "./stylua_lib_bundler.d.ts",
-        "default": "./stylua_lib_bundler.js"
-      }
+      "deno": "./stylua_lib_deno.js",
+      "bun": "./stylua_lib_node.mjs",
+      "default": "./stylua_lib.js"
     },
     "./web": {
-      "types": "./stylua.web/stylua_lib.d.ts",
-      "default": "./stylua.web/stylua_lib.js"
+      "types": "./stylua_lib_web.d.ts",
+      "default": "./stylua_lib_web.js"
     },
-    "./web/*": "./stylua.web/*",
-    "./stylua_lib_bg.wasm": "./stylua.web/stylua_lib_bg.wasm",
-    "./package.josn": "./package.josn",
+    "./stylua_lib_bg.wasm": "./stylua_lib_bg.wasm",
+    "./package.json": "./package.json",
     "./*": "./*"
   },
-  "browser": {
-    "wbg": "./stylua_lib_bundler_wbg.cjs"
-  },
   "sideEffects": [
-    "stylua_lib.mjs",
-    "stylua_lib_bundler.js"
+    "./stylua_lib.js",
+    "./stylua_lib_node.mjs",
+    "./stylua_lib_node.cjs",
+    "./stylua_lib_deno.js"
   ],
   "keywords": [
     "cli",