Skip to content

Commit 8be70c0

Browse files
Update from copier (2026-04-05T06:13:12)
Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 15909b8 commit 8be70c0

File tree

9 files changed

+38
-34
lines changed

9 files changed

+38
-34
lines changed

.copier-answers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: 9be318c
2+
_commit: 9b579a3
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: false
55
add_extension: rustjswasm

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Makefile linguist-documentation
77
*.html text=auto eol=lf
88
*.js text=auto eol=lf
99
*.json text=auto eol=lf
10-
*.less text=auto eol=lf
1110
*.md text=auto eol=lf
1211
*.py text=auto eol=lf
1312
*.rs text=auto eol=lf

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
platforms: all
8989
if: runner.os == 'Linux' && runner.arch == 'X64'
9090

91-
- name: Make dist
91+
- name: Make dist (Linux)
9292
run: |
9393
make dist-rs
9494
make dist-py-sdist
@@ -98,7 +98,7 @@ jobs:
9898
CIBW_BUILD: "${{ matrix.cibuildwheel }}-manylinux*"
9999
if: matrix.os == 'ubuntu-latest'
100100

101-
- name: Make dist
101+
- name: Make dist (Macos / Windows)
102102
run: |
103103
make dist-py-wheel
104104
make dist-check

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ dmypy.json
112112
/site
113113
index.md
114114
docs/_build/
115-
docs/src/_build/
116115
docs/api
117-
docs/index.md
118116
docs/html
117+
docs/index.md
119118
docs/jupyter_execute
119+
docs/src/_build/
120+
docs/superpowers
120121
index.md
121122

122123
# JS

js/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ crate-type = ["cdylib"]
1313

1414
[dependencies]
1515
zarc = { path = "../rust", version = "*" }
16-
wasm-bindgen = "0.2.114"
16+
wasm-bindgen = "=0.2.115"

js/build.mjs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { NodeModulesExternal } from "@finos/perspective-esbuild-plugin/external.js";
22
import { build } from "@finos/perspective-esbuild-plugin/build.js";
3-
import { BuildCss } from "@prospective.co/procss/target/cjs/procss.js";
3+
import { transform } from "lightningcss";
44
import { getarg } from "./tools/getarg.mjs";
55
import fs from "fs";
66
import cpy from "cpy";
7-
import path_mod from "path";
87

98
const DEBUG = getarg("--debug");
109

@@ -40,31 +39,29 @@ const BUILD = [
4039

4140
async function compile_css() {
4241
const process_path = (path) => {
43-
const outpath = path.replace("src/less", "dist/css");
42+
const outpath = path.replace("src/css", "dist/css");
4443
fs.mkdirSync(outpath, { recursive: true });
4544

46-
fs.readdirSync(path).forEach((file_or_folder) => {
47-
if (file_or_folder.endsWith(".less")) {
48-
const outfile = file_or_folder.replace(".less", ".css");
49-
const builder = new BuildCss("");
50-
builder.add(
51-
`${path}/${file_or_folder}`,
52-
fs
53-
.readFileSync(path_mod.join(`${path}/${file_or_folder}`))
54-
.toString(),
55-
);
56-
fs.writeFileSync(
57-
`${path.replace("src/less", "dist/css")}/${outfile}`,
58-
builder.compile().get(outfile),
59-
);
60-
} else {
61-
process_path(`${path}/${file_or_folder}`);
45+
fs.readdirSync(path, { withFileTypes: true }).forEach((entry) => {
46+
const input = `${path}/${entry.name}`;
47+
const output = `${outpath}/${entry.name}`;
48+
49+
if (entry.isDirectory()) {
50+
process_path(input);
51+
} else if (entry.isFile() && entry.name.endsWith(".css")) {
52+
const source = fs.readFileSync(input);
53+
const { code } = transform({
54+
filename: entry.name,
55+
code: source,
56+
minify: !DEBUG,
57+
sourceMap: false,
58+
});
59+
fs.writeFileSync(output, code);
6260
}
6361
});
6462
};
65-
// recursively process all less files in src/less
66-
process_path("src/less");
67-
cpy("src/css/*", "dist/css/");
63+
64+
process_path("src/css");
6865
}
6966

7067
async function copy_html() {

js/package.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
"access": "public"
2727
},
2828
"scripts": {
29-
"setup": "cargo install -f wasm-bindgen-cli --version 0.2.114",
29+
"setup": "cargo install -f wasm-bindgen-cli --version 0.2.115 --locked",
3030
"build:debug": "node build.mjs --debug",
3131
"build:rust": "cargo build --release --all-features --target wasm32-unknown-unknown",
3232
"build:wasm-bindgen": "wasm-bindgen ../target/wasm32-unknown-unknown/release/zarc.wasm --out-dir ./dist/pkg --target web",
3333
"build:prod": "node build.mjs",
3434
"build": "npm-run-all build:rust build:wasm-bindgen build:prod",
3535
"clean": "rm -rf dist lib playwright-report ../zarc/extension",
3636
"dev": "npm-run-all -p start watch",
37-
"lint:js": "prettier --check \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
37+
"lint:js": "prettier --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
3838
"lint:rust": "cargo clippy --all-features && cargo fmt --all -- --check",
3939
"lint": "npm-run-all lint:*",
40-
"fix:js": "prettier --write \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
40+
"fix:js": "prettier --write \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
4141
"fix:rust": "cargo fmt --all",
4242
"fix": "npm-run-all fix:*",
4343
"preinstall": "npx only-allow pnpm",
@@ -47,16 +47,23 @@
4747
"test:js": "playwright test",
4848
"test:rust": "cargo test -- --show-output",
4949
"test": "npm-run-all test:rust test:js",
50-
"watch": "nodemon --watch src -e ts,less,html --exec \"pnpm build:debug\""
50+
"watch": "nodemon --watch src -e ts,css,html --exec \"pnpm build:debug\""
5151
},
5252
"dependencies": {},
5353
"devDependencies": {
5454
"@finos/perspective-esbuild-plugin": "^3.2.1",
55+
<<<<<<< before updating
5556
"@playwright/test": "^1.59.1",
5657
"@prospective.co/procss": "^0.1.17",
5758
"cpy": "^12.1.0",
5859
"esbuild": "^0.27.2",
5960
"esbuild-plugin-less": "^1.3.37",
61+
=======
62+
"@playwright/test": "^1.59.0",
63+
"cpy": "^13.2.1",
64+
"esbuild": "^0.27.2",
65+
"lightningcss": "^1.29.3",
66+
>>>>>>> after updating
6067
"http-server": "^14.1.1",
6168
"nodemon": "^3.1.10",
6269
"npm-run-all": "^4.1.5",

rust/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ requirements: ## install required dev dependencies
55
rustup component add clippy
66
cargo install -f cargo-nextest --locked
77
cargo install -f cargo-llvm-cov
8-
cargo install -f wasm-bindgen-cli --version 0.2.114
8+
cargo install -f wasm-bindgen-cli --version 0.2.115 --locked
99
rustup target add wasm32-unknown-unknown
1010

1111
develop: requirements ## install required dev dependencies

0 commit comments

Comments
 (0)