Skip to content

Commit f15b822

Browse files
committed
build xml and css directly in watch
1 parent 3b89beb commit f15b822

File tree

6 files changed

+38
-10
lines changed

6 files changed

+38
-10
lines changed

package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,22 @@
2323
"prettier": "prettier . --write",
2424
"check-formatting": "prettier . --check && eslint",
2525
"lint": "eslint --fix",
26-
"predev": "node tools/remove_iife.cjs",
27-
"dev": "npm-run-all --print-label \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\" --parallel build:watch server serve-static:wait",
28-
"build:dev": "npm-run-all transpile-js bundle:iife \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\"",
26+
"predev": "node tools/clean_build_files.cjs",
27+
"dev": "npm-run-all --print-label --parallel build:watch server serve-static:wait",
2928
"build": "npm-run-all transpile-js bundle:esm bundle:iife \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\"",
3029
"build:watch": "npm-run-all --parallel transpile-js:watch bundle:iife:watch bundle:xml:watch bundle:css:watch",
3130
"transpile-js": "tsc --build --incremental --preserveWatchOutput",
3231
"transpile-js:watch": "npm run transpile-js -- --watch",
3332
"bundle:cjs": "rollup -c -m -- --format cjs",
3433
"bundle:esm": "rollup -c -m -- --format esm",
3534
"bundle:iife": "rollup -c -m -- --format iife",
36-
"bundle:iife:watch": "npm run bundle:iife -- --watch",
37-
"bundle:dev": "rollup -c -m -- --format dev",
35+
"bundle:iife:watch": "wait-on build/js/src/index.js && npm run bundle:iife -- --watch",
3836
"bundle:xml": "node tools/bundle_xml/main.cjs",
3937
"bundle:xml:watch": "node tools/bundle_xml/watch_xml_templates.cjs",
4038
"bundle:css": "node tools/bundle_css/main.cjs",
4139
"bundle:css:watch": "node tools/bundle_css/watch_css_files.cjs",
4240
"serve-static": "live-server --open=demo --watch=build/o_spreadsheet.iife.js,build/o_spreadsheet.xml,build/o_spreadsheet.css,demo",
43-
"serve-static:wait": "wait-on build/o_spreadsheet.iife.js && npm run serve-static",
41+
"serve-static:wait": "wait-on build/o_spreadsheet.iife.js build/o_spreadsheet.xml build/o_spreadsheet.css && npm run serve-static",
4442
"server": "node tools/server/main.cjs",
4543
"predist": "npm run dist --workspaces --if-present",
4644
"dist": "tsc --module es6 --declaration --declarationDir dist/types && rollup -c",

rollup.config.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,27 @@ export default (commandLineArgs) => {
7373
format: commandLineArgs.format,
7474
},
7575
],
76-
plugins,
76+
plugins: [
77+
alias({
78+
entries: [
79+
{
80+
find: "@odoo/o-spreadsheet-engine",
81+
replacement: path.resolve(
82+
__dirname,
83+
"./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src"
84+
),
85+
},
86+
{
87+
find: "@odoo/o-spreadsheet-engine/*",
88+
replacement: path.resolve(
89+
__dirname,
90+
"./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src/*"
91+
),
92+
},
93+
],
94+
}),
95+
nodeResolve(),
96+
],
7797
watch: {
7898
include: ["build/js/**", "./packages/o-spreadsheet-engine/build/**"],
7999
},

tools/bundle_css/watch_css_files.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ const watcher = watch("./src", { filter: /\.css$/, recursive: true }, (ev, name)
1010
}
1111
});
1212

13+
try {
14+
createCSSBundle("build");
15+
} catch (error) {
16+
console.error("Error creating CSS bundle:", error.message);
17+
}
18+
1319
watcher.on("ready", () => console.log("Watching .css files..."));
1420
watcher.on("error", (err) => console.error(`Error watching .css files ${err}`));
1521

tools/bundle_xml/watch_xml_templates.cjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ const watcher = watch("./src", { filter: /\.xml$/, recursive: true }, (ev, name)
66
bundle.writeOwlTemplateBundleToFile("build");
77
});
88

9+
bundle.writeOwlTemplateBundleToFile("build");
10+
911
watcher.on("ready", () => console.log("Watching .xml files..."));
1012
watcher.on("error", (err) => console.error(`Error watching .xml files ${err}`));
1113

tools/clean_build_files.cjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const fs = require("fs");
2+
3+
fs.rmSync("build/o_spreadsheet.iife.js", { force: true });
4+
fs.rmSync("build/o_spreadsheet.xml", { force: true });
5+
fs.rmSync("build/o_spreadsheet.css", { force: true });

tools/remove_iife.cjs

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)