From 8ae73997c9cd71d828fa6b3324c6bc8d6432ce53 Mon Sep 17 00:00:00 2001
From: Thomas Neil James Shadwell <thomas@shadwell.im>
Date: Wed, 31 May 2023 10:11:56 +0900
Subject: [PATCH] Move the staging.zemn.me site into project/zemn.me

---
 project/zemn.me/BUILD.bazel                            |  2 +-
 .../public => project/zemn.me/next}/BUILD.bazel        |  6 +++---
 .../public => project/zemn.me/next}/pages/_app.tsx     |  0
 .../public => project/zemn.me/next}/pages/index.tsx    |  0
 ts/pulumi/me/zemn/staging/BUILD.bazel                  |  2 +-
 ts/pulumi/me/zemn/staging/index.ts                     | 10 +++-------
 6 files changed, 8 insertions(+), 12 deletions(-)
 rename {ts/pulumi/me/zemn/staging/public => project/zemn.me/next}/BUILD.bazel (84%)
 rename {ts/pulumi/me/zemn/staging/public => project/zemn.me/next}/pages/_app.tsx (100%)
 rename {ts/pulumi/me/zemn/staging/public => project/zemn.me/next}/pages/index.tsx (100%)

diff --git a/project/zemn.me/BUILD.bazel b/project/zemn.me/BUILD.bazel
index fa71407125..4b41c9fcf9 100644
--- a/project/zemn.me/BUILD.bazel
+++ b/project/zemn.me/BUILD.bazel
@@ -1 +1 @@
-# Nothing here!
\ No newline at end of file
+# Nothing here!
diff --git a/ts/pulumi/me/zemn/staging/public/BUILD.bazel b/project/zemn.me/next/BUILD.bazel
similarity index 84%
rename from ts/pulumi/me/zemn/staging/public/BUILD.bazel
rename to project/zemn.me/next/BUILD.bazel
index a793b170a3..9a44a48609 100644
--- a/ts/pulumi/me/zemn/staging/public/BUILD.bazel
+++ b/project/zemn.me/next/BUILD.bazel
@@ -4,7 +4,7 @@ load("//ts/next.js:rules.bzl", "next_project")
 package(default_visibility = ["//visibility:public"])
 
 ts_project(
-    name = "public",
+    name = "ts",
     assets = glob(["**/*.css"]),
     deps = [
         "//:node_modules/@types/react",
@@ -16,6 +16,6 @@ ts_project(
 )
 
 next_project(
-    name = "public_next",
-    srcs = [":public"],
+    name = "next",
+    srcs = [":ts"],
 )
diff --git a/ts/pulumi/me/zemn/staging/public/pages/_app.tsx b/project/zemn.me/next/pages/_app.tsx
similarity index 100%
rename from ts/pulumi/me/zemn/staging/public/pages/_app.tsx
rename to project/zemn.me/next/pages/_app.tsx
diff --git a/ts/pulumi/me/zemn/staging/public/pages/index.tsx b/project/zemn.me/next/pages/index.tsx
similarity index 100%
rename from ts/pulumi/me/zemn/staging/public/pages/index.tsx
rename to project/zemn.me/next/pages/index.tsx
diff --git a/ts/pulumi/me/zemn/staging/BUILD.bazel b/ts/pulumi/me/zemn/staging/BUILD.bazel
index fdfdc05e02..bea9fdd3d7 100644
--- a/ts/pulumi/me/zemn/staging/BUILD.bazel
+++ b/ts/pulumi/me/zemn/staging/BUILD.bazel
@@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"])
 ts_project(
     name = "staging",
     assets = glob(["**/*.css"]),
-    data = ["//ts/pulumi/me/zemn/staging/public:public_next"],
+    data = ["//project/zemn.me/next"],
     deps = [
         "//:node_modules/@pulumi/aws",
         "//:node_modules/@pulumi/aws-static-website",
diff --git a/ts/pulumi/me/zemn/staging/index.ts b/ts/pulumi/me/zemn/staging/index.ts
index 1bfa15c9a6..5411fbd129 100644
--- a/ts/pulumi/me/zemn/staging/index.ts
+++ b/ts/pulumi/me/zemn/staging/index.ts
@@ -49,13 +49,9 @@ export const arn = validation.certificateArn;
 
 export const site = new staticwebsite.Website('staging.zemn.me', {
 	withCDN: true,
-	indexHTML: new asset.FileAsset(
-		'ts/pulumi/me/zemn/staging/public/out/index.html'
-	).path,
-	error404: new asset.FileAsset(
-		'ts/pulumi/me/zemn/staging/public/out/404.html'
-	).path,
-	sitePath: 'ts/pulumi/me/zemn/staging/public/out',
+	indexHTML: new asset.FileAsset('project/zemn.me/next/out/index.html').path,
+	error404: new asset.FileAsset('project/zemn.me/next/out/404.html').path,
+	sitePath: 'project/zemn.me/next/out',
 	targetDomain: 'staging.zemn.me',
 	certificateARN: arn,
 });