fix: upgrade to zero config for zeit now

Author: ykzts

next.config.js

@@ -1,49 +1,61 @@
 const withOffline = require("next-offline")
-const compose = require("next-compose")
 
-module.exports = compose([
-    [
-        withOffline,
-        {
-            target: "serverless",
-            transformManifest: manifest => ["/"].concat(manifest), // add the homepage to the cache
-            // Trying to set NODE_ENV=production when running yarn dev causes a build-time error so we
-            // turn on the SW in dev mode so that we can actually test it
-            generateInDevMode: true,
-            workboxOpts: {
-                swDest: process.env.NEXT_EXPORT ? "service-worker.js" : "static/service-worker.js",
-                runtimeCaching: [
-                    {
-                        urlPattern: /^https?.*/,
-                        handler: "NetworkFirst",
-                        options: {
-                            cacheName: "https-calls",
-                            networkTimeoutSeconds: 15,
-                            expiration: {
-                                maxEntries: 150,
-                                maxAgeSeconds: 30 * 24 * 60 * 60 // 1 month
-                            },
-                            cacheableResponse: {
-                                statuses: [0, 200]
-                            }
-                        }
+const nextConfig = {
+    transformManifest: manifest => ["/"].concat(manifest), // add the homepage to the cache
+    // Trying to set NODE_ENV=production when running yarn dev causes a build-time error so we
+    // turn on the SW in dev mode so that we can actually test it
+    generateInDevMode: true,
+    workboxOpts: {
+        swDest: process.env.NEXT_EXPORT ? "service-worker.js" : "static/service-worker.js",
+        runtimeCaching: [
+            {
+                urlPattern: /^https?.*/,
+                handler: "NetworkFirst",
+                options: {
+                    cacheName: "https-calls",
+                    networkTimeoutSeconds: 15,
+                    expiration: {
+                        maxEntries: 150,
+                        maxAgeSeconds: 30 * 24 * 60 * 60 // 1 month
                     },
-                    {
-                        urlPattern: /.(?:png|webp|svg|mp4)$/,
-                        handler: "CacheFirst"
+                    cacheableResponse: {
+                        statuses: [0, 200]
                     }
-                ]
+                }
             },
-            experimental: {
-                async rewrites() {
-                    return [
+            {
+                urlPattern: /.(?:png|webp|svg|mp4)$/,
+                handler: "CacheFirst"
+            }
+        ]
+    },
+    experimental: {
+        rewrites() {
+            return [
+                {
+                    source: "/service-worker.js",
+                    destination: "/_next/static/service-worker.js"
+                }
+            ]
+        },
+        headers() {
+            return [
+                {
+                    source: "/service-worker.js",
+                    headers: [
                         {
-                            source: "/service-worker.js",
-                            destination: "/_next/static/service-worker.js"
+                            key: "Cache-Control",
+                            value: "public, max-age=43200, immutable"
+                        },
+                        {
+                            key: "Service-Worker-Allowed",
+                            value: "/"
                         }
                     ]
                 }
-            }
+            ]
         }
-    ]
-])
+    }
+}
+
+module.exports = withOffline(nextConfig)

now.json

@@ -1,20 +1,4 @@
 {
     "name": "noavoice",
-    "version": 2,
-    "routes": [
-        {
-            "src": "^/service-worker.js$",
-            "dest": "/_next/static/service-worker.js",
-            "headers": {
-                "cache-control": "public, max-age=43200, immutable",
-                "Service-Worker-Allowed": "/"
-            }
-        }
-    ],
-    "builds": [
-        {
-            "src": "next.config.js",
-            "use": "@now/next"
-        }
-    ]
+    "version": 2
 }

package.json

@@ -19,9 +19,6 @@
         "eslint-plugin-sort-imports-es6-autofix": "^0.5.0",
         "husky": "^4.2.1",
         "lint-staged": "^10.0.8",
-        "next": "canary",
-        "next-compose": "^0.0.2",
-        "next-offline": "^5.0.0",
         "now": "^17.0.4",
         "npm-run-all": "^4.1.5",
         "prettier": "^1.19.1",
@@ -39,12 +36,14 @@
     },
     "dependencies": {
         "clsx": "^1.1.0",
+        "next": "canary",
+        "next-offline": "^5.0.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0"
     },
     "scripts": {
         "dev": "next",
-        "now-build": "./node_modules/.bin/next build",
+        "build": "next build",
         "start": "next start",
         "lint:ts": "eslint --cache",
         "lint:js": "eslint ./*.js --cache --ignore-pattern .eslintrc.js",

server.js

@@ -5867,11 +5867,6 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-next-compose@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/next-compose/-/next-compose-0.0.2.tgz#fa26aa6430bc4e34d72fe9e5bca780aef53cf191"
-  integrity sha1-+iaqZDC8TjTXL+nlvKeArvU88ZE=
-
 next-offline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/next-offline/-/next-offline-5.0.0.tgz#bd47a795965aceace38cdb60709c8ef980c49559"