Merge pull request #3171 from Zemnmez/pr3171

Move the staging.zemn.me site into project/zemn.me
zemn-me · May 31, 2023 · 989ad6e · 989ad6e
2 parents 124f33d + 8ae7399
commit 989ad6e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/project/zemn.me/BUILD.bazel b/project/zemn.me/BUILD.bazel
@@ -1 +1 @@
-# Nothing here!
+# Nothing here!
diff --git a/ts/pulumi/me/zemn/staging/public/BUILD.bazel → project/zemn.me/next/BUILD.bazel b/ts/pulumi/me/zemn/staging/public/BUILD.bazel → 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/...umi/me/zemn/staging/public/pages/_app.tsx → project/zemn.me/next/pages/_app.tsx b/...umi/me/zemn/staging/public/pages/_app.tsx → project/zemn.me/next/pages/_app.tsx
diff --git a/...mi/me/zemn/staging/public/pages/index.tsx → project/zemn.me/next/pages/index.tsx b/...mi/me/zemn/staging/public/pages/index.tsx → 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
@@ -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
@@ -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,
 });