Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Use chokidar to bundle css files

Browse Source
This commit is contained in:
fflorent 2024-04-06 12:18:23 +02:00 committed by jordigh
parent 2f4122905d
commit 9bacfc8287
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildtools/build.sh
View File

@ -19,3 +19,4 @@ buildtools/update_type_info.sh app
webpack --config $WEBPACK_CONFIG --mode production webpack --config $WEBPACK_CONFIG --mode production
webpack --config buildtools/webpack.check.js --mode production webpack --config buildtools/webpack.check.js --mode production
webpack --config buildtools/webpack.api.config.js --mode production webpack --config buildtools/webpack.api.config.js --mode production
cat app/client/*.css app/client/*/*.css > static/bundle.css

11
buildtools/webpack.config.js
View File

@ -1,11 +1,7 @@
const fs = require('fs'); const fs = require('fs');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin'); const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
const { ProvidePlugin } = require('webpack'); const { ProvidePlugin } = require('webpack');
const path = require('path'); const path = require('path');
const glob = require('glob');
const cssFiles = glob.sync('app/client/**/*.css');
// Get path to top-level node_modules if in a yarn workspace. // Get path to top-level node_modules if in a yarn workspace.
// Otherwise node_modules one level up won't get resolved. // Otherwise node_modules one level up won't get resolved.
@ -21,7 +17,6 @@ module.exports = {
boot: "app/client/boot", boot: "app/client/boot",
billing: "app/client/billingMain", billing: "app/client/billingMain",
form: "app/client/formMain", form: "app/client/formMain",
css: new Set(cssFiles),
// Include client test harness if it is present (it won't be in // Include client test harness if it is present (it won't be in
// docker image). // docker image).
...(fs.existsSync("test/client-harness/client.js") ? { ...(fs.existsSync("test/client-harness/client.js") ? {
@ -92,12 +87,6 @@ module.exports = {
process: 'process', process: 'process',
Buffer: ['buffer', 'Buffer'] Buffer: ['buffer', 'Buffer']
}), }),
new MergeIntoSingleFilePlugin({
files: {
"bundle.css": cssFiles
},
chunks: "css"
}),
// To strip all locales except “en” // To strip all locales except “en”
new MomentLocalesPlugin() new MomentLocalesPlugin()
], ],

2
package.json
View File

@ -90,6 +90,7 @@
"chai": "4.2.0", "chai": "4.2.0",
"chai-as-promised": "7.1.1", "chai-as-promised": "7.1.1",
"chance": "1.0.16", "chance": "1.0.16",
"chokidar-cli": "^3.0.0",
"esbuild-loader": "2.19.0", "esbuild-loader": "2.19.0",
"eslint": "8.18.0", "eslint": "8.18.0",
"http-proxy": "1.18.1", "http-proxy": "1.18.1",
@ -107,7 +108,6 @@
"typescript": "4.7.4", "typescript": "4.7.4",
"webpack": "^5.91.0", "webpack": "^5.91.0",
"webpack-cli": "4.10.0", "webpack-cli": "4.10.0",
"webpack-merge-and-include-globally": "^2.3.4",
"why-is-node-running": "2.0.3" "why-is-node-running": "2.0.3"
}, },
"dependencies": { "dependencies": {

2
sandbox/watch.sh
View File

@ -16,6 +16,8 @@ if [ ! -e _build ]; then
fi fi
tsc --build -w --preserveWatchOutput $PROJECT & tsc --build -w --preserveWatchOutput $PROJECT &
css_files="app/client/**/*.css"
chokidar "${css_files}" -c "bash -O globstar -c 'cat ${css_files} > static/bundle.css'" &
webpack --config $WEBPACK_CONFIG --mode development --watch & webpack --config $WEBPACK_CONFIG --mode development --watch &
NODE_PATH=_build:_build/stubs:_build/ext nodemon ${NODE_INSPECT:+--inspect} --delay 1 -w _build/app/server -w _build/app/common _build/stubs/app/server/server.js & NODE_PATH=_build:_build/stubs:_build/ext nodemon ${NODE_INSPECT:+--inspect} --delay 1 -w _build/app/server -w _build/app/common _build/stubs/app/server/server.js &