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

fix: add mermaid config #4643

Merged
merged 6 commits into from
Jun 9, 2024
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 .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ website:
- changed-files:
- any-glob-to-any-file: 'runatlantis.io/.vitepress/**/*'
- any-glob-to-any-file: 'package.json'
- any-glob-to-any-file: 'pnpm-lock.yaml'
- any-glob-to-any-file: 'package-lock.json'
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
postUpdateOptions: [
'gomodTidy',
'gomodUpdateImportPaths',
'pnpmDedupe',
'npmDedupe',
],
prHourlyLimit: 1,
minimumReleaseAge: '5 days',
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
filters: |
src:
- '**.js'
- 'pnpm-lock.yaml'
- 'package-lock.json'
- 'package.json'
- '.github/workflows/website.yml'

Expand All @@ -54,9 +54,11 @@ jobs:
config: .markdownlint.yaml
globs: 'runatlantis.io/**/*.md'

- uses: wyvox/action-setup-pnpm@6597ef5c1300fe08efa6bc75e6141f7153e2b4cc # v3
- name: setup npm
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
with:
node-version: 20
node-version: '20'
cache: 'npm'

- name: run http-server
env:
Expand All @@ -67,16 +69,16 @@ jobs:
curl -Ls https://github.com/raviqqe/muffet/releases/download/v${MUFFET_VERSION}/muffet_linux_amd64.tar.gz | tar -xz

# build site
pnpm install
pnpm website:build
npm install
npm run website:build

# start http-server for integration testing
npx http-server runatlantis.io/.vitepress/dist &

- name: Run Playwright E2E tests
run: |
pnpx playwright install --with-deps
pnpm run e2e
npx playwright install --with-deps
npm run e2e

- name: wait until server listened
run: curl --retry-delay 1 --retry 30 --retry-all-error http://localhost:8080
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ atlantis
.devcontainer
atlantis.env
*.act
package-lock.json
Dockerfile.local

# gitreleaser
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pnpm 9.1.4
npm v10.7.0
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
We take security issues seriously. Please report a security vulnerability to the maintainers using [private vulnerability reporting](https://github.com/runatlantis/atlantis/security/advisories/new).

# Updating The Website
* To view the generated website locally, run `pnpm website:dev` and then
* To view the generated website locally, run `npm website:dev` and then
open your browser to http://localhost:8080.
* The website will be regenerated when your pull request is merged to main.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ end-to-end-tests: ## Run e2e tests

.PHONY: website-dev
website-dev: ## Run runatlantic.io on localhost:8080
pnpm website:dev
npm website:dev
44 changes: 22 additions & 22 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# Netlify Config, https://www.netlify.com/docs/netlify-toml-reference/
[build]
base = "/"
publish = "runatlantis.io/.vitepress/dist/"
command = "pnpm install && pnpm website:build"
base = "/"
command = "npm install && npm run website:build"
publish = "runatlantis.io/.vitepress/dist/"

[[redirects]]
from = "/guide/getting-started.html"
to = "/guide/"
status = 301
force = true
force = true
from = "/guide/getting-started.html"
status = 301
to = "/guide/"

[[redirects]]
from = "/docs/atlantis-yaml-reference.html"
to = "/docs/repo-level-atlantis-yaml.html"
status = 301
force = true
force = true
from = "/docs/atlantis-yaml-reference.html"
status = 301
to = "/docs/repo-level-atlantis-yaml.html"

[[headers]]
for = "/*"
[headers.values]
X-Frame-Options = "DENY"
X-XSS-Protection = "1; mode=block"
Cache-Control = "public, max-age=86400"
Strict-Transport-Security = "max-age=86400; includeSubDomains; preload"
Referrer-Policy = "no-referrer"
X-Content-Type-Options = "nosniff"
for = "/*"
[headers.values]
Cache-Control = "public, max-age=86400"
Referrer-Policy = "no-referrer"
Strict-Transport-Security = "max-age=86400; includeSubDomains; preload"
X-Content-Type-Options = "nosniff"
X-Frame-Options = "DENY"
X-XSS-Protection = "1; mode=block"

[[headers]]
for = "*.html"
[headers.values]
Content-Type = "text/html; charset=UTF-8"
for = "*.html"
[headers.values]
Content-Type = "text/html; charset=UTF-8"
Loading