diff --git a/Makefile b/Makefile index 30952fc..6f2a50b 100644 --- a/Makefile +++ b/Makefile @@ -53,23 +53,6 @@ public/openscad.js: libs/openscad libs/openscad/openscad.js public/openscad.wasm: libs/openscad libs/openscad/openscad.wasm cp libs/openscad/openscad.wasm public - -# public/openscad-worker-inlined.js: src/openscad-worker.ts src/wasm/openscad.js -# npx rollup -c - -# js/src/openscad-worker.js: src/openscad-worker.ts -# tsc - -# public/openscad-worker-inlined.js: inline-openscad-worker.ts js/src/openscad-worker.js public/openscad.js js/src/filesystem.js js/src/zip-archives.js -# cp src/wasm/openscad.{js,wasm} public -# npx webpack --config webpack.config.js -# tsc src/BrowserFS.d.ts src/openscad-worker.ts --outFile public/openscad-worker-inlined.js --module amd --moduleResolution nodenext -# deno run --allow-net --allow-read --allow-write inline-openscad-worker.ts \ -# js/src/openscad-worker.js \ -# public/openscad.js \ -# public/openscad-worker-inlined.js \ -# https://ochafik.com/openscad/openscad-worker-inlined.js -# cp js/src/{filesystem,zip-archives}.js public public/libraries/fonts.zip: libs/liberation mkdir -p public/libraries diff --git a/openscad-worker.rollup.config.js b/openscad-worker.rollup.config.js index f8ba870..ca0a0be 100644 --- a/openscad-worker.rollup.config.js +++ b/openscad-worker.rollup.config.js @@ -1,4 +1,5 @@ -import typescript from 'rollup-plugin-typescript'; +// import typescript from 'rollup-plugin-typescript'; +import typescript from 'rollup-plugin-typescript2'; import replace from '@rollup/plugin-replace'; import packageConfig from './package.json' @@ -7,7 +8,7 @@ const PUBLIC_URL = process.env.PUBLIC_URL ?? packageConfig.homepage; export default [ { - input: 'src/openscad-worker.ts', + input: 'src/runner/openscad-worker.ts', output: { file: 'dist/openscad-worker.js', format: 'es' diff --git a/src/runner/openscad-worker.ts b/src/runner/openscad-worker.ts index 0c271e4..c641838 100644 --- a/src/runner/openscad-worker.ts +++ b/src/runner/openscad-worker.ts @@ -2,7 +2,7 @@ import OpenSCAD from "../wasm/openscad.js"; -import { createEditorFS, getBrowserFSLibrariesMounts, getParentDir, symlinkLibraries } from "../fs/filesystem"; +import { createEditorFS, getBrowserFSLibrariesMounts, symlinkLibraries } from "../fs/filesystem"; import { OpenSCADInvocation, OpenSCADInvocationResults } from "./openscad-runner"; import { zipArchives } from "../fs/zip-archives"; declare var BrowserFS: BrowserFSInterface @@ -49,7 +49,7 @@ addEventListener('message', async (e) => { }, instance.ERRNO_CODES ?? {}); instance.FS.mount(BFS, {root: '/home'}, '/home'); - // await symlinkLibraries(allArchiveNames, instance.FS, '/home/libraries', '/home'); + await symlinkLibraries(allArchiveNames, instance.FS, '/home/libraries', '/home'); instance.FS.chdir('/home');