Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the staging.zemn.me site into project/zemn.me #3171

Merged
merged 1 commit into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/zemn.me/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# Nothing here!
# Nothing here!
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -16,6 +16,6 @@ ts_project(
)

next_project(
name = "public_next",
srcs = [":public"],
name = "next",
srcs = [":ts"],
)
2 changes: 1 addition & 1 deletion ts/pulumi/me/zemn/staging/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 3 additions & 7 deletions ts/pulumi/me/zemn/staging/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});