@aws-amplify/adapter-nextjs 0.0.2-preview-testing.64b45b1.0 → 0.0.2-preview-testing.034e780.0

package/lib/utils/getAmplifyConfig.js

@@ -6,6 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAmplifyConfig = void 0;
+var utils_1 = require("@aws-amplify/core/internals/utils");
 var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
 var config_1 = __importDefault(require("next/config"));
 var getAmplifyConfig = function () {
@@ -26,7 +27,9 @@ var getAmplifyConfig = function () {
     }
     var configObject = JSON.parse(configStr);
     // TODO(HuiSF): adds ResourcesConfig validation when it has one.
-    return configObject;
+    return Object.keys(configObject).some(function (key) { return key.startsWith('aws_'); })
+        ? (0, utils_1.parseAWSExports)(configObject)
+        : configObject;
 };
 exports.getAmplifyConfig = getAmplifyConfig;
 //# sourceMappingURL=getAmplifyConfig.js.map

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;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"}
+{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;AAGtC,2DAAoE;AACpE,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,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAtB,CAAsB,CAAC;QACnE,CAAC,CAAC,IAAA,uBAAe,EAAC,YAAY,CAAC;QAC/B,CAAC,CAAC,YAAY,CAAC;AACjB,CAAC,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}

package/lib/withAmplify.d.ts

@@ -1,4 +1,5 @@
 import { ResourcesConfig } from 'aws-amplify';
+import { LegacyConfig } from 'aws-amplify/internals/adapter-core';
 import { NextConfig } from 'next';
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
@@ -6,17 +7,6 @@ import { NextConfig } from 'next';
  * @param nextConfig The next config for a Next.js app.
  * @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;
+export declare const withAmplify: (nextConfig: NextConfig, amplifyConfig: ResourcesConfig | LegacyConfig) => NextConfig;

package/lib/withAmplify.js

@@ -23,17 +23,6 @@ exports.withAmplify = void 0;
  * @param nextConfig The next config for a Next.js app.
  * @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) {

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;;;;;;;;;;;;;;;;;;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"}
+{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;AAMtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;;;GAOG;AACI,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA6C;IAE7C,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/utils/getAmplifyConfig.js

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { parseAWSExports } from '@aws-amplify/core/internals/utils';
 import { AmplifyServerContextError } from '@aws-amplify/core/internals/adapter-core';
 import getConfig from 'next/config';
 export var getAmplifyConfig = function () {
@@ -20,6 +21,8 @@ export var getAmplifyConfig = function () {
     }
     var configObject = JSON.parse(configStr);
     // TODO(HuiSF): adds ResourcesConfig validation when it has one.
-    return configObject;
+    return Object.keys(configObject).some(function (key) { return key.startsWith('aws_'); })
+        ? parseAWSExports(configObject)
+        : configObject;
 };
 //# sourceMappingURL=getAmplifyConfig.js.map

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;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"}
+{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,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,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAtB,CAAsB,CAAC;QACnE,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC;QAC/B,CAAC,CAAC,YAAY,CAAC;AACjB,CAAC,CAAC"}

package/lib-esm/withAmplify.d.ts

@@ -1,4 +1,5 @@
 import { ResourcesConfig } from 'aws-amplify';
+import { LegacyConfig } from 'aws-amplify/internals/adapter-core';
 import { NextConfig } from 'next';
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.
@@ -6,17 +7,6 @@ import { NextConfig } from 'next';
  * @param nextConfig The next config for a Next.js app.
  * @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;
+export declare const withAmplify: (nextConfig: NextConfig, amplifyConfig: ResourcesConfig | LegacyConfig) => NextConfig;

package/lib-esm/withAmplify.js

@@ -20,17 +20,6 @@ var __assign = (this && this.__assign) || function () {
  * @param nextConfig The next config for a Next.js app.
  * @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) {

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;;;;;;;;;;;;;;;;;;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"}
+{"version":3,"file":"withAmplify.js","sourceRoot":"","sources":["../src/withAmplify.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;AAMtC,oEAAoE;AACpE,2EAA2E;AAC3E,sCAAsC;AAEtC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,UAC1B,UAAsB,EACtB,aAA6C;IAE7C,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-preview-testing.64b45b1.0+64b45b1",
+		"aws-amplify": "6.0.1-preview-testing.034e780.0+034e780",
 		"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-preview-testing.64b45b1.0+64b45b1",
-	"gitHead": "64b45b1680d18b8befa569ea69752179bea8c2ac"
+	"version": "0.0.2-preview-testing.034e780.0+034e780",
+	"gitHead": "034e780c26d821aba19fa29a397a5f35ed8874de"
 }

package/src/utils/getAmplifyConfig.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ResourcesConfig } from 'aws-amplify';
+import { parseAWSExports } from '@aws-amplify/core/internals/utils';
 import { AmplifyServerContextError } from '@aws-amplify/core/internals/adapter-core';
 import getConfig from 'next/config';
 
@@ -28,5 +29,7 @@ export const getAmplifyConfig = (): ResourcesConfig => {
 	const configObject = JSON.parse(configStr);
 
 	// TODO(HuiSF): adds ResourcesConfig validation when it has one.
-	return configObject;
+	return Object.keys(configObject).some(key => key.startsWith('aws_'))
+		? parseAWSExports(configObject)
+		: configObject;
 };

package/src/withAmplify.ts

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ResourcesConfig, parseAmplifyConfig } from 'aws-amplify';
+import { ResourcesConfig } from 'aws-amplify';
+import { LegacyConfig } from 'aws-amplify/internals/adapter-core';
 import { NextConfig } from 'next';
 
 // NOTE: this function is exported from the subpath `/with-amplify`.
@@ -14,22 +15,11 @@ import { NextConfig } from 'next';
  * @param nextConfig The next config for a Next.js app.
  * @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
+	amplifyConfig: ResourcesConfig | LegacyConfig
 ) => {
 	const configStr = JSON.stringify(amplifyConfig);
 	nextConfig.env = {