From 6d69b691d4e80734e317965c28c09d95fa3f2b59 Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Wed, 13 Nov 2024 10:26:05 +0100 Subject: [PATCH 1/6] chore: add proper redirects for non-prod docs envs (#3242) --- .github/workflows/deploy-docs-vue-storefront-cloud.yml | 1 + .github/workflows/deploy-router-vue-storefront-cloud.yml | 1 + .github/workflows/deploy-test-next-storefront-cloud.yml | 1 + .github/workflows/deploy-test-nuxt-storefront-cloud.yml | 1 + .github/workflows/image-build-vue-storefront-cloud.yml | 6 +++++- .vuestorefrontcloud/router/docker/Dockerfile | 9 ++++++++- .../docker/{default.conf => default.conf.template} | 2 +- 7 files changed, 18 insertions(+), 3 deletions(-) rename .vuestorefrontcloud/router/docker/{default.conf => default.conf.template} (81%) diff --git a/.github/workflows/deploy-docs-vue-storefront-cloud.yml b/.github/workflows/deploy-docs-vue-storefront-cloud.yml index df1baa9932..3b5a052d78 100644 --- a/.github/workflows/deploy-docs-vue-storefront-cloud.yml +++ b/.github/workflows/deploy-docs-vue-storefront-cloud.yml @@ -21,6 +21,7 @@ jobs: ARTIFACT_TYPE: 'sfui2-docs' DOCKERFILE_PATH: './.vuestorefrontcloud/docs/Dockerfile' ENVIRONMENT: ${{ needs.configure-enviroment.outputs.environment }} + TARGET_DOMAIN: ${{ needs.configure-enviroment.outputs.target-domain }} sync-assets: needs: [build, configure-enviroment] diff --git a/.github/workflows/deploy-router-vue-storefront-cloud.yml b/.github/workflows/deploy-router-vue-storefront-cloud.yml index af4b24ab71..86c746d03d 100644 --- a/.github/workflows/deploy-router-vue-storefront-cloud.yml +++ b/.github/workflows/deploy-router-vue-storefront-cloud.yml @@ -21,6 +21,7 @@ jobs: ARTIFACT_TYPE: "vue-storefront" DOCKERFILE_PATH: ".vuestorefrontcloud/router/docker/Dockerfile" ENVIRONMENT: ${{ needs.configure-enviroment.outputs.environment }} + TARGET_DOMAIN: ${{ needs.configure-enviroment.outputs.target-domain }} deploy: runs-on: ubuntu-latest diff --git a/.github/workflows/deploy-test-next-storefront-cloud.yml b/.github/workflows/deploy-test-next-storefront-cloud.yml index 02e1cd8001..938082f253 100644 --- a/.github/workflows/deploy-test-next-storefront-cloud.yml +++ b/.github/workflows/deploy-test-next-storefront-cloud.yml @@ -21,6 +21,7 @@ jobs: ARTIFACT_TYPE: "sfui2-docs-react" DOCKERFILE_PATH: ".vuestorefrontcloud/test-next/docker/Dockerfile" ENVIRONMENT: ${{ needs.configure-enviroment.outputs.environment }} + TARGET_DOMAIN: ${{ needs.configure-enviroment.outputs.target-domain }} deploy: needs: [ build, configure-enviroment ] diff --git a/.github/workflows/deploy-test-nuxt-storefront-cloud.yml b/.github/workflows/deploy-test-nuxt-storefront-cloud.yml index 996958533d..63b562b6a5 100644 --- a/.github/workflows/deploy-test-nuxt-storefront-cloud.yml +++ b/.github/workflows/deploy-test-nuxt-storefront-cloud.yml @@ -20,6 +20,7 @@ jobs: ARTIFACT_TYPE: "sfui2-docs-vue" DOCKERFILE_PATH: ".vuestorefrontcloud/test-nuxt/docker/Dockerfile" ENVIRONMENT: ${{ needs.configure-enviroment.outputs.environment }} + TARGET_DOMAIN: ${{ needs.configure-enviroment.outputs.target-domain }} deploy: needs: [ build, configure-enviroment ] diff --git a/.github/workflows/image-build-vue-storefront-cloud.yml b/.github/workflows/image-build-vue-storefront-cloud.yml index 5d09316f30..97ec0f6128 100644 --- a/.github/workflows/image-build-vue-storefront-cloud.yml +++ b/.github/workflows/image-build-vue-storefront-cloud.yml @@ -14,6 +14,9 @@ on: ENVIRONMENT: required: true type: string + TARGET_DOMAIN: + required: true + type: string jobs: build: @@ -29,6 +32,7 @@ jobs: uses: elgohr/Publish-Docker-Github-Action@v5 env: ENVIRONMENT: ${{ inputs.ENVIRONMENT }} + TARGET_DOMAIN: ${{ inputs.TARGET_DOMAIN }} with: name: ${{ inputs.DOCKER_NAMESPACE }}/${{ inputs.ARTIFACT_TYPE }}:${{ github.sha }} registry: registry.storefrontcloud.io @@ -36,4 +40,4 @@ jobs: password: ${{ secrets.CLOUD_PASSWORD }} dockerfile: ${{ inputs.DOCKERFILE_PATH }} buildoptions: '--compress' - buildargs: VITE_DOCS_BASEPATH,VITE_DOCS_EXAMPLES_REACT_PATH,VITE_DOCS_EXAMPLES_VUE_PATH,ENVIRONMENT + buildargs: VITE_DOCS_BASEPATH,VITE_DOCS_EXAMPLES_REACT_PATH,VITE_DOCS_EXAMPLES_VUE_PATH,ENVIRONMENT,TARGET_DOMAIN diff --git a/.vuestorefrontcloud/router/docker/Dockerfile b/.vuestorefrontcloud/router/docker/Dockerfile index 5e605906bb..a2e73b7abd 100644 --- a/.vuestorefrontcloud/router/docker/Dockerfile +++ b/.vuestorefrontcloud/router/docker/Dockerfile @@ -1,2 +1,9 @@ FROM nginx -COPY .vuestorefrontcloud/router/docker/default.conf /etc/nginx/conf.d/default.conf + +ARG TARGET_DOMAIN + +ENV TARGET_DOMAIN=$TARGET_DOMAIN + +COPY .vuestorefrontcloud/router/docker/default.conf.template /etc/nginx/conf.d/default.conf.template + +RUN envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf diff --git a/.vuestorefrontcloud/router/docker/default.conf b/.vuestorefrontcloud/router/docker/default.conf.template similarity index 81% rename from .vuestorefrontcloud/router/docker/default.conf rename to .vuestorefrontcloud/router/docker/default.conf.template index 0e0693fda8..66c436d94d 100644 --- a/.vuestorefrontcloud/router/docker/default.conf +++ b/.vuestorefrontcloud/router/docker/default.conf.template @@ -8,6 +8,6 @@ server { # https://www.oliverdavies.uk/blog/nginx-redirects-query-string-arguments location / { - return 301 https://docs.storefrontui.io/v2$uri$is_args$args; + return 301 ${TARGET_DOMAIN}/v2$uri$is_args$args; } } From 725d25181408cd29c16ff9384f453b772c5fc67f Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Fri, 15 Nov 2024 01:15:52 +0100 Subject: [PATCH 2/6] chore: fixup docs dockerfile (#3243) --- .vuestorefrontcloud/docs/Dockerfile | 4 +++- .vuestorefrontcloud/router/docker/Dockerfile | 2 +- apps/docs/components/nuxt.config.ts | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vuestorefrontcloud/docs/Dockerfile b/.vuestorefrontcloud/docs/Dockerfile index dcbd3e5d73..d08e67513c 100644 --- a/.vuestorefrontcloud/docs/Dockerfile +++ b/.vuestorefrontcloud/docs/Dockerfile @@ -2,17 +2,19 @@ FROM node:20-alpine AS build WORKDIR /var/www +COPY . . + ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_REACT_PATH ARG VITE_DOCS_EXAMPLES_VUE_PATH ARG ENVIRONMENT ENV VITE_DOCS_BASEPATH=$VITE_DOCS_BASEPATH +ENV NUXT_APP_BASE_URL=$VITE_DOCS_BASEPATH ENV VITE_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH ENV VITE_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH ENV ENVIRONMENT=$ENVIRONMENT -COPY . . RUN yarn RUN ENV_NAME=$ENVIRONMENT yarn build:replace-assets-url-with RUN yarn build:vue diff --git a/.vuestorefrontcloud/router/docker/Dockerfile b/.vuestorefrontcloud/router/docker/Dockerfile index a2e73b7abd..74ac2119ce 100644 --- a/.vuestorefrontcloud/router/docker/Dockerfile +++ b/.vuestorefrontcloud/router/docker/Dockerfile @@ -6,4 +6,4 @@ ENV TARGET_DOMAIN=$TARGET_DOMAIN COPY .vuestorefrontcloud/router/docker/default.conf.template /etc/nginx/conf.d/default.conf.template -RUN envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf +RUN envsubst '$TARGET_DOMAIN' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf diff --git a/apps/docs/components/nuxt.config.ts b/apps/docs/components/nuxt.config.ts index f22e712e8a..9131e66ece 100644 --- a/apps/docs/components/nuxt.config.ts +++ b/apps/docs/components/nuxt.config.ts @@ -3,8 +3,6 @@ export default defineNuxtConfig({ extends: ['sf-docs-base'], app: { - baseURL: process.env.VITE_DOCS_BASEPATH ?? '', - head: { link: [ { @@ -15,10 +13,10 @@ export default defineNuxtConfig({ }, }, robots: { - enabled: false + enabled: false, }, sitemap: { - enabled: false + enabled: false, }, // fix via https://github.com/nuxt/content/issues/2254 alias: { From 3ec731dfb05e2c6a541c8ace972036cee08f8d63 Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Fri, 15 Nov 2024 11:35:39 +0100 Subject: [PATCH 3/6] fix: example paths (#3244) --- .vuestorefrontcloud/docs/Dockerfile | 6 +++--- apps/docs/components/.env.example | 6 +++--- apps/docs/components/nuxt.config.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vuestorefrontcloud/docs/Dockerfile b/.vuestorefrontcloud/docs/Dockerfile index d08e67513c..770475398a 100644 --- a/.vuestorefrontcloud/docs/Dockerfile +++ b/.vuestorefrontcloud/docs/Dockerfile @@ -9,10 +9,10 @@ ARG VITE_DOCS_EXAMPLES_REACT_PATH ARG VITE_DOCS_EXAMPLES_VUE_PATH ARG ENVIRONMENT -ENV VITE_DOCS_BASEPATH=$VITE_DOCS_BASEPATH +ENV NUXT_DOCS_BASEPATH=$VITE_DOCS_BASEPATH ENV NUXT_APP_BASE_URL=$VITE_DOCS_BASEPATH -ENV VITE_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH -ENV VITE_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH +ENV NUXT_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH +ENV NUXT_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH ENV ENVIRONMENT=$ENVIRONMENT RUN yarn diff --git a/apps/docs/components/.env.example b/apps/docs/components/.env.example index e1271f77f1..60680934cc 100644 --- a/apps/docs/components/.env.example +++ b/apps/docs/components/.env.example @@ -1,3 +1,3 @@ -VITE_DOCS_EXAMPLES_VUE_PATH=http://localhost:3001 -VITE_DOCS_EXAMPLES_REACT_PATH=http://localhost:3002 -VITE_DOCS_BASEPATH=/v2 \ No newline at end of file +NUXT_DOCS_EXAMPLES_VUE_PATH=http://localhost:3001 +NUXT_DOCS_EXAMPLES_REACT_PATH=http://localhost:3002 +NUXT_DOCS_BASEPATH=/v2 \ No newline at end of file diff --git a/apps/docs/components/nuxt.config.ts b/apps/docs/components/nuxt.config.ts index 9131e66ece..832b41d4c9 100644 --- a/apps/docs/components/nuxt.config.ts +++ b/apps/docs/components/nuxt.config.ts @@ -26,8 +26,8 @@ export default defineNuxtConfig({ runtimeConfig: { public: { storefrontUi: true, - DOCS_EXAMPLES_VUE_PATH: process.env.VITE_DOCS_EXAMPLES_VUE_PATH, - DOCS_EXAMPLES_REACT_PATH: process.env.VITE_DOCS_EXAMPLES_REACT_PATH, + DOCS_EXAMPLES_VUE_PATH: process.env.NUXT_DOCS_EXAMPLES_VUE_PATH, + DOCS_EXAMPLES_REACT_PATH: process.env.NUXT_DOCS_EXAMPLES_REACT_PATH, siteUrl: process.env.NUXT_PUBLIC_SITE_URL || 'https://docs.storefrontui.io', siteName: 'Storefront UI', siteDescription: 'Fast, accessible, and fully customizable components built for e-commerce.', From c58f939f3b5ff43c5b4713de44791b4ff0c755f4 Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Wed, 20 Nov 2024 14:23:30 +0100 Subject: [PATCH 4/6] fix: loading example assets without relying on redirects (#3247) update docker debugging docs --- .vuestorefrontcloud/docs/README.md | 6 ++--- .vuestorefrontcloud/router/README.md | 10 +++++++++ .../test-next/docker/Dockerfile | 4 ++-- .../test-next/docker/README.md | 2 +- .../test-nuxt/docker/Dockerfile | 4 ++-- .../test-nuxt/docker/README.md | 2 +- apps/preview/next/next.config.mjs | 22 ++++++++++++++----- apps/preview/nuxt/nuxt.config.ts | 2 +- 8 files changed, 36 insertions(+), 16 deletions(-) diff --git a/.vuestorefrontcloud/docs/README.md b/.vuestorefrontcloud/docs/README.md index 6dd295e193..ac0ce3ffbb 100644 --- a/.vuestorefrontcloud/docs/README.md +++ b/.vuestorefrontcloud/docs/README.md @@ -4,8 +4,8 @@ You can debug dockerized docs image by following steps below: -- build image using `DOCKER_BUILDKIT=1 docker build -t docs --build-arg VITE_DOCS_EXAMPLES_VUE_PATH=http://localhost:3001 --build-arg VITE_DOCS_EXAMPLES_REACT_PATH=http://localhost:3002 --build-arg VITE_DOCS_BASEPATH=/v2/ -f .vuestorefrontcloud/docs/Dockerfile .`, -- run image using `docker run -t -i -p 3000:80 docs`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965) +- build image using `DOCKER_BUILDKIT=1 docker build -t docs --build-arg VITE_DOCS_EXAMPLES_VUE_PATH=http://localhost:3001/v2-vue --build-arg VITE_DOCS_EXAMPLES_REACT_PATH=http://localhost:3002/v2-react --build-arg VITE_DOCS_BASEPATH=/v2/ -f .vuestorefrontcloud/docs/Dockerfile .`, +- run image using `docker run -t -i -p 3004:80 docs`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965) - open browser and go to the address `http://localhost:3000/v2/` to see the docs page running. -NOTE: docs will work but without `vue` and `react` showcases. For full docs experience you have to run `test-next` and `test-nuxt` docker as well. +NOTE: docs will work but without `vue` and `react` showcases. For full docs experience you have to run `test-next` and `test-nuxt` docker as well. And to test root redirect to `/v2/` you need to run `router` docker image too. diff --git a/.vuestorefrontcloud/router/README.md b/.vuestorefrontcloud/router/README.md index 37fc90adf8..490a1d4a26 100644 --- a/.vuestorefrontcloud/router/README.md +++ b/.vuestorefrontcloud/router/README.md @@ -27,3 +27,13 @@ An alternative to robots.txt in this case could be using the built-in Farmer fea However, I went with creating the "nginx + robots.txt file" container here anyways. I'm forced to create a container for nginx so might as well put the robots.txt file here. That's a lot of work to do such a simple thing, but the situation is what it is. + +## Debugging + +You can debug dockerized docs image by following steps below: + +- run `docs` docker image, +- run terminal in `root` directory, +- build image using `DOCKER_BUILDKIT=1 docker build -t docs-router --build-arg TARGET_DOMAIN=http://localhost:3004 -f .vuestorefrontcloud/router/docker/Dockerfile .`, +- run image using `docker run -t -i -p 3000:3000 docs-router nginx-debug -g 'daemon off;'`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965) +- open browser and go to the address `http://localhost:3004` to see the app page running. diff --git a/.vuestorefrontcloud/test-next/docker/Dockerfile b/.vuestorefrontcloud/test-next/docker/Dockerfile index a7dd791c3e..b129429a23 100644 --- a/.vuestorefrontcloud/test-next/docker/Dockerfile +++ b/.vuestorefrontcloud/test-next/docker/Dockerfile @@ -8,8 +8,8 @@ ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_REACT_PATH ARG ENVIRONMENT -ENV VITE_DOCS_BASEPATH=$VITE_DOCS_BASEPATH -ENV VITE_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH +ENV NEXT_DOCS_BASEPATH=$VITE_DOCS_BASEPATH +ENV NEXT_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH ENV ENVIRONMENT=$ENVIRONMENT RUN yarn diff --git a/.vuestorefrontcloud/test-next/docker/README.md b/.vuestorefrontcloud/test-next/docker/README.md index f2fad79fb2..c607ecc634 100644 --- a/.vuestorefrontcloud/test-next/docker/README.md +++ b/.vuestorefrontcloud/test-next/docker/README.md @@ -5,6 +5,6 @@ You can debug dockerized docs image by following steps below: - run terminal in `root` directory -- build image using `DOCKER_BUILDKIT=1 docker build -t test-next -f .vuestorefrontcloud/test-next/docker/Dockerfile .`, +- build image using `DOCKER_BUILDKIT=1 docker build -t test-next --build-arg VITE_DOCS_EXAMPLES_REACT_PATH=https://localhost:3002/v2-react -f .vuestorefrontcloud/test-next/docker/Dockerfile .`, - run image using `docker run -t -i -p 3002:3000 test-next`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965) - open browser and go to the address `http://localhost:3002` to see the app page running. diff --git a/.vuestorefrontcloud/test-nuxt/docker/Dockerfile b/.vuestorefrontcloud/test-nuxt/docker/Dockerfile index 0f98b55eb1..f40ef86068 100644 --- a/.vuestorefrontcloud/test-nuxt/docker/Dockerfile +++ b/.vuestorefrontcloud/test-nuxt/docker/Dockerfile @@ -8,8 +8,8 @@ ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_VUE_PATH ARG ENVIRONMENT -ENV VITE_DOCS_BASEPATH=$VITE_DOCS_BASEPATH -ENV VITE_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH +ENV NUXT_DOCS_BASEPATH=$VITE_DOCS_BASEPATH +ENV NUXT_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH ENV ENVIRONMENT=$ENVIRONMENT RUN yarn diff --git a/.vuestorefrontcloud/test-nuxt/docker/README.md b/.vuestorefrontcloud/test-nuxt/docker/README.md index 1ec1bdf849..eab0b2c9e6 100644 --- a/.vuestorefrontcloud/test-nuxt/docker/README.md +++ b/.vuestorefrontcloud/test-nuxt/docker/README.md @@ -5,6 +5,6 @@ You can debug dockerized docs image by following steps below: - run terminal in `root` directory -- build image using `DOCKER_BUILDKIT=1 docker build -t test-nuxt -f .vuestorefrontcloud/test-nuxt/docker/Dockerfile .`, +- build image using `DOCKER_BUILDKIT=1 docker build -t test-nuxt --build-arg VITE_DOCS_EXAMPLES_VUE_PATH=https://localhost:3002/v2-vue -f .vuestorefrontcloud/test-nuxt/docker/Dockerfile .`, - run image using `docker run -t -i -p 3001:3000 test-nuxt`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965) - open browser and go to the address `http://localhost:3001` to see the app page running. diff --git a/apps/preview/next/next.config.mjs b/apps/preview/next/next.config.mjs index 640892acc9..8e5cba30ed 100644 --- a/apps/preview/next/next.config.mjs +++ b/apps/preview/next/next.config.mjs @@ -6,10 +6,10 @@ const isProd = process.env.PROD === 'true'; /** @type {import('next').NextConfig} */ export default { env: { - DOCS_EXAMPLES_REACT_PATH: process.env.VITE_DOCS_EXAMPLES_REACT_PATH || '', + DOCS_EXAMPLES_REACT_PATH: process.env.NEXT_DOCS_EXAMPLES_REACT_PATH || '', }, - basePath: process.env.VITE_DOCS_EXAMPLES_REACT_PATH - ? new URL(process.env.VITE_DOCS_EXAMPLES_REACT_PATH).pathname + basePath: process.env.NEXT_DOCS_EXAMPLES_REACT_PATH + ? new URL(process.env.NEXT_DOCS_EXAMPLES_REACT_PATH).pathname : '', reactStrictMode: true, swcMinify: true, @@ -49,14 +49,24 @@ export default { }, }); - const reactPackage = resolve(process.cwd(), '..', '..', '..', 'packages', 'sfui', 'frameworks', 'react', 'index.ts'); + const reactPackage = resolve( + process.cwd(), + '..', + '..', + '..', + 'packages', + 'sfui', + 'frameworks', + 'react', + 'index.ts', + ); config.resolve.alias = { ...config.resolve.alias, '@storefront-ui/react': reactPackage, '@storefront-ui/vue': reactPackage, - } + }; } return config; - } + }, }; diff --git a/apps/preview/nuxt/nuxt.config.ts b/apps/preview/nuxt/nuxt.config.ts index 7a17fdb5a3..fd2db6c01e 100644 --- a/apps/preview/nuxt/nuxt.config.ts +++ b/apps/preview/nuxt/nuxt.config.ts @@ -6,7 +6,7 @@ const isProd = process.env.PROD === 'true'; export default defineNuxtConfig({ app: { - baseURL: process.env.VITE_DOCS_EXAMPLES_VUE_PATH ? new URL(process.env.VITE_DOCS_EXAMPLES_VUE_PATH).pathname : '', + baseURL: process.env.NUXT_DOCS_EXAMPLES_VUE_PATH ? new URL(process.env.NUXT_DOCS_EXAMPLES_VUE_PATH).pathname : '', head: { htmlAttrs: { lang: 'en', From 3f041ce02515ff778f7503479938422797707c2e Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Wed, 20 Nov 2024 17:29:29 +0100 Subject: [PATCH 5/6] fix: example docs basepath (#3248) --- .vuestorefrontcloud/test-next/docker/Dockerfile | 1 - .vuestorefrontcloud/test-nuxt/docker/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/.vuestorefrontcloud/test-next/docker/Dockerfile b/.vuestorefrontcloud/test-next/docker/Dockerfile index b129429a23..ed87ad1f0c 100644 --- a/.vuestorefrontcloud/test-next/docker/Dockerfile +++ b/.vuestorefrontcloud/test-next/docker/Dockerfile @@ -8,7 +8,6 @@ ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_REACT_PATH ARG ENVIRONMENT -ENV NEXT_DOCS_BASEPATH=$VITE_DOCS_BASEPATH ENV NEXT_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH ENV ENVIRONMENT=$ENVIRONMENT diff --git a/.vuestorefrontcloud/test-nuxt/docker/Dockerfile b/.vuestorefrontcloud/test-nuxt/docker/Dockerfile index f40ef86068..dfc34c1f10 100644 --- a/.vuestorefrontcloud/test-nuxt/docker/Dockerfile +++ b/.vuestorefrontcloud/test-nuxt/docker/Dockerfile @@ -8,7 +8,6 @@ ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_VUE_PATH ARG ENVIRONMENT -ENV NUXT_DOCS_BASEPATH=$VITE_DOCS_BASEPATH ENV NUXT_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH ENV ENVIRONMENT=$ENVIRONMENT From 6eeda6b627ac3544c85243aa077299b0df2fd5f1 Mon Sep 17 00:00:00 2001 From: Matt Maribojoc Date: Wed, 20 Nov 2024 12:21:19 -0500 Subject: [PATCH 6/6] docs: fix prerender (#3249) * docs: fix prerender * fix: prerender nuxt preview app --- apps/docs/components/nuxt.config.ts | 1 + apps/preview/nuxt/nuxt.config.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/apps/docs/components/nuxt.config.ts b/apps/docs/components/nuxt.config.ts index 832b41d4c9..803f3cf3e1 100644 --- a/apps/docs/components/nuxt.config.ts +++ b/apps/docs/components/nuxt.config.ts @@ -41,6 +41,7 @@ export default defineNuxtConfig({ }, }, prerender: { + routes: ['/'], crawlLinks: true, failOnError: false, }, diff --git a/apps/preview/nuxt/nuxt.config.ts b/apps/preview/nuxt/nuxt.config.ts index fd2db6c01e..a574a7cdd7 100644 --- a/apps/preview/nuxt/nuxt.config.ts +++ b/apps/preview/nuxt/nuxt.config.ts @@ -42,6 +42,12 @@ export default defineNuxtConfig({ } : {}), }, + nitro: { + prerender: { + routes: ['/'], + crawlLinks: true, + }, + }, vite: { plugins: [ {