Skip to content

Fix JavaScript build artifacts #170

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

Merged
timkpaine merged 1 commit into from
Aug 16, 2026
Merged

Fix JavaScript build artifacts #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions python/cppjswasm/js/build.mjs.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,39 @@ const BUNDLES = [
];

async function build() {
if (fs.existsSync("dist")) {
for (const entry of fs.readdirSync("dist")) {
if (entry !== "pkg") {
fs.rmSync(`dist/${entry}`, { recursive: true, force: true });
}
}
}
fs.rmSync("../{{ module }}/extension", {
recursive: true,
force: true,
});

// Bundle css
await bundle_css();

// Copy HTML
cpy("src/html/*", "dist/");
await cpy("src/html/*", "dist/");

// Copy images
fs.mkdirSync("dist/img", { recursive: true });
cpy("src/img/*", "dist/img");
if (fs.existsSync("src/img")) {
fs.mkdirSync("dist/img", { recursive: true });
await cpy("src/img/*", "dist/img");
}

await Promise.all(BUNDLES.map(bundle)).catch(() => process.exit(1));

// Copy servable assets to python extension (exclude esm/)
fs.mkdirSync("../{{ module }}/extension", { recursive: true });
cpy("dist/**/*", "../{{ module }}/extension", {
filter: (file) => !file.relativePath.startsWith("esm"),
await cpy("dist/**/*", "../{{ module }}/extension", {
filter: (file) =>
!file.relativePath.startsWith("esm/") &&
!file.relativePath.startsWith("dist/esm/"),
});
}

build();
await build();
7 changes: 4 additions & 3 deletions python/cppjswasm/js/package.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@
"./package.json": "./package.json"
},
"files": [
"dist/**/*",
"index.d.ts"
"dist/**/*"
],
"types": "./dist/esm/index.d.ts",
"publishConfig": {
"access": "public"
},
"scripts": {
"build:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('../{{ module }}/extension',{recursive:true,force:true})\"",
"build:cpp": "node -e \"require('fs').mkdirSync('dist/pkg',{recursive:true})\" && em++ -O2 -std=c++17 -s WASM=1 -s MODULARIZE=1 -s EXPORT_ES6=1 -s SINGLE_FILE=1 -s ALLOW_MEMORY_GROWTH=1 -s ENVIRONMENT=web,worker --bind -I ../cpp ../cpp/{{ project_name_formatted }}/example.cpp src/cpp/bindings.cpp -o dist/pkg/{{ module }}.js",
"build:debug": "node build.mjs --debug",
"build:prod": "node build.mjs",
"build": "npm-run-all build:cpp build:prod",
"build:types": "tsc",
"build": "npm-run-all build:clean build:cpp build:prod build:types",
"clean": "rm -rf dist lib playwright-report ../{{ module }}/extension",
"dev": "npm-run-all -p start watch",
"lint:js": "oxlint . && oxfmt --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
Expand Down
4 changes: 2 additions & 2 deletions python/cppjswasm/js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"noFallthroughCasesInSwitch": true,
"outDir": "./dist/esm",
"resolveJsonModule": true,
"rootDir": ".",
"rootDir": "./src/ts",
"skipLibCheck": true,
"strict": true,
"target": "ES2020",
"useDefineForClassFields": true
},
"include": ["./src/ts/*.ts", "./tests/*.ts"]
"include": ["./src/ts/*.ts"]
}
22 changes: 16 additions & 6 deletions python/js/js/build.mjs.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,33 @@ const BUNDLES = [
];

async function build() {
fs.rmSync("dist", { recursive: true, force: true });
fs.rmSync("../{{ module }}/extension", {
recursive: true,
force: true,
});

// Bundle css
await bundle_css();

// Copy HTML
cpy("src/html/*", "dist/");
await cpy("src/html/*", "dist/");

// Copy images
fs.mkdirSync("dist/img", { recursive: true });
cpy("src/img/*", "dist/img");
if (fs.existsSync("src/img")) {
fs.mkdirSync("dist/img", { recursive: true });
await cpy("src/img/*", "dist/img");
}

await Promise.all(BUNDLES.map(bundle)).catch(() => process.exit(1));

// Copy servable assets to python extension (exclude esm/)
fs.mkdirSync("../{{ module }}/extension", { recursive: true });
cpy("dist/**/*", "../{{ module }}/extension", {
filter: (file) => !file.relativePath.startsWith("esm"),
await cpy("dist/**/*", "../{{ module }}/extension", {
filter: (file) =>
!file.relativePath.startsWith("esm/") &&
!file.relativePath.startsWith("dist/esm/"),
});
}

build();
await build();
7 changes: 4 additions & 3 deletions python/js/js/package.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@
"./package.json": "./package.json"
},
"files": [
"dist/**/*",
"index.d.ts"
"dist/**/*"
],
"types": "./dist/esm/index.d.ts",
"publishConfig": {
"access": "public"
},
"scripts": {
"build:debug": "node build.mjs --debug",
"build": "node build.mjs",
"build:prod": "node build.mjs",
"build:types": "tsc",
"build": "npm-run-all build:prod build:types",
"clean": "rm -rf dist playwright-report ../{{ module }}/extension",
"dev": "npm-run-all -p start watch",
"lint": "oxlint . && oxfmt --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
Expand Down
4 changes: 2 additions & 2 deletions python/js/js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"noFallthroughCasesInSwitch": true,
"outDir": "./dist/esm",
"resolveJsonModule": true,
"rootDir": ".",
"rootDir": "./src/ts",
"skipLibCheck": true,
"strict": true,
"target": "ES2020",
"useDefineForClassFields": true
},
"include": ["./src/ts/*.ts", "./tests/*.ts"]
"include": ["./src/ts/*.ts"]
}
18 changes: 13 additions & 5 deletions python/rustjswasm/js/build.mjs.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ const BUNDLES = [
];

async function build() {
if (fs.existsSync("dist")) {
for (const entry of fs.readdirSync("dist")) {
if (entry !== "pkg") {
fs.rmSync(`dist/${entry}`, { recursive: true, force: true });
}
}
}
fs.rmSync("../{{ module }}/extension", {
recursive: true,
force: true,
});

// Bundle css
await bundle_css();

Expand All @@ -33,10 +45,6 @@ async function build() {
await Promise.all(BUNDLES.map(bundle)).catch(() => process.exit(1));

// Copy servable assets to python extension (exclude esm/)
fs.rmSync("../{{ module }}/extension", {
recursive: true,
force: true,
});
fs.mkdirSync("../{{ module }}/extension", { recursive: true });
await cpy("dist/**/*", "../{{ module }}/extension", {
filter: (file) =>
Expand All @@ -45,4 +53,4 @@ async function build() {
});
}

build();
await build();
7 changes: 4 additions & 3 deletions python/rustjswasm/js/package.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,21 @@
"./package.json": "./package.json"
},
"files": [
"dist/**/*",
"index.d.ts"
"dist/**/*"
],
"types": "./dist/esm/index.d.ts",
"publishConfig": {
"access": "public"
},
"scripts": {
"setup": "cargo install -f wasm-bindgen-cli --version 0.2.126 --locked",
"build:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('../{{ module }}/extension',{recursive:true,force:true})\"",
"build:debug": "node build.mjs --debug",
"build:rust": "cargo build --release --all-features --target wasm32-unknown-unknown --target-dir ../target",
"build:wasm-bindgen": "wasm-bindgen ../target/wasm32-unknown-unknown/release/{{ module }}.wasm --out-dir ./dist/pkg --target web",
"build:prod": "node build.mjs",
"build": "npm-run-all build:rust build:wasm-bindgen build:prod",
"build:types": "tsc",
"build": "npm-run-all build:clean build:rust build:wasm-bindgen build:prod build:types",
"clean": "rm -rf dist lib playwright-report ../{{ module }}/extension",
"dev": "npm-run-all -p start watch",
"lint:js": "oxlint . && oxfmt --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
Expand Down
4 changes: 2 additions & 2 deletions python/rustjswasm/js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"noFallthroughCasesInSwitch": true,
"outDir": "./dist/esm",
"resolveJsonModule": true,
"rootDir": ".",
"rootDir": "./src/ts",
"skipLibCheck": true,
"strict": true,
"target": "ES2020",
"useDefineForClassFields": true
},
"include": ["./src/ts/*.ts", "./tests/*.ts"]
"include": ["./src/ts/*.ts"]
}
Loading