Merge pull request #337 from MuckRock/playwright-tests

Namespace built assets to make caching easier

.gitignore

@@ -21,6 +21,7 @@ public/node_modules_*
 public/embed/*
 public/notes/*
 public/viewer/*
+public/assets/
 
 # Netlify
 .netlify

Makefile

@@ -72,4 +72,5 @@ browser-test-debug:
 
 clean:
 	# delete Webpack chunks
-	rm -f public/[0-9]*.*.* public/bundle.*.js public/bundle.*.css public/bundle.*.txt
+	rm -f public/index.html public/[0-9]*.*.* public/bundle.*.js public/bundle.*.css public/bundle.*.txt public/*.map public/*.*.js
+	rm -rf public/assets public/notes public/viewer public/embed

public/_headers

@@ -2,10 +2,10 @@
 # generated css and js files all have hashes in their names, so can be
 # cached forever
 
-/*.css
+/assets/*.css
   Cache-Control: public, max-age=604800, immutable
 
-/*.js
+/assets/*.js
   Cache-Control: public, max-age=604800, immutable
 
 
@@ -16,6 +16,3 @@
 /favicon.png
   Cache-Control: public, max-age=86400, s-maxage=604800, immutable
 
-/global.css
-  Cache-Control: public, max-age=86400, s-maxage=604800, immutable
-

public/_redirects

@@ -3,4 +3,5 @@ https://beta.documentcloud.org/* https://www.documentcloud.org/:splat 301!
 
 /api/oembed.json https://api.www.documentcloud.org/api/oembed/
 /documents/:id/:path https://api.www.documentcloud.org/files/documents/:id/:path
+/assets/* /assets/:splat
 /*    /index.html   200

src/common/Dropdown.svelte

@@ -79,7 +79,7 @@
 
   afterUpdate(() => {
     if (active && name) {
-      plausible("dropdown", { props: { name } });
+      window.plausible && plausible("dropdown", { props: { name } });
     }
   });
 </script>

src/pages/app/App.svelte

@@ -120,7 +120,7 @@
         (window.plausible.q = window.plausible.q || []).push(arguments);
       };
 
-    plausible("pageview");
+    window.plausible && plausible("pageview");
     hashRoute();
 
     // debug

src/pages/viewer/Viewer.svelte

@@ -84,7 +84,7 @@
     if (!$viewer.embed) {
       await initOrgsAndUsers();
 
-      plausible("pageview", { u: obscureURL() });
+      window.plausible && plausible("pageview", { u: obscureURL() });
     }
   });
 

webpack.app.config.js

@@ -12,8 +12,9 @@ const config = {
     bundle: ["./src/main.js"],
   },
   output: {
-    path: __dirname + "/public",
-    filename: "[name].[chunkhash].js",
+    path: path.join(__dirname, "public"),
+    filename: "assets/[name].[chunkhash].js",
+    chunkFilename: "assets/[name].[chunkhash].js",
     publicPath: "/",
   },
   plugins: [...baseConfig.plugins],

webpack.base.config.js

@@ -118,7 +118,7 @@ export default wrap({
   },
   plugins: [
     new MiniCssExtractPlugin({
-      filename: "[name].[contenthash].css",
+      filename: "assets/[name].[contenthash].css",
     }),
     new DotEnv({
       path: prod ? `.env.${environment}` : ".env",