@aws/nx-plugin 0.1.3 → 0.1.5

package/generators.json

@@ -6,12 +6,14 @@
     "ts#lib": {
       "factory": "./src/ts/lib/generator",
       "schema": "./src/ts/lib/schema.json",
-      "description": "Generates a TypeScript library"
+      "description": "Generates a TypeScript library",
+      "hidden": true
     },
     "ts#cjs-to-esm": {
       "factory": "./src/ts/cjs-to-esm/generator",
       "schema": "./src/ts/cjs-to-esm/schema.json",
-      "description": "Convert CommonJS TypeScript/JavaScript files to ESM"
+      "description": "Convert CommonJS TypeScript/JavaScript files to ESM",
+      "hidden": true
     },
     "cloudscape-website#app": {
       "factory": "./src/cloudscape-website/app/generator",
@@ -26,7 +28,8 @@
     "cloudscape-website#runtime-config": {
       "factory": "./src/cloudscape-website/runtime-config/generator",
       "schema": "./src/cloudscape-website/runtime-config/schema.json",
-      "description": "Adds runtime config to an existing cloudscape website"
+      "description": "Adds runtime config to an existing cloudscape website",
+      "hidden": true
     },
     "infra#app": {
       "factory": "./src/infra/app/generator",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
   "type": "commonjs",
   "license": "Apache-2.0",
@@ -18,7 +18,8 @@
     "nx": "^20.2.2",
     "typescript": "~5.5.4",
     "vite": "^5.4.0",
-    "vitest": "^1.6.0"
+    "vitest": "^1.6.0",
+    "prettier": "^2.8.8"
   },
   "publishConfig": {
     "access": "public"

package/src/cloudscape-website/app/__snapshots__/generator.spec.ts.snap

@@ -258,7 +258,7 @@ exports[`cloudscape-website generator > should generate shared constructs > stat
 SPDX-License-Identifier: Apache-2.0 */
 import * as url from 'url';
 import { PDKNag } from '@aws/pdk/pdk-nag';
-import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
+import { CfnJson, CfnOutput, Lazy, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
 import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
 import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
 import {
@@ -371,7 +371,7 @@ export class StaticWebsite extends Construct {
           )
         ),
         ...(Object.keys(runtimeConfig).length > 0
-          ? [Source.jsonData(DEFAULT_RUNTIME_CONFIG_FILENAME, runtimeConfig)]
+          ? [Source.jsonData(DEFAULT_RUNTIME_CONFIG_FILENAME, this.lazilyRender(runtimeConfig))]
           : []),
       ],
       destinationBucket: this.websiteBucket,
@@ -386,6 +386,30 @@ export class StaticWebsite extends Construct {
     this.suppressCDKNagViolations();
   }
 
+  private lazilyRender = (payload: any) => Lazy.any({
+    produce: () => this.resolveTokens(payload),
+  });
+
+  private resolveTokens = (payload: any) => {
+    const _payload: Record<string, any> = {};
+
+    Object.entries(payload).forEach(([key, value]) => {
+      if (Token.isUnresolved(value) || (typeof value === "string" && value.endsWith("}}"))) {
+        _payload[key] = new CfnJson(this, \`ResolveToken-\${key}\`, {
+            value,
+        }).value;
+      } else if (typeof value === "object") {
+        _payload[key] = this.resolveTokens(value);
+      } else if (Array.isArray(value)) {
+        _payload[key] = value.map((v) => this.resolveTokens(v));
+      } else {
+        _payload[key] = value;
+      }
+    });
+
+    return _payload;
+  }
+
   private suppressCDKNagViolations = () => {
     const stack = Stack.of(this);
 

package/src/cloudscape-website/app/files/app/src/layouts/App/index.tsx.template

@@ -1,23 +1,23 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-import { useCognitoAuthContext } from "@aws-northstar/ui";
-import getBreadcrumbs from "@aws-northstar/ui/components/AppLayout/utils/getBreadcrumbs";
-import NavHeader from "@aws-northstar/ui/components/AppLayout/components/NavHeader";
-import * as React from "react";
-import { createContext, useCallback, useEffect, useState } from "react";
-import { NavItems } from "./navitems";
-import Config from "../../config";
-import Routes from "../Routes";
+import { useCognitoAuthContext } from '@aws-northstar/ui';
+import getBreadcrumbs from '@aws-northstar/ui/components/AppLayout/utils/getBreadcrumbs';
+import NavHeader from '@aws-northstar/ui/components/AppLayout/components/NavHeader';
+import * as React from 'react';
+import { createContext, useCallback, useEffect, useState } from 'react';
+import { NavItems } from './navitems';
+import Config from '../../config';
+import Routes from '../Routes';
 
 import {
   BreadcrumbGroup,
   BreadcrumbGroupProps,
   SideNavigation,
-} from "@cloudscape-design/components";
+} from '@cloudscape-design/components';
 import AppLayout, {
   AppLayoutProps,
-} from "@cloudscape-design/components/app-layout";
-import { useLocation, useNavigate } from "react-router-dom";
+} from '@cloudscape-design/components/app-layout';
+import { useLocation, useNavigate } from 'react-router-dom';
 
 /**
  * Context for updating/retrieving the AppLayout.
@@ -37,10 +37,10 @@ const App: React.FC = () => {
   const { getAuthenticatedUser } = useCognitoAuthContext();
 
   const navigate = useNavigate();
-  const [activeHref, setActiveHref] = useState("/");
+  const [activeHref, setActiveHref] = useState('/');
   const [activeBreadcrumbs, setActiveBreadcrumbs] = useState<
     BreadcrumbGroupProps.Item[]
-  >([{ text: "/", href: "/" }]);
+  >([{ text: '/', href: '/' }]);
   const [appLayoutProps, setAppLayoutProps] = useState<AppLayoutProps>({});
   const location = useLocation();
 
@@ -50,7 +50,7 @@ const App: React.FC = () => {
 
     authUser?.getSession(() => {
       authUser.getUserAttributes((_, attributes) => {
-        setEmail(attributes?.find((a) => a.Name === "email")?.Value);
+        setEmail(attributes?.find((a) => a.Name === 'email')?.Value);
       });
     });
   }, [getAuthenticatedUser, setUsername, setEmail]);
@@ -60,12 +60,12 @@ const App: React.FC = () => {
       JSON.stringify(appLayoutProps) !== JSON.stringify(props) &&
         setAppLayoutProps(props);
     },
-    [appLayoutProps],
+    [appLayoutProps]
   );
 
   useEffect(() => {
     setActiveHref(location.pathname);
-    const breadcrumbs = getBreadcrumbs(location.pathname, location.search, "/");
+    const breadcrumbs = getBreadcrumbs(location.pathname, location.search, '/');
     setActiveBreadcrumbs(breadcrumbs);
   }, [location]);
 
@@ -82,7 +82,7 @@ const App: React.FC = () => {
         navigate(e.detail.href);
       }
     },
-    [navigate, setAppLayoutPropsSafe],
+    [navigate, setAppLayoutPropsSafe]
   );
 
   return (
@@ -103,7 +103,7 @@ const App: React.FC = () => {
         onSignout={() =>
           new Promise(() => {
             getAuthenticatedUser()?.signOut();
-            window.location.href = "/";
+            window.location.href = '/';
           })
         }
       />
@@ -114,7 +114,7 @@ const App: React.FC = () => {
         toolsHide
         navigation={
           <SideNavigation
-            header={{ text: Config.applicationName, href: "/" }}
+            header={{ text: Config.applicationName, href: '/' }}
             activeHref={activeHref}
             onFollow={onNavigate}
             items={NavItems}
@@ -129,4 +129,4 @@ const App: React.FC = () => {
   );
 };
 
-export default App;
+export default App;

package/src/cloudscape-website/app/files/app/src/main.tsx.template

@@ -1,22 +1,23 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-import { NorthStarThemeProvider } from "@aws-northstar/ui";
-import React from "react";
-import { createRoot } from "react-dom/client";
-import { BrowserRouter } from "react-router-dom";
+import { NorthStarThemeProvider } from '@aws-northstar/ui';
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+import { BrowserRouter } from 'react-router-dom';
 import { I18nProvider } from '@cloudscape-design/components/i18n';
 import messages from '@cloudscape-design/components/i18n/messages/all.en';
-import App from "./layouts/App";
+import App from './layouts/App';
 
-const root = document.getElementById("root");
-root && createRoot(root).render(
-  <React.StrictMode>
-    <NorthStarThemeProvider>
-      <I18nProvider locale="en" messages={[messages]}>
-      <BrowserRouter>
-        <App />
-      </BrowserRouter>
-      </I18nProvider>
-    </NorthStarThemeProvider>
-  </React.StrictMode>
-);
+const root = document.getElementById('root');
+root &&
+  createRoot(root).render(
+    <React.StrictMode>
+      <NorthStarThemeProvider>
+        <I18nProvider locale="en" messages={[messages]}>
+          <BrowserRouter>
+            <App />
+          </BrowserRouter>
+        </I18nProvider>
+      </NorthStarThemeProvider>
+    </React.StrictMode>
+  );

package/src/cloudscape-website/app/files/common/constructs/src/__websiteNameKebabCase__/index.ts.template

@@ -1,4 +1,4 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-export * from "./cloudfront-web-acl.js";
-export * from "./static-website.js";
+export * from './cloudfront-web-acl.js';
+export * from './static-website.js';

package/src/cloudscape-website/app/files/common/constructs/src/__websiteNameKebabCase__/static-website.ts.template

@@ -2,7 +2,7 @@
 SPDX-License-Identifier: Apache-2.0 */
 import * as url from 'url';
 import { PDKNag } from '@aws/pdk/pdk-nag';
-import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
+import { CfnJson, CfnOutput, Lazy, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
 import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
 import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
 import {
@@ -109,11 +109,13 @@ export class StaticWebsite extends Construct {
     const runtimeConfig = RuntimeConfig.ensure(this).config;
     this.bucketDeployment = new BucketDeployment(this, 'WebsiteDeployment', {
       sources: [
-        Source.asset(url.fileURLToPath(new URL('../../../../../<%= websiteContentPath %>', import.meta.url))),
+        Source.asset(
+          url.fileURLToPath(
+            new URL('../../../../../<%= websiteContentPath %>', import.meta.url)
+          )
+        ),
         ...(Object.keys(runtimeConfig).length > 0
-          ? [
-              Source.jsonData(DEFAULT_RUNTIME_CONFIG_FILENAME, runtimeConfig),
-            ]
+          ? [Source.jsonData(DEFAULT_RUNTIME_CONFIG_FILENAME, this.lazilyRender(runtimeConfig))]
           : []),
       ],
       destinationBucket: this.websiteBucket,
@@ -128,6 +130,30 @@ export class StaticWebsite extends Construct {
     this.suppressCDKNagViolations();
   }
 
+  private lazilyRender = (payload: any) => Lazy.any({
+    produce: () => this.resolveTokens(payload),
+  });
+
+  private resolveTokens = (payload: any) => {
+    const _payload: Record<string, any> = {};
+
+    Object.entries(payload).forEach(([key, value]) => {
+      if (Token.isUnresolved(value) || (typeof value === "string" && value.endsWith("}}"))) {
+        _payload[key] = new CfnJson(this, `ResolveToken-${key}`, {
+            value,
+        }).value;
+      } else if (typeof value === "object") {
+        _payload[key] = this.resolveTokens(value);
+      } else if (Array.isArray(value)) {
+        _payload[key] = value.map((v) => this.resolveTokens(v));
+      } else {
+        _payload[key] = value;
+      }
+    });
+
+    return _payload;
+  }
+
   private suppressCDKNagViolations = () => {
     const stack = Stack.of(this);
 

package/src/cloudscape-website/app/generator.js

@@ -16,6 +16,7 @@ const lodash_kebabcase_1 = tslib_1.__importDefault(require("lodash.kebabcase"));
 const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
 const versions_1 = require("../../utils/versions");
 const paths_1 = require("../../utils/paths");
+const format_1 = require("../../utils/format");
 function appGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -134,7 +135,7 @@ function appGenerator(tree, schema) {
             '@cloudscape-design/board-components',
             'react-router-dom',
         ]), {});
-        yield (0, devkit_1.formatFiles)(tree);
+        yield (0, format_1.formatFilesInSubtree)(tree, websiteContentPath);
         return () => {
             if (!schema.skipInstall) {
                 (0, devkit_1.installPackagesTask)(tree);

package/src/cloudscape-website/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}

package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap

@@ -229,6 +229,5 @@ export function App() {
 
 exports[`cognito-auth generator > should update shared constructs index.ts > common/constructs-index 1`] = `
 "export * from './identity/index.js';
-export * from './runtime-config/index.js';
-"
+export * from './runtime-config/index.js';"
 `;

package/src/cloudscape-website/cognito-auth/files/app/components/CognitoAuth/index.tsx.template

@@ -1,9 +1,9 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-import { CognitoAuth as NorthstarCognitoAuth } from "@aws-northstar/ui";
-import React, { useContext } from "react";
-import Config from "../../config";
-import { RuntimeConfigContext } from "../RuntimeConfig";
+import { CognitoAuth as NorthstarCognitoAuth } from '@aws-northstar/ui';
+import React, { useContext } from 'react';
+import Config from '../../config';
+import { RuntimeConfigContext } from '../RuntimeConfig';
 
 /**
  * Sets up the Cognito auth.
@@ -24,20 +24,20 @@ const CognitoAuth: React.FC<any> = ({ children }) => {
       <%if (allowSignup) {%>allowSignup={true}<% } %>
       signUpAttributes={[
         {
-            displayName: "Email",
-            name: "email",
-            required: true,
+          displayName: 'Email',
+          name: 'email',
+          required: true,
         },
         {
-            displayName: "Given name",
-            name: "given_name",
-            required: true,
+          displayName: 'Given name',
+          name: 'given_name',
+          required: true,
         },
         {
-            displayName: "Last name",
-            name: "family_name",
-            required: true,
-        }
+          displayName: 'Last name',
+          name: 'family_name',
+          required: true,
+        },
       ]}
     >
       {children}
@@ -47,4 +47,4 @@ const CognitoAuth: React.FC<any> = ({ children }) => {
   );
 };
 
-export default CognitoAuth;
+export default CognitoAuth;

package/src/cloudscape-website/cognito-auth/files/common/constructs/src/identity/index.ts.template

@@ -1,4 +1,4 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-export * from "./user-identity.js";
-export * from "./userpool-with-mfa.js";
+export * from './user-identity.js';
+export * from './userpool-with-mfa.js';

package/src/cloudscape-website/cognito-auth/files/common/constructs/src/identity/user-identity.ts.template

@@ -26,10 +26,7 @@ export class UserIdentity extends Construct {
     // Unless explicitly stated, created a default Cognito User Pool and Web Client.
     this.userPool = new UserPoolWithMfa(this, 'UserPool');
 
-    this.identityPool = new IdentityPool(
-      this,
-      'IdentityPool'
-    );
+    this.identityPool = new IdentityPool(this, 'IdentityPool');
 
     const existingClient = this.userPool.node.children.find(
       (e) => e.node.id === WEB_CLIENT_ID && e instanceof UserPoolClient

package/src/cloudscape-website/cognito-auth/files/common/constructs/src/identity/userpool-with-mfa.ts.template

@@ -1,14 +1,14 @@
 /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0 */
-import { PDKNag } from "@aws/pdk/pdk-nag";
-import { Duration, Stack } from "aws-cdk-lib";
+import { PDKNag } from '@aws/pdk/pdk-nag';
+import { Duration, Stack } from 'aws-cdk-lib';
 import {
   AccountRecovery,
   AdvancedSecurityMode,
   Mfa,
   UserPool,
-} from "aws-cdk-lib/aws-cognito";
-import { Construct } from "constructs";
+} from 'aws-cdk-lib/aws-cognito';
+import { Construct } from 'constructs';
 
 /**
  * Configures a UserPool with MFA across SMS/TOTP using sane defaults.
@@ -16,41 +16,41 @@ import { Construct } from "constructs";
 export class UserPoolWithMfa extends UserPool {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
-        deletionProtection: true,
-        passwordPolicy: {
-          minLength: 8,
-          requireLowercase: true,
-          requireUppercase: true,
-          requireDigits: true,
-          requireSymbols: true,
-          tempPasswordValidity: Duration.days(3),
-        },
-        mfa: Mfa.REQUIRED,
-        mfaSecondFactor: { sms: true, otp: true },
-        signInCaseSensitive: false,
-        advancedSecurityMode: AdvancedSecurityMode.ENFORCED,
-        signInAliases: { username: true, email: true },
-        accountRecovery: AccountRecovery.EMAIL_ONLY,
-        selfSignUpEnabled: <%= allowSignup %>,
-        standardAttributes: {
-          phoneNumber: { required: false },
-          email: { required: true },
-          givenName: { required: true },
-          familyName: { required: true },
-        },
-        autoVerify: {
-          email: true,
-          phone: true,
-        },
-        keepOriginal: {
-          email: true,
-          phone: true,
-        },
-      });
+      deletionProtection: true,
+      passwordPolicy: {
+        minLength: 8,
+        requireLowercase: true,
+        requireUppercase: true,
+        requireDigits: true,
+        requireSymbols: true,
+        tempPasswordValidity: Duration.days(3),
+      },
+      mfa: Mfa.REQUIRED,
+      mfaSecondFactor: { sms: true, otp: true },
+      signInCaseSensitive: false,
+      advancedSecurityMode: AdvancedSecurityMode.ENFORCED,
+      signInAliases: { username: true, email: true },
+      accountRecovery: AccountRecovery.EMAIL_ONLY,
+      selfSignUpEnabled: <%= allowSignup %>,
+      standardAttributes: {
+        phoneNumber: { required: false },
+        email: { required: true },
+        givenName: { required: true },
+        familyName: { required: true },
+      },
+      autoVerify: {
+        email: true,
+        phone: true,
+      },
+      keepOriginal: {
+        email: true,
+        phone: true,
+      },
+    });
 
     const stack = Stack.of(this);
 
-    ["AwsSolutions-IAM5", "AwsPrototyping-IAMNoWildcardPermissions"].forEach(
+    ['AwsSolutions-IAM5', 'AwsPrototyping-IAMNoWildcardPermissions'].forEach(
       (RuleId) => {
         PDKNag.addResourceSuppressionsByPathNoThrow(
           stack,
@@ -59,8 +59,8 @@ export class UserPoolWithMfa extends UserPool {
             {
               id: RuleId,
               reason:
-                "MFA requires sending a text to a users phone number which cannot be known at deployment time.",
-              appliesTo: ["Resource::*"],
+                'MFA requires sending a text to a users phone number which cannot be known at deployment time.',
+              appliesTo: ['Resource::*'],
             },
           ]
         );

package/src/cloudscape-website/cognito-auth/generator.js

@@ -12,6 +12,7 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
 const typescript_1 = require("typescript");
 const shared_constructs_1 = require("../../utils/shared-constructs");
 const versions_1 = require("../../utils/versions");
+const format_1 = require("../../utils/format");
 function cognitoAuthGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const srcRoot = (0, devkit_1.readProjectConfiguration)(tree, options.project).sourceRoot;
@@ -38,7 +39,7 @@ function cognitoAuthGenerator(tree, options) {
             const sharedConstructsIndexContents = tree
                 .read(sharedConstructsIndexTsPath)
                 .toString();
-            const identityExportDeclaration = typescript_1.factory.createExportDeclaration(undefined, undefined, undefined, typescript_1.factory.createStringLiteral('./identity/index.js'));
+            const identityExportDeclaration = typescript_1.factory.createExportDeclaration(undefined, undefined, undefined, typescript_1.factory.createStringLiteral('./identity/index.js', true));
             const updatedIndex = tsquery_1.tsquery
                 .map((0, tsquery_1.ast)(sharedConstructsIndexContents), 'SourceFile', (node) => {
                 return Object.assign(Object.assign({}, node), { statements: [identityExportDeclaration, ...node.statements] });
@@ -53,7 +54,7 @@ function cognitoAuthGenerator(tree, options) {
             throw new Error(`Can only run this generator on a project which contains ${mainTsxPath}`);
         }
         const mainTsxContents = tree.read(mainTsxPath).toString();
-        const authImport = typescript_1.factory.createImportDeclaration(undefined, typescript_1.factory.createImportClause(false, typescript_1.factory.createIdentifier('CognitoAuth'), undefined), typescript_1.factory.createStringLiteral('./components/CognitoAuth'));
+        const authImport = typescript_1.factory.createImportDeclaration(undefined, typescript_1.factory.createImportClause(false, typescript_1.factory.createIdentifier('CognitoAuth'), undefined), typescript_1.factory.createStringLiteral('./components/CognitoAuth', true));
         const updatedImports = tsquery_1.tsquery
             .map((0, tsquery_1.ast)(mainTsxContents), 'SourceFile', (node) => {
             return Object.assign(Object.assign({}, node), { statements: [authImport, ...node.statements] });
@@ -79,7 +80,7 @@ function cognitoAuthGenerator(tree, options) {
         if (locatedTargetNode && mainTsxContents !== mainTsxUpdatedContents) {
             tree.write(mainTsxPath, mainTsxUpdatedContents);
         }
-        yield (0, devkit_1.formatFiles)(tree);
+        yield (0, format_1.formatFilesInSubtree)(tree, srcRoot);
         return () => {
             (0, devkit_1.installPackagesTask)(tree);
         };

package/src/cloudscape-website/cognito-auth/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}

package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap

@@ -46,7 +46,7 @@ const RuntimeConfigProvider: React.FC<any> = ({ children }) => {
       {children}
     </RuntimeConfigContext.Provider>
   ) : (
-    <Spinner></Spinner>
+    <Spinner />
   );
 };
 
@@ -54,10 +54,7 @@ export default RuntimeConfigProvider;
 "
 `;
 
-exports[`runtime-config generator > should generate shared constructs > common/constructs-index.ts 1`] = `
-"export * from './runtime-config.js';
-"
-`;
+exports[`runtime-config generator > should generate shared constructs > common/constructs-index.ts 1`] = `"export * from './runtime-config.js';"`;
 
 exports[`runtime-config generator > should generate shared constructs > runtime-config.ts 1`] = `
 "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.