From b5dca241e4dcf48abd488585f5f906994429763b Mon Sep 17 00:00:00 2001 From: Chuck Carpenter Date: Wed, 11 Sep 2024 12:39:30 -0700 Subject: [PATCH] =?UTF-8?q?Landing:=20=F0=9F=94=A5=20Remove=20and=20upgrad?= =?UTF-8?q?e=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/landing-deploy.yml | 27 - landing/Dockerfile | 4 +- landing/astro.config.mjs | 11 - landing/package.json | 16 +- landing/src/components/Header.astro | 44 +- landing/src/pages/[...slug].astro | 44 - .../pages/{old-blog => blog}/[...slug].astro | 0 .../src/pages/{old-blog => blog}/index.astro | 0 landing/src/pages/demo.astro | 273 ------ landing/src/pages/index.astro | 318 ++++++- landing/src/pages/pricing.astro | 226 ++--- landing/src/storyblok/AllArticles.astro | 53 -- landing/src/storyblok/Article.astro | 28 - landing/tsconfig.json | 3 +- pnpm-lock.yaml | 890 ++++++++---------- 15 files changed, 809 insertions(+), 1128 deletions(-) delete mode 100644 .github/workflows/landing-deploy.yml delete mode 100644 landing/src/pages/[...slug].astro rename landing/src/pages/{old-blog => blog}/[...slug].astro (100%) rename landing/src/pages/{old-blog => blog}/index.astro (100%) delete mode 100644 landing/src/pages/demo.astro delete mode 100644 landing/src/storyblok/AllArticles.astro delete mode 100644 landing/src/storyblok/Article.astro diff --git a/.github/workflows/landing-deploy.yml b/.github/workflows/landing-deploy.yml deleted file mode 100644 index ac5866c66..000000000 --- a/.github/workflows/landing-deploy.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Landing CD Deploy -on: - push: - branches: - - main - paths: - - 'landing/**' - -jobs: - deploy: - name: Deploy Landing Site - runs-on: ubuntu-latest - concurrency: deploy-group # optional: ensure only one action runs at a time - steps: - - uses: actions/checkout@v4 - - name: Setup pnpm - uses: wyvox/action-setup-pnpm@v3 - - name: Install Dependencies - run: pnpm install - - name: Build JS package - run: pnpm -F shepherd.js build - - uses: superfly/flyctl-actions/setup-flyctl@master - - run: | - flyctl deploy --config landing/fly.toml --dockerfile landing/Dockerfile --build-secret STORYBLOK_TOKEN=${{ secrets.STORYBLOK_TOKEN }} - env: - FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} - STORYBLOK_TOKEN: ${{ secrets.STORYBLOK_TOKEN }} diff --git a/landing/Dockerfile b/landing/Dockerfile index 567c30c1b..6ab851a56 100644 --- a/landing/Dockerfile +++ b/landing/Dockerfile @@ -35,9 +35,7 @@ COPY --link ./landing ./landing RUN pnpm install --frozen-lockfile --prod=false # Build application -RUN --mount=type=secret,id=STORYBLOK_TOKEN \ - STORYBLOK_TOKEN="$(cat /run/secrets/STORYBLOK_TOKEN)" \ - pnpm -F landing run build +RUN pnpm -F landing run build # Remove development dependencies RUN pnpm prune --prod diff --git a/landing/astro.config.mjs b/landing/astro.config.mjs index 679949d8b..3d0a30bc4 100644 --- a/landing/astro.config.mjs +++ b/landing/astro.config.mjs @@ -1,7 +1,6 @@ import { defineConfig } from 'astro/config'; import mdx from '@astrojs/mdx'; import sitemap from '@astrojs/sitemap'; -import storyblok from '@storyblok/astro'; import tailwind from '@astrojs/tailwind'; import { loadEnv } from 'vite'; @@ -13,16 +12,6 @@ export default defineConfig({ integrations: [ mdx(), sitemap(), - storyblok({ - accessToken: STORYBLOK_TOKEN, - apiOptions: { - region: 'us' - }, - components: { - 'all-articles': 'storyblok/AllArticles', - article: 'storyblok/Article' - } - }), tailwind() ], }); diff --git a/landing/package.json b/landing/package.json index eed52ec3f..9c2fe226a 100644 --- a/landing/package.json +++ b/landing/package.json @@ -11,21 +11,19 @@ "astro": "astro" }, "dependencies": { - "@astrojs/check": "^0.8.2", - "@astrojs/mdx": "^3.1.2", + "@astrojs/check": "^0.9.3", + "@astrojs/mdx": "^3.1.5", "@astrojs/rss": "^4.0.7", "@astrojs/sitemap": "^3.1.6", "@astrojs/tailwind": "^5.1.0", - "@storyblok/astro": "^5.0.0", - "@storyblok/js": "^3.0.8", - "astro": "^4.13.0", + "astro": "^4.15.4", "shepherd.js": "workspace:*", - "tailwindcss": "^3.4.3", + "tailwindcss": "^3.4.11", "typescript": "^5.5.3" }, "devDependencies": { - "@tailwindcss/typography": "^0.5.13", - "sharp": "^0.33.4", - "vite": "^5.3.2" + "@tailwindcss/typography": "^0.5.15", + "sharp": "^0.33.5", + "vite": "^5.4.4" } } diff --git a/landing/src/components/Header.astro b/landing/src/components/Header.astro index 16d8a4523..5190b0f11 100644 --- a/landing/src/components/Header.astro +++ b/landing/src/components/Header.astro @@ -4,48 +4,48 @@ import ShepherdHead from '../images/shepherd-head.svg?raw'; import ShepherdHeader from '../images/shepherd-header.svg'; --- -
-
-