Skip to content

Commit b14423d

Browse files
authored
Merge pull request #98 from python-project-templates/copier-update-2026-03-30T20-26-51
Update from copier (2026-03-30T20:26:51)
2 parents 768b7d8 + 645b5e8 commit b14423d

File tree

6 files changed

+148
-159
lines changed

6 files changed

+148
-159
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: 6d93d5c
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: true
55
add_extension: js

.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
*.toml text=auto eol=lf

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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,22 @@
3030
"build": "node build.mjs",
3131
"clean": "rm -rf dist playwright-report ../python_template_js/extension",
3232
"dev": "npm-run-all -p start watch",
33-
"lint": "prettier --check \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
34-
"fix": "prettier --write \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
33+
"lint": "prettier --check \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
34+
"fix": "prettier --write \"src/**/*.{js,ts,jsx,tsx,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
3535
"preinstall": "npx only-allow pnpm",
3636
"prepack": "npm run build",
3737
"start": "http-server -p 3000 -o examples/",
3838
"start:tests": "http-server -p 3000 ",
3939
"test": "TZ=UTC playwright test",
40-
"watch": "nodemon --watch src -e ts,less,html --exec \"pnpm build:debug\""
40+
"watch": "nodemon --watch src -e ts,css,html --exec \"pnpm build:debug\""
4141
},
4242
"dependencies": {},
4343
"devDependencies": {
4444
"@finos/perspective-esbuild-plugin": "^3.2.1",
4545
"@playwright/test": "^1.58.2",
46-
"@prospective.co/procss": "^0.1.18",
4746
"cpy": "^13.2.1",
4847
"esbuild": "^0.27.2",
49-
"esbuild-plugin-less": "^1.3.36",
48+
"lightningcss": "^1.29.3",
5049
"http-server": "^14.1.1",
5150
"nodemon": "^3.1.14",
5251
"npm-run-all": "^4.1.5",

0 commit comments

Comments
 (0)