[legacy-framework] bug(webpack): Create webpack package to avoid context bugs

examples/first-demo/next.config.js

@@ -1,3 +1,3 @@
-const {withBlitz} = require('@blitzjs/core')
+const {withBlitz} = require('@blitzjs/webpack')
 
 module.exports = withBlitz({})

packages/core/package.json

@@ -55,8 +55,6 @@
     "@testing-library/react": "9.4.1",
     "@types/react": "16.9.23",
     "next": "9.2.3-canary.8",
-    "next-compose-plugins": "2.2.0",
-    "next-transpile-modules": "3.0.2",
     "null-loader": "3.0.0",
     "prisma2": "2.0.0-preview022"
   },

packages/core/src/components/Form.tsx

@@ -9,7 +9,7 @@ export default function({children, action, method, ...props}: {[index: string]:
     // Warm the lamba
     // TODO: Only do this once per route
     fetch(action, {method: 'HEAD'})
-  }, [])
+  }, [action])
 
   return (
     <form

packages/core/src/index.ts

@@ -1,3 +1,2 @@
 export * from './components'
 export * from './controller'
-export {default as withBlitz} from './webpack'

packages/webpack/.gitignore

@@ -0,0 +1,4 @@
+*.log
+.DS_Store
+node_modules
+dist

packages/webpack/package.json

@@ -0,0 +1,40 @@
+{
+  "version": "0.1.0",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "start": "tsdx watch",
+    "build": "tsdx build",
+    "test": "tsdx test",
+    "lint": "tsdx lint",
+    "prepare": "tsdx build"
+  },
+  "peerDependencies": {},
+  "husky": {
+    "hooks": {
+      "pre-commit": "tsdx lint"
+    }
+  },
+  "name": "@blitzjs/webpack",
+  "author": {
+    "name": "Brandon Bayer",
+    "email": "[email protected]",
+    "url": "https://twitter.com/flybayer"
+  },
+  "module": "dist/webpack.esm.js",
+  "typings": "dist/packages/webpack/src",
+  "devDependencies": {
+    "@types/jest": "^25.1.3",
+    "husky": "^4.2.3",
+    "tsdx": "^0.12.3",
+    "tslib": "^1.11.1",
+    "typescript": "^3.8.3"
+  },
+  "dependencies": {
+    "next-compose-plugins": "^2.2.0",
+    "next-transpile-modules": "^3.0.2"
+  }
+}

packages/webpack/src/index.ts

@@ -0,0 +1 @@
+export {withBlitz} from './withBlitz'

packages/core/src/webpack/index.ts → packages/webpack/src/withBlitz.ts

@@ -1,7 +1,7 @@
 const withPlugins = require('next-compose-plugins')
 const withTM = require('next-transpile-modules')(['@blitzjs/core'])
 
-export default function(nextConfig: Record<any, any> = {}) {
+export function withBlitz(nextConfig: Record<any, any> = {}) {
   const plugins = []
   if (process.env.NODE_ENV === 'development') {
     // This is needed during monorepo development so that examples auto reload when packages change

packages/webpack/test/withBlitz.test.ts

@@ -0,0 +1,19 @@
+import {withBlitz} from '../src'
+
+describe('withBlitz', () => {
+  it('alters the webpack config as expeted', () => {
+    const nextConfigFn = withBlitz({})
+    const newNext = nextConfigFn('', {defaultConfig: {}})
+    const newWebpack = newNext.webpack({module: {rules: []}}, {})
+    expect(newWebpack).toEqual({
+      module: {
+        rules: [
+          {
+            test: /@prisma\/client/,
+            use: 'null-loader',
+          },
+        ],
+      },
+    })
+  })
+})

packages/webpack/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["src", "test"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declarationDir": "./dist",
+    "downlevelIteration": true,
+    "paths": {
+      "*": ["src/*", "node_modules/*"]
+    }
+  }
+}

yarn.lock

@@ -10307,7 +10307,7 @@ 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==
 
-[email protected]:
+next-compose-plugins@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/next-compose-plugins/-/next-compose-plugins-2.2.0.tgz#95cd8eb40ab0652070d76572fb648354191628b0"
   integrity sha512-ChUlpT9tWfJ7YxqGw/WQ2T1gf8EeX93n1XqeQw0lkvGa7seszahvF4eOZUJoq7Hetsbzg4UHVnPoCXfXTyQR3g==
@@ -10317,7 +10317,7 @@ next-tick@~1.0.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
-[email protected]:
+next-transpile-modules@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/next-transpile-modules/-/next-transpile-modules-3.0.2.tgz#b289698d453bb7346fd768da171b53a740bfe436"
   integrity sha512-w3WsyxvkJ3ws16InHwXhlDaOyG6Peo4co9U2sVBMePwEDo9r3SsbzX7p43sLUTYbpuA2t9iwJoCXkj/4BuD3Qw==
@@ -14652,7 +14652,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
-tslib@^1, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
   integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
@@ -14740,7 +14740,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
   integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==
 
-typescript@^3.7.3, typescript@^3.7.5:
+typescript@^3.7.3, typescript@^3.7.5, typescript@^3.8.3:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
   integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==