Remove catw

buildtools/build.sh

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

buildtools/webpack.config.js

@@ -1,7 +1,11 @@
 const fs = require('fs');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
 const { ProvidePlugin } = require('webpack');
 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.
 // Otherwise node_modules one level up won't get resolved.
@@ -17,6 +21,7 @@ module.exports = {
     boot: "app/client/boot",
     billing: "app/client/billingMain",
     form: "app/client/formMain",
+    css: cssFiles,
     // Include client test harness if it is present (it won't be in
     // docker image).
     ...(fs.existsSync("test/client-harness/client.js") ? {
@@ -74,6 +79,10 @@ module.exports = {
       { test: /\.js$/,
         use: ["source-map-loader"],
         enforce: "pre"
+      },
+      {
+        test: /\.css$/,
+        type: 'asset/resource'
       }
     ]
   },
@@ -83,6 +92,12 @@ module.exports = {
       process: 'process',
       Buffer: ['buffer', 'Buffer']
     }),
+    new MergeIntoSingleFilePlugin({
+      files: {
+        "bundle.css": cssFiles
+      },
+      chunks: "css"
+    }),
     // To strip all locales except “en”
     new MomentLocalesPlugin()
   ],

package.json

@@ -86,7 +86,6 @@
     "@typescript-eslint/eslint-plugin": "5.29.0",
     "@typescript-eslint/parser": "5.29.0",
     "app-module-path": "2.2.0",
-    "catw": "1.0.1",
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "chance": "1.0.16",
@@ -107,6 +106,7 @@
     "typescript": "4.7.4",
     "webpack": "^5.91.0",
     "webpack-cli": "4.10.0",
+    "webpack-merge-and-include-globally": "^2.3.4",
     "why-is-node-running": "2.0.3"
   },
   "dependencies": {

sandbox/watch.sh

@@ -16,7 +16,7 @@ if [ ! -e _build ]; then
 fi
 
 tsc --build -w --preserveWatchOutput $PROJECT &
-catw app/client/*.css app/client/*/*.css -o static/bundle.css -v & 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 &
 
 wait