Merge pull request #18842 from github/repo-sync

repo sync

Author: Octomerger

.babelrc

@@ -1,4 +1,4 @@
 {
   "presets": ["next/babel"],
-  "plugins": [["styled-components", { "ssr": true }], "@babel/plugin-syntax-top-level-await"]
+  "plugins": ["styled-components"]
 }

Dockerfile

@@ -26,7 +26,7 @@ RUN npm ci --no-optional --registry https://registry.npmjs.org/
 # For Next.js v12+
 # This the appropriate necessary extra for node:16-alpine
 # Other options are https://www.npmjs.com/search?q=%40next%2Fswc
-# RUN npm i @next/swc-linux-x64-musl --no-save
+RUN npm i @next/swc-linux-x64-musl --no-save
 
 
 # ---------------
@@ -46,8 +46,10 @@ COPY stylesheets ./stylesheets
 COPY pages ./pages
 COPY components ./components
 COPY lib ./lib
-# One part of the build relies on this content file to pull all-products
+# Certain content is necessary for being able to build
 COPY content/index.md ./content/index.md
+COPY content/rest ./content/rest
+COPY data ./data
 
 COPY next.config.js ./next.config.js
 COPY tsconfig.json ./tsconfig.json

middleware/static-asset-caching.js

@@ -11,6 +11,6 @@ export default function setStaticAssetCaching(req, res, next) {
 // would make it intelligently different if its content has changed.
 function isChecksummed(path) {
   if (path.startsWith('/assets/cb-')) return true
-  if (path.startsWith('/_next/static') && /[a-f0-9]{20}/.test(path)) return true
+  if (path.startsWith('/_next/static') && /[a-f0-9]{16}/.test(path)) return true
   return false
 }