Merge branch 'main' into v5

graphile · Mar 15, 2023 · 65834b5 · 65834b5
2 parents 2eeb7c1 + 0cb4086
commit 65834b5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/@app/client/package.json b/@app/client/package.json
@@ -30,7 +30,7 @@
     "react-dom": "^18.2.0",
     "slugify": "^1.6.5",
     "tls": "^0.0.1",
-    "webpack": "^5.75.0"
+    "webpack": "^5.76.0"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",

diff --git a/@app/e2e/package.json b/@app/e2e/package.json
@@ -12,6 +12,6 @@
     "cross-env": "^7.0.3",
     "cypress": "^12.7.0",
     "jest": "^29.4.3",
-    "webpack": "^5.75.0"
+    "webpack": "^5.76.0"
   }
 }
diff --git a/@app/server/package.json b/@app/server/package.json
@@ -6,7 +6,7 @@
     "build": "tsc -b",
     "start": "node -r @app/config/env dist/index.js",
     "dev": "nodemon --signal SIGINT --watch 'dist/**/*.js' -x \"node --inspect=9678 -r @app/config/env -r source-map-support/register\" dist/index.js",
-    "schema:export": "cross-env NODE_OPTIONS=\"${NODE_OPTIONS:-} -r @app/config/env\" ts-node scripts/schema-export.ts",
+    "schema:export": "ts-node -r @app/config/env scripts/schema-export.ts",
     "cloudflare:import": "(echo \"export const cloudflareIps: string[] = [\"; (curl -Ls https://www.cloudflare.com/ips-v4 | sort | sed -e \"s/^/  \\\"/\" -e \"s/$/\\\",/\"); echo \"];\") > src/cloudflare.ts",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"${NODE_OPTIONS:-} -r @app/config/env\" jest"
   },

diff --git a/@app/server/src/graphile.config.ts b/@app/server/src/graphile.config.ts
@@ -28,6 +28,14 @@ declare global {
   }
 }
 
+declare global {
+  namespace Express {
+    interface User {
+      session_id: string;
+    }
+  }
+}
+
 const TagsFilePlugin = makePgSmartTagsFromFilePlugin(
   // We're using JSONC for VSCode compatibility; also using an explicit file
   // path keeps the tests happy.

diff --git a/@app/server/src/middleware/installPassport.ts b/@app/server/src/middleware/installPassport.ts
@@ -10,14 +10,6 @@ interface DbSession {
   session_id: string;
 }
 
-declare global {
-  namespace Express {
-    interface User {
-      session_id: string;
-    }
-  }
-}
-
 export default async (app: Express) => {
   passport.serializeUser((sessionObject: DbSession, done) => {
     done(null, sessionObject.session_id);

diff --git a/README.md b/README.md
@@ -199,8 +199,10 @@ this list:
   Next.js for Vue users
 - [Create React App variant](https://github.com/alexk111/graphile-starter-cra) -
   replaces Next.js for apps without Server Side Rendering
-- [Remix variant](https://github.com/fnimick/graphile-starter-remix) - replaces
-  Next.js with Remix
+- [Remix variant](https://github.com/fnimick/graphile-starter-remix-or-sveltekit) -
+  replaces Next.js with Remix
+- [Sveltekit variant](https://github.com/fnimick/graphile-starter-remix-or-sveltekit/tree/sveltekit) -
+  replaces Next.js with Sveltekit
 
 **VARIANTS ARE NOT OFFICIALLY SUPPORTED** and may become out of date or
 unmaintained over time. If you have issues with variants, please submit issues

diff --git a/yarn.lock b/yarn.lock
@@ -228,7 +228,7 @@ __metadata:
     react-dom: ^18.2.0
     slugify: ^1.6.5
     tls: ^0.0.1
-    webpack: ^5.75.0
+    webpack: ^5.76.0
   languageName: unknown
   linkType: soft
 
@@ -280,7 +280,7 @@ __metadata:
     cross-env: ^7.0.3
     cypress: ^12.7.0
     jest: ^29.4.3
-    webpack: ^5.75.0
+    webpack: ^5.76.0
   languageName: unknown
   linkType: soft
 
@@ -15996,9 +15996,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:^5.75.0":
-  version: 5.75.0
-  resolution: "webpack@npm:5.75.0"
+"webpack@npm:^5.76.0":
+  version: 5.76.1
+  resolution: "webpack@npm:5.76.1"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^0.0.51
@@ -16029,7 +16029,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a
+  checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2
   languageName: node
   linkType: hard