@codedazur/cdk-next-app 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @codedazur/cdk-next-app
 
+## 0.2.0
+
+### Minor Changes
+
+- [`36a8727`](https://github.com/codedazur/toolkit/commit/36a87277e9150970420b6ac046f297653f95f087) Thanks [@thijsdaniels](https://github.com/thijsdaniels)! - The NextApp now uses a DockerCluster instead of an AmplifyApp. This completely changes the entire infrastructure and is a major breaking change.
+
+### Patch Changes
+
+- Updated dependencies [[`bcb3361`](https://github.com/codedazur/toolkit/commit/bcb33613b40edcfb0097d961fa16511035c18b83)]:
+  - @codedazur/cdk-docker-cluster@0.1.0
+
 ## 0.1.0
 
 ### Minor Changes

package/README.md

@@ -1 +1,15 @@
-# @codedazur/cdk-next-app
+# NextApp
+
+The NextApp CDK construct deploys a standalone Next.js build to a load balanced Fargate service on AWS.
+
+## Example
+
+```ts
+new NextApp(this, "Next", {
+  path: "../next", // Must contain a Dockerfile.
+});
+```
+
+## Docker
+
+In order to use this construct, your Next.js application needs to be configure for Docker deployments. See the [official documentation](https://nextjs.org/docs/pages/building-your-application/deploying#docker-image) for more information.

package/dist/index.d.mts

@@ -1,26 +1,14 @@
-import { AmplifyAppProps, AmplifyApp } from '@codedazur/cdk-amplify-app';
-export { BasicAuth, Branch, Environment, GitRegistry, GitSource, Redirect, RedirectStatus, Rewrite, RewriteStatus } from '@codedazur/cdk-amplify-app';
+import { DockerClusterProps, DockerCluster } from '@codedazur/cdk-docker-cluster';
 import { Construct } from 'constructs';
 
-interface NextAppProps extends Omit<AmplifyAppProps, "platform" | "framework" | "buildSpec" | "headers"> {
+interface NextDockerClusterProps extends DockerClusterProps {
 }
 /**
- * @todo Document that if this is used with a monorepo, the `next.config.js`
- * needs to contain
- * ```
- * {
- *   experimental: {
- *     outputFileTracingRoot: path.join(__dirname, "../../"),
- *   },
- * }
- * ```
- * assuming that the project root is at `"../../"` relative to the the
- * `next.config.js` file.
- * @see https://github.com/aws-amplify/amplify-hosting/issues/3179
- * @see https://nextjs.org/docs/advanced-features/output-file-tracing#caveats
+ * A docker cluster preconfigured for running a Next.js application with support
+ * for private NPM packages using a build-time secret.
  */
-declare class NextApp extends AmplifyApp {
-    constructor(scope: Construct, id: string, props: NextAppProps);
+declare class NextDockerCluster extends DockerCluster {
+    constructor(scope: Construct, id: string, { port, secrets, ...props }: NextDockerClusterProps);
 }
 
-export { NextApp, NextAppProps };
+export { NextDockerCluster, NextDockerClusterProps };

package/dist/index.d.ts

@@ -1,26 +1,14 @@
-import { AmplifyAppProps, AmplifyApp } from '@codedazur/cdk-amplify-app';
-export { BasicAuth, Branch, Environment, GitRegistry, GitSource, Redirect, RedirectStatus, Rewrite, RewriteStatus } from '@codedazur/cdk-amplify-app';
+import { DockerClusterProps, DockerCluster } from '@codedazur/cdk-docker-cluster';
 import { Construct } from 'constructs';
 
-interface NextAppProps extends Omit<AmplifyAppProps, "platform" | "framework" | "buildSpec" | "headers"> {
+interface NextDockerClusterProps extends DockerClusterProps {
 }
 /**
- * @todo Document that if this is used with a monorepo, the `next.config.js`
- * needs to contain
- * ```
- * {
- *   experimental: {
- *     outputFileTracingRoot: path.join(__dirname, "../../"),
- *   },
- * }
- * ```
- * assuming that the project root is at `"../../"` relative to the the
- * `next.config.js` file.
- * @see https://github.com/aws-amplify/amplify-hosting/issues/3179
- * @see https://nextjs.org/docs/advanced-features/output-file-tracing#caveats
+ * A docker cluster preconfigured for running a Next.js application with support
+ * for private NPM packages using a build-time secret.
  */
-declare class NextApp extends AmplifyApp {
-    constructor(scope: Construct, id: string, props: NextAppProps);
+declare class NextDockerCluster extends DockerCluster {
+    constructor(scope: Construct, id: string, { port, secrets, ...props }: NextDockerClusterProps);
 }
 
-export { NextApp, NextAppProps };
+export { NextDockerCluster, NextDockerClusterProps };

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,74 +17,41 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  NextApp: () => NextApp
+  NextDockerCluster: () => NextDockerCluster
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/constructs/NextApp.ts
-var import_cdk_amplify_app = require("@codedazur/cdk-amplify-app");
-var NextApp = class extends import_cdk_amplify_app.AmplifyApp {
-  constructor(scope, id, props) {
+var import_os = __toESM(require("os"));
+var import_path = __toESM(require("path"));
+var import_cdk_docker_cluster = require("@codedazur/cdk-docker-cluster");
+var import_aws_cdk_lib = require("aws-cdk-lib");
+var NextDockerCluster = class extends import_cdk_docker_cluster.DockerCluster {
+  constructor(scope, id, { port = 3e3, secrets, ...props }) {
     super(scope, id, {
-      platform: import_cdk_amplify_app.Platform.WEB_COMPUTE,
-      framework: import_cdk_amplify_app.Framework.NEXTJS_SSR,
-      buildSpec: {
-        version: 1,
-        applications: [
-          {
-            appRoot: props.source.directory,
-            frontend: {
-              phases: {
-                preBuild: {
-                  commands: [
-                    "npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}",
-                    "npm install"
-                  ]
-                },
-                build: {
-                  commands: ["npm run build"]
-                },
-                postBuild: {
-                  commands: [
-                    /**
-                     * This command moves the Next.js `standalone` directory
-                     * into the right location for AWS to recognize it.
-                     * @todo Remove this command when AWS has implemented a fix.
-                     * @see https://github.com/aws-amplify/amplify-hosting/issues/3179
-                     */
-                    `cp -r .next/standalone/${props.source.directory}/. .next/standalone`
-                  ]
-                }
-              },
-              artifacts: {
-                baseDirectory: ".next",
-                files: ["**/*"]
-              },
-              cache: {
-                paths: ["node_modules/**/*"]
-              }
-            }
-          }
-        ]
+      port,
+      secrets: {
+        npmrc: import_aws_cdk_lib.DockerBuildSecret.fromSrc(import_path.default.join(import_os.default.homedir(), "/.npmrc")),
+        ...secrets
       },
-      rewrites: [
-        {
-          source: "/<*>",
-          status: import_cdk_amplify_app.RewriteStatus.NOT_FOUND,
-          target: "/index.html"
-        },
-        ...props.rewrites ?? []
-      ],
       ...props
     });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  NextApp
+  NextDockerCluster
 });

package/dist/index.mjs

@@ -1,66 +1,22 @@
 // src/constructs/NextApp.ts
+import os from "os";
+import path from "path";
 import {
-  AmplifyApp,
-  Framework,
-  Platform,
-  RewriteStatus
-} from "@codedazur/cdk-amplify-app";
-var NextApp = class extends AmplifyApp {
-  constructor(scope, id, props) {
+  DockerCluster
+} from "@codedazur/cdk-docker-cluster";
+import { DockerBuildSecret } from "aws-cdk-lib";
+var NextDockerCluster = class extends DockerCluster {
+  constructor(scope, id, { port = 3e3, secrets, ...props }) {
     super(scope, id, {
-      platform: Platform.WEB_COMPUTE,
-      framework: Framework.NEXTJS_SSR,
-      buildSpec: {
-        version: 1,
-        applications: [
-          {
-            appRoot: props.source.directory,
-            frontend: {
-              phases: {
-                preBuild: {
-                  commands: [
-                    "npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}",
-                    "npm install"
-                  ]
-                },
-                build: {
-                  commands: ["npm run build"]
-                },
-                postBuild: {
-                  commands: [
-                    /**
-                     * This command moves the Next.js `standalone` directory
-                     * into the right location for AWS to recognize it.
-                     * @todo Remove this command when AWS has implemented a fix.
-                     * @see https://github.com/aws-amplify/amplify-hosting/issues/3179
-                     */
-                    `cp -r .next/standalone/${props.source.directory}/. .next/standalone`
-                  ]
-                }
-              },
-              artifacts: {
-                baseDirectory: ".next",
-                files: ["**/*"]
-              },
-              cache: {
-                paths: ["node_modules/**/*"]
-              }
-            }
-          }
-        ]
+      port,
+      secrets: {
+        npmrc: DockerBuildSecret.fromSrc(path.join(os.homedir(), "/.npmrc")),
+        ...secrets
       },
-      rewrites: [
-        {
-          source: "/<*>",
-          status: RewriteStatus.NOT_FOUND,
-          target: "/index.html"
-        },
-        ...props.rewrites ?? []
-      ],
       ...props
     });
   }
 };
 export {
-  NextApp
+  NextDockerCluster
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codedazur/cdk-next-app",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": ".dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -15,26 +15,28 @@
   },
   "license": "MIT",
   "scripts": {
-    "dev": "tsup src/index.ts --format esm,cjs --dts --watch",
+    "develop": "tsup src/index.ts --format esm,cjs --dts --watch",
     "build": "tsup src/index.ts --format esm,cjs --dts",
+    "audit": "npm audit --omit dev",
     "lint": "TIMING=1 eslint \"**/*.ts*\"",
-    "test": "echo \"No tests configured.\""
+    "types": "tsc --noEmit",
+    "test": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@codedazur/cdk-amplify-app": "*"
+    "@codedazur/cdk-docker-cluster": "*"
   },
   "peerDependencies": {
     "aws-cdk-lib": ">=2",
     "constructs": ">=10"
   },
   "devDependencies": {
-    "@types/node": "^16.18.3 || ^18.18.0",
-    "aws-cdk-lib": "^2.55.1",
-    "constructs": "^10.1.194",
-    "esbuild": "^0.16.9 || ^0.19.1",
+    "@codedazur/eslint-config": "*",
+    "@codedazur/tsconfig": "*",
+    "@types/node": "^20.12.8",
+    "aws-cdk-lib": "^2.139.1",
+    "constructs": "^10.3.0",
+    "esbuild": "^0.20.2",
     "eslint": "^8.30.0",
-    "eslint-config-custom": "*",
-    "tsconfig": "*",
-    "typescript": "^4.9.4 || ^5.2.2"
+    "typescript": "^5.4.5"
   }
 }

package/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "@codedazur/tsconfig/cdk.json",
+  "include": ["."],
+  "exclude": ["dist", "build", "node_modules"]
+}