Merge pull request #105 from graphile/fixes-from-organizations-branch

Fixes from organizations branch

Author: benjie

.gitignore

@@ -9,3 +9,4 @@ dist
 /@app/graphql/index.*
 .agignore
 *.tsbuildinfo
+.ethereal

@app/client/src/next.config.js

@@ -41,6 +41,27 @@ if (!ROOT_URL) {
       webpack(config, { webpack, dev, isServer }) {
         if (dev) config.devtool = "cheap-module-source-map";
 
+        const makeSafe = externals => {
+          if (Array.isArray(externals)) {
+            return externals.map(ext => {
+              if (typeof ext === "function") {
+                return (context, request, callback) => {
+                  if (/^@app\//.test(request)) {
+                    callback();
+                  } else {
+                    return ext(context, request, callback);
+                  }
+                };
+              } else {
+                return ext;
+              }
+            });
+          }
+        };
+
+        const externals =
+          isServer && dev ? makeSafe(config.externals) : config.externals;
+
         return {
           ...config,
           plugins: [
@@ -51,7 +72,7 @@ if (!ROOT_URL) {
             }),
           ],
           externals: [
-            ...(config.externals || []),
+            ...(externals || []),
             isServer ? { "pg-native": "pg/lib/client" } : null,
           ].filter(_ => _),
         };

@app/db/__tests__/helpers.ts

@@ -85,6 +85,7 @@ export const becomeUser = async (
   client: PoolClient,
   userOrUserId: User | number | null
 ) => {
+  await becomeRoot(client);
   const session = userOrUserId
     ? await createSession(
         client,

yarn.lock

@@ -393,7 +393,7 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.8.3":
+"@babel/highlight@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
   integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
@@ -407,7 +407,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
   integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.6.4", "@babel/parser@^7.7.2", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.6.4", "@babel/parser@^7.7.2", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
   integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==