From e9b952a8823c49a6a8c9de0c749375b981d02800 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 4 Jun 2021 13:28:38 -0700 Subject: [PATCH] docs: rename tools/daggosaurus to website Signed-off-by: Andrea Luzzardi --- .dagger/env/docs/plan/main.cue | 4 ++-- .github/dependabot.yml | 2 +- Makefile | 4 ++-- netlify.toml | 18 +++++++++++++++--- tools/daggosaurus/docs | 1 - {tools/daggosaurus => website}/.gitignore | 0 {tools/daggosaurus => website}/README.md | 0 .../daggosaurus => website}/babel.config.js | 0 .../custom_plugins/index.js | 0 website/docs | 1 + .../docusaurus.config.js | 0 {tools/daggosaurus => website}/package.json | 2 +- {tools/daggosaurus => website}/sidebars.js | 0 .../src/css/custom.scss | 0 .../DocPaginator/Dagger_Icons_Arrow-next.svg | 0 .../Dagger_Icons_Arrow-previous.svg | 0 .../src/theme/DocPaginator/index.js | 0 .../src/theme/SearchBar/index.js | 0 .../src/theme/SearchBar/styles.css | 0 .../src/theme/Toggle/Icon_Day-mode.svg | 0 .../src/theme/Toggle/Icon_Night-mode.svg | 0 .../src/theme/Toggle/index.js | 0 .../src/theme/Toggle/styles.module.css | 0 .../src/theme/prism-include-languages.js | 0 .../src/theme/prism.cue.js | 0 .../daggosaurus => website}/static/.nojekyll | 0 .../static/img/Dagger_Icons_Arrow-bottom.svg | 0 .../static/img/Dagger_Icons_Arrow-left.svg | 0 .../static/img/Dagger_Icons_Arrow-right.svg | 0 .../static/img/Dagger_Icons_Arrow-top.svg | 0 .../static/img/Dagger_Icons_Caution.svg | 0 .../static/img/Dagger_Icons_Danger.svg | 0 .../static/img/Dagger_Icons_Edit.svg | 0 .../static/img/Dagger_Icons_External-link.svg | 0 .../static/img/Dagger_Icons_Help.svg | 0 .../static/img/Dagger_Icons_Info.svg | 0 .../static/img/Dagger_Icons_Note.svg | 0 .../static/img/Dagger_Icons_Search.svg | 0 .../static/img/Dagger_Icons_Tip.svg | 0 .../static/img/dagger-logo.png | Bin .../static/img/dagger_logo_dark.png | Bin .../static/img/favicon.png | Bin {tools/daggosaurus => website}/yarn.lock | 0 43 files changed, 22 insertions(+), 10 deletions(-) delete mode 120000 tools/daggosaurus/docs rename {tools/daggosaurus => website}/.gitignore (100%) rename {tools/daggosaurus => website}/README.md (100%) rename {tools/daggosaurus => website}/babel.config.js (100%) rename {tools/daggosaurus => website}/custom_plugins/index.js (100%) create mode 120000 website/docs rename {tools/daggosaurus => website}/docusaurus.config.js (100%) rename {tools/daggosaurus => website}/package.json (97%) rename {tools/daggosaurus => website}/sidebars.js (100%) rename {tools/daggosaurus => website}/src/css/custom.scss (100%) rename {tools/daggosaurus => website}/src/theme/DocPaginator/Dagger_Icons_Arrow-next.svg (100%) rename {tools/daggosaurus => website}/src/theme/DocPaginator/Dagger_Icons_Arrow-previous.svg (100%) rename {tools/daggosaurus => website}/src/theme/DocPaginator/index.js (100%) rename {tools/daggosaurus => website}/src/theme/SearchBar/index.js (100%) rename {tools/daggosaurus => website}/src/theme/SearchBar/styles.css (100%) rename {tools/daggosaurus => website}/src/theme/Toggle/Icon_Day-mode.svg (100%) rename {tools/daggosaurus => website}/src/theme/Toggle/Icon_Night-mode.svg (100%) rename {tools/daggosaurus => website}/src/theme/Toggle/index.js (100%) rename {tools/daggosaurus => website}/src/theme/Toggle/styles.module.css (100%) rename {tools/daggosaurus => website}/src/theme/prism-include-languages.js (100%) rename {tools/daggosaurus => website}/src/theme/prism.cue.js (100%) rename {tools/daggosaurus => website}/static/.nojekyll (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Arrow-bottom.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Arrow-left.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Arrow-right.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Arrow-top.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Caution.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Danger.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Edit.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_External-link.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Help.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Info.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Note.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Search.svg (100%) rename {tools/daggosaurus => website}/static/img/Dagger_Icons_Tip.svg (100%) rename {tools/daggosaurus => website}/static/img/dagger-logo.png (100%) rename {tools/daggosaurus => website}/static/img/dagger_logo_dark.png (100%) rename {tools/daggosaurus => website}/static/img/favicon.png (100%) rename {tools/daggosaurus => website}/yarn.lock (100%) diff --git a/.dagger/env/docs/plan/main.cue b/.dagger/env/docs/plan/main.cue index e8f07048..da62aa99 100644 --- a/.dagger/env/docs/plan/main.cue +++ b/.dagger/env/docs/plan/main.cue @@ -12,8 +12,8 @@ repository: dagger.#Artifact @dagger(input) // Build the docs website docs: yarn.#Package & { source: repository - cwd: "tools/daggosaurus/" - buildDir: "tools/daggosaurus/build" + cwd: "website/" + buildDir: "website/build" } // Deploy the docs website diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4ef5ba8e..5b8305c4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,6 @@ updates: schedule: interval: "daily" - package-ecosystem: "npm" - directory: "/tools/daggosaurus" + directory: "/website" schedule: interval: "daily" diff --git a/Makefile b/Makefile index 1bea4f25..19d25878 100644 --- a/Makefile +++ b/Makefile @@ -52,5 +52,5 @@ install: dagger .PHONY: docs docs: - yarn --cwd "./tools/daggosaurus" install - yarn --cwd "./tools/daggosaurus" start + yarn --cwd "./website" install + yarn --cwd "./website" start diff --git a/netlify.toml b/netlify.toml index f26637b6..da0b0fb1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,18 @@ [build] - base = "tools/daggosaurus/" + base = "website/" publish = "build/" command = "yarn build" - # build only if there are changes within daggosaurus or docs directories. - ignore = "[ $BRANCH != main ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../../docs/" + +[context.production] + # Do not build the site if there's no site-related changes since the last + # commit. + # This assumes PRs to `main` only contain merge commits, so it's safe to + # compare the current commit to the previous. + # We can't use `$CACHED_COMMIT_REF` because that points to the PR preview + # that was built before merging. + ignore = "git diff --quiet HEAD^ HEAD -- . ../docs/ ../netlify.toml" + +[context.deploy-preview] + # Do not build the site if there's no site-related changes since the last + # deploy. + ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../docs/ ../netlify.toml" diff --git a/tools/daggosaurus/docs b/tools/daggosaurus/docs deleted file mode 120000 index 92a7f825..00000000 --- a/tools/daggosaurus/docs +++ /dev/null @@ -1 +0,0 @@ -../../docs \ No newline at end of file diff --git a/tools/daggosaurus/.gitignore b/website/.gitignore similarity index 100% rename from tools/daggosaurus/.gitignore rename to website/.gitignore diff --git a/tools/daggosaurus/README.md b/website/README.md similarity index 100% rename from tools/daggosaurus/README.md rename to website/README.md diff --git a/tools/daggosaurus/babel.config.js b/website/babel.config.js similarity index 100% rename from tools/daggosaurus/babel.config.js rename to website/babel.config.js diff --git a/tools/daggosaurus/custom_plugins/index.js b/website/custom_plugins/index.js similarity index 100% rename from tools/daggosaurus/custom_plugins/index.js rename to website/custom_plugins/index.js diff --git a/website/docs b/website/docs new file mode 120000 index 00000000..a9594bfe --- /dev/null +++ b/website/docs @@ -0,0 +1 @@ +../docs \ No newline at end of file diff --git a/tools/daggosaurus/docusaurus.config.js b/website/docusaurus.config.js similarity index 100% rename from tools/daggosaurus/docusaurus.config.js rename to website/docusaurus.config.js diff --git a/tools/daggosaurus/package.json b/website/package.json similarity index 97% rename from tools/daggosaurus/package.json rename to website/package.json index f0054a8c..795dccc3 100644 --- a/tools/daggosaurus/package.json +++ b/website/package.json @@ -1,5 +1,5 @@ { - "name": "daggosaurus", + "name": "dagger-docs", "version": "0.0.0", "private": true, "scripts": { diff --git a/tools/daggosaurus/sidebars.js b/website/sidebars.js similarity index 100% rename from tools/daggosaurus/sidebars.js rename to website/sidebars.js diff --git a/tools/daggosaurus/src/css/custom.scss b/website/src/css/custom.scss similarity index 100% rename from tools/daggosaurus/src/css/custom.scss rename to website/src/css/custom.scss diff --git a/tools/daggosaurus/src/theme/DocPaginator/Dagger_Icons_Arrow-next.svg b/website/src/theme/DocPaginator/Dagger_Icons_Arrow-next.svg similarity index 100% rename from tools/daggosaurus/src/theme/DocPaginator/Dagger_Icons_Arrow-next.svg rename to website/src/theme/DocPaginator/Dagger_Icons_Arrow-next.svg diff --git a/tools/daggosaurus/src/theme/DocPaginator/Dagger_Icons_Arrow-previous.svg b/website/src/theme/DocPaginator/Dagger_Icons_Arrow-previous.svg similarity index 100% rename from tools/daggosaurus/src/theme/DocPaginator/Dagger_Icons_Arrow-previous.svg rename to website/src/theme/DocPaginator/Dagger_Icons_Arrow-previous.svg diff --git a/tools/daggosaurus/src/theme/DocPaginator/index.js b/website/src/theme/DocPaginator/index.js similarity index 100% rename from tools/daggosaurus/src/theme/DocPaginator/index.js rename to website/src/theme/DocPaginator/index.js diff --git a/tools/daggosaurus/src/theme/SearchBar/index.js b/website/src/theme/SearchBar/index.js similarity index 100% rename from tools/daggosaurus/src/theme/SearchBar/index.js rename to website/src/theme/SearchBar/index.js diff --git a/tools/daggosaurus/src/theme/SearchBar/styles.css b/website/src/theme/SearchBar/styles.css similarity index 100% rename from tools/daggosaurus/src/theme/SearchBar/styles.css rename to website/src/theme/SearchBar/styles.css diff --git a/tools/daggosaurus/src/theme/Toggle/Icon_Day-mode.svg b/website/src/theme/Toggle/Icon_Day-mode.svg similarity index 100% rename from tools/daggosaurus/src/theme/Toggle/Icon_Day-mode.svg rename to website/src/theme/Toggle/Icon_Day-mode.svg diff --git a/tools/daggosaurus/src/theme/Toggle/Icon_Night-mode.svg b/website/src/theme/Toggle/Icon_Night-mode.svg similarity index 100% rename from tools/daggosaurus/src/theme/Toggle/Icon_Night-mode.svg rename to website/src/theme/Toggle/Icon_Night-mode.svg diff --git a/tools/daggosaurus/src/theme/Toggle/index.js b/website/src/theme/Toggle/index.js similarity index 100% rename from tools/daggosaurus/src/theme/Toggle/index.js rename to website/src/theme/Toggle/index.js diff --git a/tools/daggosaurus/src/theme/Toggle/styles.module.css b/website/src/theme/Toggle/styles.module.css similarity index 100% rename from tools/daggosaurus/src/theme/Toggle/styles.module.css rename to website/src/theme/Toggle/styles.module.css diff --git a/tools/daggosaurus/src/theme/prism-include-languages.js b/website/src/theme/prism-include-languages.js similarity index 100% rename from tools/daggosaurus/src/theme/prism-include-languages.js rename to website/src/theme/prism-include-languages.js diff --git a/tools/daggosaurus/src/theme/prism.cue.js b/website/src/theme/prism.cue.js similarity index 100% rename from tools/daggosaurus/src/theme/prism.cue.js rename to website/src/theme/prism.cue.js diff --git a/tools/daggosaurus/static/.nojekyll b/website/static/.nojekyll similarity index 100% rename from tools/daggosaurus/static/.nojekyll rename to website/static/.nojekyll diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Arrow-bottom.svg b/website/static/img/Dagger_Icons_Arrow-bottom.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Arrow-bottom.svg rename to website/static/img/Dagger_Icons_Arrow-bottom.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Arrow-left.svg b/website/static/img/Dagger_Icons_Arrow-left.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Arrow-left.svg rename to website/static/img/Dagger_Icons_Arrow-left.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Arrow-right.svg b/website/static/img/Dagger_Icons_Arrow-right.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Arrow-right.svg rename to website/static/img/Dagger_Icons_Arrow-right.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Arrow-top.svg b/website/static/img/Dagger_Icons_Arrow-top.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Arrow-top.svg rename to website/static/img/Dagger_Icons_Arrow-top.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Caution.svg b/website/static/img/Dagger_Icons_Caution.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Caution.svg rename to website/static/img/Dagger_Icons_Caution.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Danger.svg b/website/static/img/Dagger_Icons_Danger.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Danger.svg rename to website/static/img/Dagger_Icons_Danger.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Edit.svg b/website/static/img/Dagger_Icons_Edit.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Edit.svg rename to website/static/img/Dagger_Icons_Edit.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_External-link.svg b/website/static/img/Dagger_Icons_External-link.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_External-link.svg rename to website/static/img/Dagger_Icons_External-link.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Help.svg b/website/static/img/Dagger_Icons_Help.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Help.svg rename to website/static/img/Dagger_Icons_Help.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Info.svg b/website/static/img/Dagger_Icons_Info.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Info.svg rename to website/static/img/Dagger_Icons_Info.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Note.svg b/website/static/img/Dagger_Icons_Note.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Note.svg rename to website/static/img/Dagger_Icons_Note.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Search.svg b/website/static/img/Dagger_Icons_Search.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Search.svg rename to website/static/img/Dagger_Icons_Search.svg diff --git a/tools/daggosaurus/static/img/Dagger_Icons_Tip.svg b/website/static/img/Dagger_Icons_Tip.svg similarity index 100% rename from tools/daggosaurus/static/img/Dagger_Icons_Tip.svg rename to website/static/img/Dagger_Icons_Tip.svg diff --git a/tools/daggosaurus/static/img/dagger-logo.png b/website/static/img/dagger-logo.png similarity index 100% rename from tools/daggosaurus/static/img/dagger-logo.png rename to website/static/img/dagger-logo.png diff --git a/tools/daggosaurus/static/img/dagger_logo_dark.png b/website/static/img/dagger_logo_dark.png similarity index 100% rename from tools/daggosaurus/static/img/dagger_logo_dark.png rename to website/static/img/dagger_logo_dark.png diff --git a/tools/daggosaurus/static/img/favicon.png b/website/static/img/favicon.png similarity index 100% rename from tools/daggosaurus/static/img/favicon.png rename to website/static/img/favicon.png diff --git a/tools/daggosaurus/yarn.lock b/website/yarn.lock similarity index 100% rename from tools/daggosaurus/yarn.lock rename to website/yarn.lock