Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bundled distribution of SWIPL #8

Closed
wants to merge 5 commits into from
Closed

Add bundled distribution of SWIPL #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abedf71
feat: working complete bundling
jeswr Dec 22, 2022
7cb208a
chore: cleanup to generate all necessary files
jeswr Dec 22, 2022
7dce93b
chore: update .gitignore
jeswr Dec 22, 2022
62af41c
feat: create bundled version of swipl
jeswr Dec 22, 2022
f4eee5e
revert changes to lockfile
jeswr Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
node_modules
dist/swipl/swipl.js
dist/swipl/swipl-web.js
dist/swipl/*.js
dist/swipl/swipl-web.data
dist/swipl/swipl-web.wasm
examples/webpack/node_modules
Expand Down
2 changes: 2 additions & 0 deletions dist/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import SWIPL = require("./common");
export = SWIPL;
1 change: 1 addition & 0 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('./swipl/swipl-bundled');
2 changes: 2 additions & 0 deletions dist/swipl/swipl-bundled.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import SWIPL = require("../common");
export = SWIPL;
10 changes: 9 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,15 @@ RUN git pull && git submodule update --init && \
git checkout $SWIPL_COMMIT -b local-wasm

# Compiles everything.

COPY build-swipl.sh /build-swipl.sh
RUN chmod +x /build-swipl.sh

# Generate the webassembly
RUN /build-swipl.sh
# Copy the results to a new directory
RUN cp -r /swipl-devel/build.wasm /swipl-devel/build.wasm.original

# Override the Emscripten Targets to embed the Webassembly and data files
RUN sed -i 's/--preload-file/-s SINGLE_FILE --embed-file/g' /swipl-devel/cmake/EmscriptenTargets.cmake
# Build the new webassbly
RUN /build-swipl.sh
11 changes: 7 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
],
"license": "BSD-2-Clause",
"type": "commonjs",
"main": "dist/index.js",
"types": "dist/index.d.js",
"devDependencies": {
"@types/node": "^18.7.14",
"@typescript-eslint/eslint-plugin": "^5.39.0",
Expand All @@ -27,10 +29,11 @@
"build:wasm-docker:build": "docker build -t swipl-wasm-image docker",
"build:wasm-docker:create": "docker create --name swipl-wasm swipl-wasm-image",
"build:wasm-docker:remove": "docker rm swipl-wasm",
"build:wasm-docker:extract:data": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.data dist/swipl/swipl-web.data",
"build:wasm-docker:extract:wasm": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.wasm dist/swipl/swipl-web.wasm",
"build:wasm-docker:extract:web": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.js dist/swipl/swipl-web.js",
"build:wasm-docker:extract:node": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.js dist/swipl/swipl.js",
"build:wasm-docker:extract:data": "docker cp swipl-wasm:/swipl-devel/build.wasm.original/src/swipl-web.data dist/swipl/swipl-web.data",
"build:wasm-docker:extract:wasm": "docker cp swipl-wasm:/swipl-devel/build.wasm.original/src/swipl-web.wasm dist/swipl/swipl-web.wasm",
"build:wasm-docker:extract:web": "docker cp swipl-wasm:/swipl-devel/build.wasm.original/src/swipl-web.js dist/swipl/swipl-web.js",
"build:wasm-docker:extract:node": "docker cp swipl-wasm:/swipl-devel/build.wasm.original/src/swipl-web.js dist/swipl/swipl.js",
"build:wasm-docker:extract:bundled": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.js dist/swipl/swipl-bundled.js",
"build:wasm-docker:extract": "run-s build:wasm-docker:extract:*",
"build:wasm-docker": "run-s build:wasm-docker:build build:wasm-docker:create build:wasm-docker:extract build:wasm-docker:remove",
"build": "run-s build:wasm-docker",
Expand Down