Reorganize nextjs package

.vscode/settings.json

@@ -5,7 +5,7 @@
     }
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.validate": [
     "javascript"

nextjs/react/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@fief/fief/nextjs/react",
   "private": true,
-  "main": "../../build/cjs/nextjs/react.js",
-  "module": "../../build/esm/nextjs/react.js",
-  "types": "../../build/esm/nextjs/react.d.ts"
+  "main": "../../build/cjs/nextjs/react/index.js",
+  "module": "../../build/esm/nextjs/react/index.js",
+  "types": "../../build/esm/nextjs/react/index.d.ts",
+  "peerDependencies": {
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  }
 }

package.json

@@ -61,7 +61,7 @@
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.0.3",
     "jest-location-mock": "^2.0.0",
-    "next": "^13.2.4",
+    "next": "^14.2.3",
     "node-fetch": "^2.7.0",
     "node-mocks-http": "^1.11.0",
     "ramda": "^0.29.0",
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "encoding": "^0.1.13",
-    "jose": "^4.6.0",
+    "jose": "^5.4.0",
     "path-to-regexp": "^6.2.1"
   },
   "jest": {}

rollup.config.mjs

@@ -8,12 +8,16 @@ const external = [
   'crypto',
   'jose',
   'next',
+  'next/cache',
   'next/headers',
   'next/server',
   'path-to-regexp',
   'react',
   'react/jsx-runtime',
 ];
+const globals = {
+  crypto: 'crypto',
+};
 
 export default [
   // browser-friendly UMD build
@@ -24,6 +28,7 @@ export default [
       file: 'build/index.umd.js',
       format: 'umd',
       sourcemap: true,
+      globals,
     },
     plugins: [
       nodeResolve({
@@ -44,7 +49,7 @@ export default [
       'src/react/index.ts',
       'src/express/index.ts',
       'src/nextjs/index.ts',
-      'src/nextjs/react.tsx',
+      'src/nextjs/react/index.ts',
     ],
     plugins: [
       typescript({
@@ -60,6 +65,7 @@ export default [
         sourcemap: true,
         preserveModules: true,
         preserveModulesRoot: 'src',
+        globals,
       },
     ],
     external,
@@ -71,7 +77,7 @@ export default [
       'src/react/index.ts',
       'src/express/index.ts',
       'src/nextjs/index.ts',
-      'src/nextjs/react.tsx',
+      'src/nextjs/react/index.ts',
     ],
     plugins: [
       typescript({
@@ -88,6 +94,7 @@ export default [
         sourcemap: true,
         preserveModules: true,
         preserveModulesRoot: 'src',
+        globals,
       },
     ],
     external,

src/crypto/index.ts

@@ -28,4 +28,5 @@ export const getCrypto = (): ICryptoHelper => {
   throw new CryptoHelperError('Cannot find a crypto implementation for your environment');
 };
 
-export { CryptoHelperError, ICryptoHelper };
+export { CryptoHelperError };
+export type { ICryptoHelper };

src/express/index.ts

@@ -193,10 +193,12 @@ const createMiddleware = (parameters: FiefAuthParameters) => {
 };
 
 export {
-  AuthenticateRequestParameters,
   authorizationSchemeGetter,
   cookieGetter,
   createMiddleware,
+};
+export type {
+  AuthenticateRequestParameters,
   IUserInfoCache,
   TokenGetter,
 };

src/index.ts

@@ -5,20 +5,22 @@
  */
 
 export * as browser from './browser';
+export type {
+  FiefAccessTokenInfo,
+  FiefParameters,
+  FiefTokenResponse,
+  FiefUserInfo,
+} from './client';
 export {
   Fief,
   FiefAccessTokenACRTooLow,
   FiefAccessTokenExpired,
-  FiefAccessTokenInfo,
   FiefAccessTokenInvalid,
   FiefAccessTokenMissingPermission,
   FiefAccessTokenMissingScope,
   FiefACR,
   FiefError,
   FiefIdTokenInvalid,
-  FiefParameters,
   FiefRequestError,
-  FiefTokenResponse,
-  FiefUserInfo,
 } from './client';
 export * as crypto from './crypto';

src/nextjs/index.ts

@@ -593,7 +593,9 @@ class FiefAuth {
 }
 
 export {
-  AuthenticateRequestParameters,
   FiefAuth,
+};
+export type {
+  AuthenticateRequestParameters,
   IUserInfoCache,
 };