Merge pull request #11030 from cdrini/fix/less-windows

Add watch-polling mode for windows dev

Author: cdrini

.gitpod.yml

@@ -17,7 +17,7 @@ ports:
 tasks:
 - name: watch
   # This task watches for changes to JS/CSS files and automatically builds
-  init: gp sync-await docker-up && docker compose run --rm home npx concurrently npm:watch npm:watch-css
+  init: gp sync-await docker-up && docker compose run --rm home npm run watch
 - name: Start App
   before: |
     # run chown because https://github.com/gitpod-io/gitpod/issues/4851

Makefile

@@ -13,14 +13,14 @@ OSP_DUMP_LOCATION=/solr-updater-data/osp_totals.db
 
 all: git css js components i18n
 
-css: static/css/page-*.less
+css:
 	mkdir -p $(BUILD)
-	parallel --verbose -q npx lessc {} $(BUILD)/{/.}.css --clean-css="--s1 --advanced" ::: $^
+	NODE_ENV=production npx webpack --config webpack.config.css.js
 
 js:
 	mkdir -p $(BUILD)
 	rm -f $(BUILD)/*.js $(BUILD)/*.js.map
-	npm run build-assets:webpack
+	NODE_ENV=production npx webpack
 	# This adds FSF licensing for AGPLv3 to our js (for librejs)
 	for js in $(BUILD)/*.js; do \
 		echo "// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3.0" | cat - $$js > /tmp/js && mv /tmp/js $$js; \

bundlesize.config.json

@@ -65,36 +65,36 @@
       "maxSize": "130KB"
     },
     {
-      "path": "static/build/page-admin.css",
+      "path": "static/build/css/page-admin.css",
       "maxSize": "26KB"
 
     },
     {
-      "path": "static/build/page-book.css",
+      "path": "static/build/css/page-book.css",
       "maxSize": "15KB"
     },
     {
-      "path": "static/build/page-edit.css",
+      "path": "static/build/css/page-edit.css",
       "maxSize": "26KB"
     },
     {
-      "path": "static/build/page-form.css",
+      "path": "static/build/css/page-form.css",
       "maxSize": "26KB"
     },
     {
-      "path": "static/build/page-home.css",
+      "path": "static/build/css/page-home.css",
       "maxSize": "8KB"
     },
     {
-      "path": "static/build/page-plain.css",
+      "path": "static/build/css/page-plain.css",
       "maxSize": "26KB"
     },
     {
-      "path": "static/build/page-subject.css",
+      "path": "static/build/css/page-subject.css",
       "maxSize": "9.2KB"
     },
     {
-      "path": "static/build/page-user.css",
+      "path": "static/build/css/page-user.css",
       "maxSize": "30KB"
     }
   ]

openlibrary/templates/site/head.html

@@ -29,7 +29,7 @@
     <link href="/static/images/openlibrary-180x180.png" rel="apple-touch-icon" sizes="180x180" />
     <link href="/static/images/openlibrary-192x192.png" rel="icon" sizes="192x192" />
     <link href="/static/images/openlibrary-128x128.png" rel="icon" sizes="128x128" />
-    $ style = 'build/page-%s.css'%ctx.get('cssfile', 'user')
+    $ style = 'build/css/page-%s.css'%ctx.get('cssfile', 'user')
     <link href="$static_url(style)" rel="stylesheet" type="text/css" />
 
     <noscript>
@@ -81,7 +81,7 @@
 
   </script>
     $if "dev" in ctx.features:
-        <link href="$static_url('build/page-dev.css')" rel="stylesheet" type="text/css"/>
+        <link href="$static_url('build/css/page-dev.css')" rel="stylesheet" type="text/css"/>
 
     <meta name="google-site-verification" content="KrqcZD4l5BLNVyjzSi2sjZBiwgmkJ1W7n6w7ThD7A74" />
     <meta name="google-site-verification" content="vtXGm8q3UgP-f6qXTvQBo85uh3nmIYIotVqqdJDpyz4" />