Merge pull request #2678 from thematters/develop

Release: v4.4.0

.env.local.example

@@ -8,7 +8,7 @@
 NEXT_PUBLIC_RUNTIME_ENV=local
 NEXT_PUBLIC_SITE_DOMAIN=web-develop.matters.news
 NEXT_PUBLIC_ASSET_DOMAIN=assets-develop.matters.news
-NEXT_PUBLIC_NEXT_ASSET_DOMAIN=assets-next-develop.matters.news
+NEXT_PUBLIC_NEXT_ASSET_DOMAIN=
 NEXT_PUBLIC_API_URL=https://server-develop.matters.news/graphql
 NEXT_PUBLIC_OAUTH_URL=https://auth-server-develop.matters.news/oauth
 NEXT_PUBLIC_OAUTH_API_URL=https://auth-server-develop.matters.news/graphql

.github/workflows/deploy.yml

@@ -37,7 +37,7 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Install Dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Generate Types (develop)
         if: github.base_ref == 'develop'

.storybook/main.js

@@ -8,7 +8,12 @@ module.exports = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-a11y',
+    'storybook-addon-next',
   ],
+  framework: '@storybook/react',
+  core: {
+    builder: 'webpack5',
+  },
   /*
     Next.js automatically supports the tsconfig.json "paths" and "baseUrl"
     options but the webpack configuration of Storybook doesn't yet.
@@ -18,6 +23,11 @@ module.exports = {
     config.module.rules = config.module.rules.filter(
       (it) => it.test && it.test.toString() !== '/\\.css$/'
     )
+
+    config.module.rules.push({
+      resolve: { fullySpecified: false },
+    })
+
     const newConfig = mergeWithCustomize({
       customizeArray(a, b, key) {
         if (key === 'module.rules') {
@@ -74,19 +84,21 @@ module.exports = {
         },
       }
     )
+
     return newConfig
   },
   /*
     make the components' PropTypes interface works for argTypes of storybook
   */
   typescript: {
-    reactDocgen: 'react-docgen-typescript',
-    reactDocgenTypescriptOptions: {
-      shouldExtractLiteralValuesFromEnum: true,
-      // @see https://github.com/storybookjs/storybook/issues/11019#issuecomment-656776919
-      shouldRemoveUndefinedFromOptional: true,
-      propFilter: (prop) =>
-        prop.parent ? !/node_modules/.test(prop.parent.fileName) : true,
-    },
+    reactDocgen: false,
+    // reactDocgen: 'react-docgen-typescript',
+    // reactDocgenTypescriptOptions: {
+    //   shouldExtractLiteralValuesFromEnum: true,
+    //   // @see https://github.com/storybookjs/storybook/issues/11019#issuecomment-656776919
+    //   shouldRemoveUndefinedFromOptional: true,
+    //   propFilter: (prop) =>
+    //     prop.parent ? !/node_modules/.test(prop.parent.fileName) : true,
+    // },
   },
 }

.storybook/preview.js

@@ -1,5 +1,4 @@
 import React from 'react'
-import { RouterContext } from 'next/dist/next-server/lib/router-context'
 import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
 
 import { GlobalStyles } from '../src/components/GlobalStyles'
@@ -17,15 +16,7 @@ export const decorators = [
     <>
       <GlobalStyles />
 
-      <RouterContext.Provider
-        value={{
-          push: () => Promise.resolve(),
-          replace: () => Promise.resolve(),
-          prefetch: () => Promise.resolve(),
-        }}
-      >
-        <Story />
-      </RouterContext.Provider>
+      <Story />
 
       <style jsx global>
         {`

README.md

@@ -6,7 +6,7 @@
 
 ### Start local dev
 
-- Install dependencies: `npm i`
+- Install dependencies: `npm i --legacy-peer-deps`
 - Environment variables: `cp .env.local.example .env.local`
 - Run `npm run gen:type` or `npm run gen:watch`
 - Run `npm run dev`, then go to `http://localhost:3000/`

next.config.js

@@ -6,6 +6,7 @@ const withPlugins = require('next-compose-plugins')
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
 })
+
 const withOffline = require('next-offline')
 
 const packageJson = require('./package.json')
@@ -14,10 +15,6 @@ const isProd = process.env.NEXT_PUBLIC_RUNTIME_ENV === 'production'
 const isStatic = process.env.NEXT_PUBLIC_BUILD_TYPE === 'static'
 const nextAssetDomain = process.env.NEXT_PUBLIC_NEXT_ASSET_DOMAIN || ''
 
-const URL_PUSH_SW = isProd
-  ? './firebase-messaging-sw-production.js'
-  : './firebase-messaging-sw-develop.js'
-
 const nextConfig = {
   /**
    * Build time configs
@@ -128,8 +125,6 @@ if (!isStatic) {
         // FIXME: https://github.com/hanford/next-offline/issues/195
         generateInDevMode: false,
         workboxOpts: {
-          // https://github.com/hanford/next-offline/issues/35
-          importScripts: [URL_PUSH_SW],
           swDest: '../public/service-worker.js',
           runtimeCaching: [
             {