Skip to content

Commit 0e949b1

Browse files
committed
feat: migrate to ESM by updating module imports and adding prepare script
1 parent df294ac commit 0e949b1

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

build/main.cjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let workerpool = require("workerpool");
55
workerpool = require_threadman_thread.__toESM(workerpool);
66
let os = require("os");
77
os = require_threadman_thread.__toESM(os);
8-
require("url");
8+
let url = require("url");
99
//#region src/scalar.js
1010
var scalar_exports = /* @__PURE__ */ require_threadman_thread.__exportAll({
1111
abs: () => abs,
@@ -2947,7 +2947,8 @@ function supportsWorkers() {
29472947
return true;
29482948
}
29492949
function getWorkerSource() {
2950-
return "/Users/dimak/Documents/work/snarkjs-refactor/ffjavascript/build/threadman_worker.cjs";
2950+
if (typeof require("path").join(__dirname, "threadman_worker.cjs") !== "undefined") return require("path").join(__dirname, "threadman_worker.cjs");
2951+
return (0, url.fileURLToPath)(new URL("data:text/javascript;base64,LyoqCiAqIFN0YW5kYWxvbmUgd29ya2VyIGVudHJ5LXBvaW50IGZvciBOb2RlLmpzICh3b3JrZXJfdGhyZWFkcykuCiAqCiAqIFRoaXMgZmlsZSBpcyBjb21waWxlZCBieSByb2xsdXAgaW50byBidWlsZC90aHJlYWRtYW5fd29ya2VyLmNqcyBhbmQgbG9hZGVkCiAqIGJ5IHdvcmtlcnBvb2wgd2hlbiBydW5uaW5nIGluIE5vZGUuanMgbXVsdGktdGhyZWFkIG1vZGUuCiAqCiAqIHdvcmtlcnBvb2wgZGV0ZWN0cyB0aGF0IGl0IGlzIGluc2lkZSBhIHdvcmtlcl90aHJlYWRzIHdvcmtlciB2aWEgcGFyZW50UG9ydAogKiBhbmQgY2FsbHMgd29ya2VyLnJlZ2lzdGVyKCkgdG8gZXhwb3NlIHRoZSBtZXRob2RzIHRvIHRoZSBwb29sLgogKi8KaW1wb3J0IHdvcmtlcnBvb2wgZnJvbSAid29ya2VycG9vbCI7CmltcG9ydCB0aHJlYWQgZnJvbSAiLi90aHJlYWRtYW5fdGhyZWFkLmpzIjsKCmNvbnN0IHJ1blRhc2tGbiA9IHRocmVhZCgpOwoKd29ya2VycG9vbC53b3JrZXIoewogICAgcnVuVGFzayh0YXNrKSB7CiAgICAgICAgY29uc3QgcmVzdWx0ID0gcnVuVGFza0ZuKHRhc2spOwogICAgICAgIC8vIElOSVQgcGF0aDogcnVuVGFza0ZuIHJldHVybnMgYSBQcm9taXNlIOKAlCBsZXQgd29ya2VycG9vbCBhd2FpdCBpdC4KICAgICAgICBpZiAocmVzdWx0IGluc3RhbmNlb2YgUHJvbWlzZSkgcmV0dXJuIHJlc3VsdDsKICAgICAgICAvLyBOb24tSU5JVCBwYXRoOiB0cmFuc2ZlciBvdXRwdXQgVWludDhBcnJheXMgemVyby1jb3B5IHRvIHRoZSBtYWluIHRocmVhZC4KICAgICAgICBpZiAocmVzdWx0Lmxlbmd0aCA9PT0gMCkgcmV0dXJuIHJlc3VsdDsKICAgICAgICByZXR1cm4gbmV3IHdvcmtlcnBvb2wuVHJhbnNmZXIocmVzdWx0LCByZXN1bHQubWFwKGIgPT4gYi5idWZmZXIpKTsKICAgIH0KfSk7Cg==", "" + {}.url));
29512952
}
29522953
//#endregion
29532954
//#region src/threadman.js

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"build:node": "vite build",
4242
"build:browser": "vite build --mode browser",
4343
"build:browser:iife": "vite build --mode browser-iife",
44+
"prepare": "npm run build:node",
4445
"build": "npm run clean && npm run build:browser && npm run build:browser:iife && npm run build:node"
4546
},
4647
"repository": {

vite.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { fileURLToPath } from "url";
44
import { resolve } from "path";
55
import { readFileSync, rmSync } from "fs";
66
import { playwright } from "@vitest/browser-playwright";
7-
import path from "path";
7+
88

99
const __dirname = fileURLToPath(new URL(".", import.meta.url));
1010
const abs = (...p) => resolve(__dirname, ...p);
@@ -261,9 +261,7 @@ export default defineConfig(({ mode }) => {
261261
define: {
262262
// Injected only during `vite build` (apply:"build" excludes vitest).
263263
// Points to the compiled worker that lands next to main.cjs in build/.
264-
__BUILD_WORKER_PATH__: JSON.stringify(
265-
resolve(path.dirname(fileURLToPath(import.meta.url)), "build", "threadman_worker.cjs")
266-
),
264+
__BUILD_WORKER_PATH__: "require('path').join(__dirname, 'threadman_worker.cjs')",
267265
},
268266
}),
269267
},

0 commit comments

Comments
 (0)