@aws-amplify/adapter-nextjs 0.0.2-console-preview.1053355.0 → 0.0.2-console-preview.d7e0545.0

package/lib/runWithAmplifyServerContext.js

@@ -51,12 +51,13 @@ var runWithAmplifyServerContext = function (_a) {
             // When the Auth config is presented, attempt to create a Amplify server
             // context with token and credentials provider.
             if (amplifyConfig.Auth) {
-                keyValueStorage = nextServerContext === null
-                    ? // When `null` is passed as the value of `nextServerContext`, opt-in
-                        // unauthenticated role (primarily for static rendering). It's
-                        // safe to use the singleton `MemoryKeyValueStorage` here, as the
-                        // static rendering uses the same unauthenticated role cross-sever.
-                        core_1.MemoryKeyValueStorage
+                keyValueStorage = 
+                // When `null` is passed as the value of `nextServerContext`, opt-in
+                // unauthenticated role (primarily for static rendering). It's
+                // safe to use the singleton `MemoryKeyValueStorage` here, as the
+                // static rendering uses the same unauthenticated role cross-sever.
+                nextServerContext === null
+                    ? core_1.MemoryKeyValueStorage
                     : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)((0, utils_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext));
                 credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(amplifyConfig.Auth, keyValueStorage);
                 tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(amplifyConfig.Auth, keyValueStorage);

package/lib/runWithAmplifyServerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,iCAGiB;AACjB,0CAA0D;AAC1D,mEAK4C;AAErC,IAAM,2BAA2B,GACvC,UAAO,EAAgC;QAA9B,iBAAiB,uBAAA,EAAE,SAAS,eAAA;;;;YAM9B,aAAa,GAAG,IAAA,wBAAgB,GAAE,CAAC;YAEzC,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;gBACjB,eAAe,GACpB,iBAAiB,KAAK,IAAI;oBACzB,CAAC,CAAC,oEAAoE;wBACpE,8DAA8D;wBAC9D,iEAAiE;wBACjE,mEAAmE;wBACnE,4BAAqB;oBACvB,CAAC,CAAC,IAAA,4DAA6C,EAC7C,IAAA,uDAA+C,EAAC,iBAAiB,CAAC,CACjE,CAAC;gBACA,mBAAmB,GAAG,IAAA,wDAAyC,EACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBACI,aAAa,GAAG,IAAA,2CAA4B,EACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBAEF,sBAAO,IAAA,0CAA+B,EACrC,aAAa,EACb;wBACC,IAAI,EAAE,EAAE,mBAAmB,qBAAA,EAAE,aAAa,eAAA,EAAE;qBAC5C,EACD,SAAS,CACT,EAAC;aACF;YAED,oEAAoE;YACpE,+CAA+C;YAC/C,sBAAO,IAAA,0CAA+B,EAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,EAAC;;;CACrE,CAAC;AA3CU,QAAA,2BAA2B,+BA2CrC"}
+{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,iCAGiB;AACjB,0CAA0D;AAC1D,mEAK4C;AAErC,IAAM,2BAA2B,GACvC,UAAO,EAAgC;QAA9B,iBAAiB,uBAAA,EAAE,SAAS,eAAA;;;;YAM9B,aAAa,GAAG,IAAA,wBAAgB,GAAE,CAAC;YAEzC,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;gBACjB,eAAe;gBACpB,oEAAoE;gBACpE,8DAA8D;gBAC9D,iEAAiE;gBACjE,mEAAmE;gBACnE,iBAAiB,KAAK,IAAI;oBACzB,CAAC,CAAC,4BAAqB;oBACvB,CAAC,CAAC,IAAA,4DAA6C,EAC7C,IAAA,uDAA+C,EAAC,iBAAiB,CAAC,CACjE,CAAC;gBACA,mBAAmB,GAAG,IAAA,wDAAyC,EACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBACI,aAAa,GAAG,IAAA,2CAA4B,EACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBAEF,sBAAO,IAAA,0CAA+B,EACrC,aAAa,EACb;wBACC,IAAI,EAAE,EAAE,mBAAmB,qBAAA,EAAE,aAAa,eAAA,EAAE;qBAC5C,EACD,SAAS,CACT,EAAC;aACF;YAED,oEAAoE;YACpE,+CAA+C;YAC/C,sBAAO,IAAA,0CAA+B,EAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,EAAC;;;CACrE,CAAC;AA3CU,QAAA,2BAA2B,+BA2CrC"}

package/lib/utils/getAmplifyConfig.d.ts

@@ -1,2 +1,2 @@
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig } from 'aws-amplify';
 export declare const getAmplifyConfig: () => ResourcesConfig;

package/lib/utils/getAmplifyConfig.js

@@ -1,11 +1,23 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAmplifyConfig = void 0;
 var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
+var config_1 = __importDefault(require("next/config"));
 var getAmplifyConfig = function () {
     var configStr = process.env.amplifyConfig;
+    // With a Next.js app that uses the Pages Router, the key-value pairs
+    // listed under the `env` field in the `next.config.js` is not accessible
+    // via process.env.<key> at some occasion. Using the following as a fallback
+    // See: https://github.com/vercel/next.js/issues/39299
+    if (!configStr) {
+        var serverRuntimeConfig = (0, config_1.default)().serverRuntimeConfig;
+        configStr = serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.amplifyConfig;
+    }
     if (!configStr) {
         throw new adapter_core_1.AmplifyServerContextError({
             message: 'Amplify configuration is missing from `process.env`.',

package/lib/utils/getAmplifyConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAGtC,yEAAqF;AAE9E,IAAM,gBAAgB,GAAG;IAC/B,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE5C,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B"}
+{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;AAGtC,yEAAqF;AACrF,uDAAoC;AAE7B,IAAM,gBAAgB,GAAG;IAC/B,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE1C,qEAAqE;IACrE,yEAAyE;IACzE,4EAA4E;IAC5E,sDAAsD;IACtD,IAAI,CAAC,SAAS,EAAE;QACP,IAAA,mBAAmB,GAAK,IAAA,gBAAS,GAAE,oBAAhB,CAAiB;QAC5C,SAAS,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,aAAa,CAAC;KAC/C;IAED,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AAxBW,QAAA,gBAAgB,oBAwB3B"}

package/lib/withAmplify.d.ts

@@ -1,9 +1,22 @@
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig } from 'aws-amplify';
 import { NextConfig } from 'next';
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
+ *
  * @param nextConfig The next config for a Next.js app.
- * @param amplifyConfig
+ * @param amplifyConfig The Amplify configuration.
+ *
+ *   **NOTE**: If you are using Amplify CLI to generate the `aws-exports.js`
+ *   file, you need to use {@link parseAmplifyConfig} to reformat the configuration.
+ *   E.g.
+ *   ```javascript
+ *   const { parseAmplifyConfig } = require('aws-amplify');
+ *   const { withAmplify } = require('@aws-amplify/adapter-nextjs/with-amplify');
+ *   const config = require('./src/aws-exports');
+ *
+ *   const nextConfig = {};
+ *   module.exports = withAmplify(nextConfig, parseAmplifyConfig(config));
+ *   ```
  * @returns The updated `nextConfig`.
  */
 export declare const withAmplify: (nextConfig: NextConfig, amplifyConfig: ResourcesConfig) => NextConfig;

package/lib/withAmplify.js

@@ -19,14 +19,27 @@ exports.withAmplify = void 0;
 // is not being transpiled by Next.js.
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
+ *
  * @param nextConfig The next config for a Next.js app.
- * @param amplifyConfig
+ * @param amplifyConfig The Amplify configuration.
+ *
+ *   **NOTE**: If you are using Amplify CLI to generate the `aws-exports.js`
+ *   file, you need to use {@link parseAmplifyConfig} to reformat the configuration.
+ *   E.g.
+ *   ```javascript
+ *   const { parseAmplifyConfig } = require('aws-amplify');
+ *   const { withAmplify } = require('@aws-amplify/adapter-nextjs/with-amplify');
+ *   const config = require('./src/aws-exports');
+ *
+ *   const nextConfig = {};
+ *   module.exports = withAmplify(nextConfig, parseAmplifyConfig(config));
+ *   ```
  * @returns The updated `nextConfig`.
  */
 var withAmplify = function (nextConfig, amplifyConfig) {
-    nextConfig.env = __assign(__assign({}, nextConfig.env), { 
-        // TODO(Hui): follow up the validation of the amplifyConfig.
-        amplifyConfig: JSON.stringify(amplifyConfig) });
+    var configStr = JSON.stringify(amplifyConfig);
+    nextConfig.env = __assign(__assign({}, nextConfig.env), { amplifyConfig: configStr });
+    nextConfig.serverRuntimeConfig = __assign(__assign({}, nextConfig.serverRuntimeConfig), { amplifyConfig: configStr });
     return nextConfig;
 };
 exports.withAmplify = withAmplify;

package/lib/withAmplify.js.map

@@ -1 +1 @@
-{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;AAKtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;GAKG;AACI,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA8B;IAE9B,UAAU,CAAC,GAAG,yBACV,UAAU,CAAC,GAAG;QACjB,4DAA4D;QAC5D,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAC5C,CAAC;IAEF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AAXW,QAAA,WAAW,eAWtB"}
+{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;AAKtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;;;;;;;;;;;;;;GAkBG;AACI,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA8B;IAE9B,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAChD,UAAU,CAAC,GAAG,yBACV,UAAU,CAAC,GAAG,KACjB,aAAa,EAAE,SAAS,GACxB,CAAC;IAEF,UAAU,CAAC,mBAAmB,yBAC1B,UAAU,CAAC,mBAAmB,KACjC,aAAa,EAAE,SAAS,GACxB,CAAC;IAEF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB"}

package/lib-esm/runWithAmplifyServerContext.js

@@ -48,12 +48,13 @@ export var runWithAmplifyServerContext = function (_a) {
             // When the Auth config is presented, attempt to create a Amplify server
             // context with token and credentials provider.
             if (amplifyConfig.Auth) {
-                keyValueStorage = nextServerContext === null
-                    ? // When `null` is passed as the value of `nextServerContext`, opt-in
-                        // unauthenticated role (primarily for static rendering). It's
-                        // safe to use the singleton `MemoryKeyValueStorage` here, as the
-                        // static rendering uses the same unauthenticated role cross-sever.
-                        MemoryKeyValueStorage
+                keyValueStorage = 
+                // When `null` is passed as the value of `nextServerContext`, opt-in
+                // unauthenticated role (primarily for static rendering). It's
+                // safe to use the singleton `MemoryKeyValueStorage` here, as the
+                // static rendering uses the same unauthenticated role cross-sever.
+                nextServerContext === null
+                    ? MemoryKeyValueStorage
                     : createKeyValueStorageFromCookieStorageAdapter(createCookieStorageAdapterFromNextServerContext(nextServerContext));
                 credentialsProvider = createAWSCredentialsAndIdentityIdProvider(amplifyConfig.Auth, keyValueStorage);
                 tokenProvider = createUserPoolsTokenProvider(amplifyConfig.Auth, keyValueStorage);

package/lib-esm/runWithAmplifyServerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,OAAO,EACN,+CAA+C,EAC/C,gBAAgB,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACN,yCAAyC,EACzC,6CAA6C,EAC7C,4BAA4B,EAC5B,2BAA2B,IAAI,+BAA+B,GAC9D,MAAM,oCAAoC,CAAC;AAE5C,MAAM,CAAC,IAAM,2BAA2B,GACvC,UAAO,EAAgC;QAA9B,iBAAiB,uBAAA,EAAE,SAAS,eAAA;;;;YAM9B,aAAa,GAAG,gBAAgB,EAAE,CAAC;YAEzC,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;gBACjB,eAAe,GACpB,iBAAiB,KAAK,IAAI;oBACzB,CAAC,CAAC,oEAAoE;wBACpE,8DAA8D;wBAC9D,iEAAiE;wBACjE,mEAAmE;wBACnE,qBAAqB;oBACvB,CAAC,CAAC,6CAA6C,CAC7C,+CAA+C,CAAC,iBAAiB,CAAC,CACjE,CAAC;gBACA,mBAAmB,GAAG,yCAAyC,CACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBACI,aAAa,GAAG,4BAA4B,CACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBAEF,sBAAO,+BAA+B,CACrC,aAAa,EACb;wBACC,IAAI,EAAE,EAAE,mBAAmB,qBAAA,EAAE,aAAa,eAAA,EAAE;qBAC5C,EACD,SAAS,CACT,EAAC;aACF;YAED,oEAAoE;YACpE,+CAA+C;YAC/C,sBAAO,+BAA+B,CAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,EAAC;;;CACrE,CAAC"}
+{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,OAAO,EACN,+CAA+C,EAC/C,gBAAgB,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACN,yCAAyC,EACzC,6CAA6C,EAC7C,4BAA4B,EAC5B,2BAA2B,IAAI,+BAA+B,GAC9D,MAAM,oCAAoC,CAAC;AAE5C,MAAM,CAAC,IAAM,2BAA2B,GACvC,UAAO,EAAgC;QAA9B,iBAAiB,uBAAA,EAAE,SAAS,eAAA;;;;YAM9B,aAAa,GAAG,gBAAgB,EAAE,CAAC;YAEzC,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;gBACjB,eAAe;gBACpB,oEAAoE;gBACpE,8DAA8D;gBAC9D,iEAAiE;gBACjE,mEAAmE;gBACnE,iBAAiB,KAAK,IAAI;oBACzB,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,6CAA6C,CAC7C,+CAA+C,CAAC,iBAAiB,CAAC,CACjE,CAAC;gBACA,mBAAmB,GAAG,yCAAyC,CACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBACI,aAAa,GAAG,4BAA4B,CACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBAEF,sBAAO,+BAA+B,CACrC,aAAa,EACb;wBACC,IAAI,EAAE,EAAE,mBAAmB,qBAAA,EAAE,aAAa,eAAA,EAAE;qBAC5C,EACD,SAAS,CACT,EAAC;aACF;YAED,oEAAoE;YACpE,+CAA+C;YAC/C,sBAAO,+BAA+B,CAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,EAAC;;;CACrE,CAAC"}

package/lib-esm/utils/getAmplifyConfig.d.ts

@@ -1,2 +1,2 @@
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig } from 'aws-amplify';
 export declare const getAmplifyConfig: () => ResourcesConfig;

package/lib-esm/utils/getAmplifyConfig.js

@@ -1,8 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyServerContextError } from '@aws-amplify/core/internals/adapter-core';
+import getConfig from 'next/config';
 export var getAmplifyConfig = function () {
     var configStr = process.env.amplifyConfig;
+    // With a Next.js app that uses the Pages Router, the key-value pairs
+    // listed under the `env` field in the `next.config.js` is not accessible
+    // via process.env.<key> at some occasion. Using the following as a fallback
+    // See: https://github.com/vercel/next.js/issues/39299
+    if (!configStr) {
+        var serverRuntimeConfig = getConfig().serverRuntimeConfig;
+        configStr = serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.amplifyConfig;
+    }
     if (!configStr) {
         throw new AmplifyServerContextError({
             message: 'Amplify configuration is missing from `process.env`.',

package/lib-esm/utils/getAmplifyConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAGtC,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAErF,MAAM,CAAC,IAAM,gBAAgB,GAAG;IAC/B,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE5C,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,yBAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAGtC,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,CAAC,IAAM,gBAAgB,GAAG;IAC/B,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE1C,qEAAqE;IACrE,yEAAyE;IACzE,4EAA4E;IAC5E,sDAAsD;IACtD,IAAI,CAAC,SAAS,EAAE;QACP,IAAA,mBAAmB,GAAK,SAAS,EAAE,oBAAhB,CAAiB;QAC5C,SAAS,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,aAAa,CAAC;KAC/C;IAED,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,yBAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC"}

package/lib-esm/withAmplify.d.ts

@@ -1,9 +1,22 @@
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig } from 'aws-amplify';
 import { NextConfig } from 'next';
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
+ *
  * @param nextConfig The next config for a Next.js app.
- * @param amplifyConfig
+ * @param amplifyConfig The Amplify configuration.
+ *
+ *   **NOTE**: If you are using Amplify CLI to generate the `aws-exports.js`
+ *   file, you need to use {@link parseAmplifyConfig} to reformat the configuration.
+ *   E.g.
+ *   ```javascript
+ *   const { parseAmplifyConfig } = require('aws-amplify');
+ *   const { withAmplify } = require('@aws-amplify/adapter-nextjs/with-amplify');
+ *   const config = require('./src/aws-exports');
+ *
+ *   const nextConfig = {};
+ *   module.exports = withAmplify(nextConfig, parseAmplifyConfig(config));
+ *   ```
  * @returns The updated `nextConfig`.
  */
 export declare const withAmplify: (nextConfig: NextConfig, amplifyConfig: ResourcesConfig) => NextConfig;

package/lib-esm/withAmplify.js

@@ -16,14 +16,27 @@ var __assign = (this && this.__assign) || function () {
 // is not being transpiled by Next.js.
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
+ *
  * @param nextConfig The next config for a Next.js app.
- * @param amplifyConfig
+ * @param amplifyConfig The Amplify configuration.
+ *
+ *   **NOTE**: If you are using Amplify CLI to generate the `aws-exports.js`
+ *   file, you need to use {@link parseAmplifyConfig} to reformat the configuration.
+ *   E.g.
+ *   ```javascript
+ *   const { parseAmplifyConfig } = require('aws-amplify');
+ *   const { withAmplify } = require('@aws-amplify/adapter-nextjs/with-amplify');
+ *   const config = require('./src/aws-exports');
+ *
+ *   const nextConfig = {};
+ *   module.exports = withAmplify(nextConfig, parseAmplifyConfig(config));
+ *   ```
  * @returns The updated `nextConfig`.
  */
 export var withAmplify = function (nextConfig, amplifyConfig) {
-    nextConfig.env = __assign(__assign({}, nextConfig.env), { 
-        // TODO(Hui): follow up the validation of the amplifyConfig.
-        amplifyConfig: JSON.stringify(amplifyConfig) });
+    var configStr = JSON.stringify(amplifyConfig);
+    nextConfig.env = __assign(__assign({}, nextConfig.env), { amplifyConfig: configStr });
+    nextConfig.serverRuntimeConfig = __assign(__assign({}, nextConfig.serverRuntimeConfig), { amplifyConfig: configStr });
     return nextConfig;
 };
 //# sourceMappingURL=withAmplify.js.map

package/lib-esm/withAmplify.js.map

@@ -1 +1 @@
-{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;AAKtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;GAKG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA8B;IAE9B,UAAU,CAAC,GAAG,yBACV,UAAU,CAAC,GAAG;QACjB,4DAA4D;QAC5D,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAC5C,CAAC;IAEF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;AAKtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA8B;IAE9B,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAChD,UAAU,CAAC,GAAG,yBACV,UAAU,CAAC,GAAG,KACjB,aAAa,EAAE,SAAS,GACxB,CAAC;IAEF,UAAU,CAAC,mBAAmB,yBAC1B,UAAU,CAAC,mBAAmB,KACjC,aAAa,EAAE,SAAS,GACxB,CAAC;IAEF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC"}

package/package.json

@@ -15,7 +15,7 @@
 		"@types/node": "^20.3.1",
 		"@types/react": "^18.2.13",
 		"@types/react-dom": "^18.2.6",
-		"aws-amplify": "6.0.1-console-preview.1053355.0+1053355",
+		"aws-amplify": "6.0.1-console-preview.d7e0545.0+d7e0545",
 		"jest-fetch-mock": "3.0.3",
 		"next": ">= 13.4.0 < 14.0.0",
 		"typescript": "5.1.6"
@@ -107,6 +107,6 @@
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
 	},
 	"typings": "./lib-esm/index.d.ts",
-	"version": "0.0.2-console-preview.1053355.0+1053355",
-	"gitHead": "1053355d0160296ba83ed4ae1b4f8cf759717f71"
+	"version": "0.0.2-console-preview.d7e0545.0+d7e0545",
+	"gitHead": "d7e0545d6fd84eb0e3a27b3cefbab5d2a4277c45"
 }

package/src/runWithAmplifyServerContext.ts

@@ -27,12 +27,12 @@ export const runWithAmplifyServerContext: NextServer.RunOperationWithContext =
 		// context with token and credentials provider.
 		if (amplifyConfig.Auth) {
 			const keyValueStorage =
+				// When `null` is passed as the value of `nextServerContext`, opt-in
+				// unauthenticated role (primarily for static rendering). It's
+				// safe to use the singleton `MemoryKeyValueStorage` here, as the
+				// static rendering uses the same unauthenticated role cross-sever.
 				nextServerContext === null
-					? // When `null` is passed as the value of `nextServerContext`, opt-in
-					  // unauthenticated role (primarily for static rendering). It's
-					  // safe to use the singleton `MemoryKeyValueStorage` here, as the
-					  // static rendering uses the same unauthenticated role cross-sever.
-					  MemoryKeyValueStorage
+					? MemoryKeyValueStorage
 					: createKeyValueStorageFromCookieStorageAdapter(
 							createCookieStorageAdapterFromNextServerContext(nextServerContext)
 					  );

package/src/utils/getAmplifyConfig.ts

@@ -1,11 +1,21 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig } from 'aws-amplify';
 import { AmplifyServerContextError } from '@aws-amplify/core/internals/adapter-core';
+import getConfig from 'next/config';
 
 export const getAmplifyConfig = (): ResourcesConfig => {
-	const configStr = process.env.amplifyConfig;
+	let configStr = process.env.amplifyConfig;
+
+	// With a Next.js app that uses the Pages Router, the key-value pairs
+	// listed under the `env` field in the `next.config.js` is not accessible
+	// via process.env.<key> at some occasion. Using the following as a fallback
+	// See: https://github.com/vercel/next.js/issues/39299
+	if (!configStr) {
+		const { serverRuntimeConfig } = getConfig();
+		configStr = serverRuntimeConfig?.amplifyConfig;
+	}
 
 	if (!configStr) {
 		throw new AmplifyServerContextError({

package/src/withAmplify.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ResourcesConfig } from '@aws-amplify/core';
+import { ResourcesConfig, parseAmplifyConfig } from 'aws-amplify';
 import { NextConfig } from 'next';
 
 // NOTE: this function is exported from the subpath `/with-amplify`.
@@ -10,18 +10,36 @@ import { NextConfig } from 'next';
 
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
+ *
  * @param nextConfig The next config for a Next.js app.
- * @param amplifyConfig
+ * @param amplifyConfig The Amplify configuration.
+ *
+ *   **NOTE**: If you are using Amplify CLI to generate the `aws-exports.js`
+ *   file, you need to use {@link parseAmplifyConfig} to reformat the configuration.
+ *   E.g.
+ *   ```javascript
+ *   const { parseAmplifyConfig } = require('aws-amplify');
+ *   const { withAmplify } = require('@aws-amplify/adapter-nextjs/with-amplify');
+ *   const config = require('./src/aws-exports');
+ *
+ *   const nextConfig = {};
+ *   module.exports = withAmplify(nextConfig, parseAmplifyConfig(config));
+ *   ```
  * @returns The updated `nextConfig`.
  */
 export const withAmplify = (
 	nextConfig: NextConfig,
 	amplifyConfig: ResourcesConfig
 ) => {
+	const configStr = JSON.stringify(amplifyConfig);
 	nextConfig.env = {
 		...nextConfig.env,
-		// TODO(Hui): follow up the validation of the amplifyConfig.
-		amplifyConfig: JSON.stringify(amplifyConfig),
+		amplifyConfig: configStr,
+	};
+
+	nextConfig.serverRuntimeConfig = {
+		...nextConfig.serverRuntimeConfig,
+		amplifyConfig: configStr,
 	};
 
 	return nextConfig;