From ebe8e1067c96de0512e936aad0350ca902253f56 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Thu, 21 Nov 2024 13:33:32 -0500
Subject: [PATCH] Move babel config to separate file

Jest struggles to read all babel configurations if directly inside package.json.

This now allows us to install nanoid 5 and pass all tests with it.
---
 babel.config.json       | 10 ++++++++++
 package.json            | 13 +++----------
 server/googleActions.js |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 babel.config.json

diff --git a/babel.config.json b/babel.config.json
new file mode 100644
index 000000000..5e768ec31
--- /dev/null
+++ b/babel.config.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    "@babel/plugin-transform-runtime",
+    "babel-plugin-transform-import-meta"
+  ]
+}
diff --git a/package.json b/package.json
index 7e6a4ab98..0050b8e26 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,9 @@
       "shared",
       "server"
     ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!nanoid/).*"
+    ],
     "coveragePathIgnorePatterns": [
       "build/*"
     ],
@@ -78,16 +81,6 @@
       "jest-expect-message"
     ]
   },
-  "babel": {
-    "presets": [
-      "@babel/preset-env",
-      "@babel/preset-react"
-    ],
-    "plugins": [
-      "@babel/plugin-transform-runtime",
-      "babel-plugin-transform-import-meta"
-    ]
-  },
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@babel/plugin-transform-runtime": "^7.25.9",
diff --git a/server/googleActions.js b/server/googleActions.js
index 758cb7e3d..ec541e5f5 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -60,7 +60,7 @@ const GoogleActions = {
 				account.googleRefreshToken = tokens.refresh_token;
 			}
 			account.googleAccessToken = tokens.access_token;
-			const JWTToken = token.generateAccessToken(account);
+			const JWTToken = token(account);
 
 			//Save updated token to cookie
 			//res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax' });