adjust configs

vorant94 · Jul 23, 2024 · 0aa9527 · 0aa9527
1 parent 31a6ef9
commit 0aa9527
Show file tree

Hide file tree

Showing 29 changed files with 91 additions and 28 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  format-build-test-and-e2e:
-    timeout-minutes: 60
+  format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -16,13 +15,59 @@ jobs:
 
       - run: npm run format:check
 
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./.github/actions/setup
+
+      - run: npm run build:client --workspace=@digital-garden/blog
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: client-build-output
+          path: packages/blog/public/client/
+          retention-days: 30
+
+      - run: npm run build:server --workspace=@digital-garden/blog
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: server-build-output
+          path: packages/blog/dist/
+          retention-days: 30
+
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./.github/actions/setup
+
       - run: npm run build:client --workspace=@digital-garden/blog
 
       - run: npm run build:server --workspace=@digital-garden/blog
 
       - run: npm run test --workspace=@digital-garden/blog
 
-      - run: npm run e2e:setup --workspace=@digital-garden/blog -- --with-deps
+  e2e:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    needs:
+      - test
+      - build
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./.github/actions/setup
+
+      - run: npm run build:client --workspace=@digital-garden/blog
+
+      - run: npm run build:server --workspace=@digital-garden/blog
+
+      - run: npm run e2e:setup --workspace=@digital-garden/blog
 
       - run: npm run e2e --workspace=@digital-garden/blog
 
@@ -36,7 +81,10 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: deploy-group
     needs:
-      - format-build-test-and-e2e
+      - format
+      - test
+      - e2e
+      - build
     steps:
       - uses: actions/checkout@v4
 

diff --git a/packages/blog/package.json b/packages/blog/package.json
@@ -12,7 +12,7 @@
     "test": "glob dist/**/*.spec.js -c 'node --test'",
     "test:watch": "glob dist/**/*.spec.js -c 'node --test --watch'",
     "e2e": "playwright test",
-    "e2e:setup": "playwright install",
+    "e2e:setup": "playwright install --with-deps",
     "clean": "shx rm -rf dist && shx rm -rf public/client"
   },
   "dependencies": {

diff --git a/packages/blog/playwright.config.mjs → packages/blog/playwright.config.js b/packages/blog/playwright.config.mjs → packages/blog/playwright.config.js
diff --git a/packages/blog/postcss.config.cjs b/packages/blog/postcss.config.cjs
diff --git a/packages/blog/postcss.config.js b/packages/blog/postcss.config.js
@@ -0,0 +1,15 @@
+import autoprefixer from 'autoprefixer';
+import cssnano from 'cssnano';
+import postcssNested from 'postcss-nested';
+import tailwindcss from 'tailwindcss';
+import tailwindcssNesting from 'tailwindcss/nesting';
+
+/** @type {import('postcss-load-config').Config} */
+export default {
+  plugins: [
+    tailwindcss,
+    autoprefixer,
+    cssnano,
+    tailwindcssNesting(postcssNested),
+  ],
+};
diff --git a/packages/blog/tailwind.config.mjs → packages/blog/tailwind.config.js b/packages/blog/tailwind.config.mjs → packages/blog/tailwind.config.js
diff --git a/packages/blog/vite.config.mjs → packages/blog/vite.config.js b/packages/blog/vite.config.mjs → packages/blog/vite.config.js
@@ -1,9 +1,11 @@
 import path from 'node:path';
 import process from 'node:process';
 import { defineConfig } from 'vite';
+import postcss from './postcss.config.js';
 
 export default defineConfig({
   publicDir: false,
+  css: { postcss },
   build: {
     outDir: path.resolve(process.cwd(), 'public/client'),
     lib: {

diff --git a/packages/canvas/postcss.config.cjs b/packages/canvas/postcss.config.cjs
diff --git a/packages/canvas/postcss.config.js b/packages/canvas/postcss.config.js
@@ -0,0 +1,15 @@
+import autoprefixer from 'autoprefixer';
+import cssnano from 'cssnano';
+import postcssNested from 'postcss-nested';
+import tailwindcss from 'tailwindcss';
+import tailwindcssNesting from 'tailwindcss/nesting';
+
+/** @type {import('postcss-load-config').Config} */
+export default {
+  plugins: [
+    tailwindcss,
+    autoprefixer,
+    cssnano,
+    tailwindcssNesting(postcssNested),
+  ],
+};
diff --git a/packages/canvas/src/DigitalGarden/dark.png → packages/canvas/src/digital-garden/dark.png b/packages/canvas/src/DigitalGarden/dark.png → packages/canvas/src/digital-garden/dark.png
diff --git a/...canvas/src/DigitalGarden/index.module.css → ...anvas/src/digital-garden/index.module.css b/...canvas/src/DigitalGarden/index.module.css → ...anvas/src/digital-garden/index.module.css
diff --git a/packages/canvas/src/DigitalGarden/index.tsx → packages/canvas/src/digital-garden/index.tsx b/packages/canvas/src/DigitalGarden/index.tsx → packages/canvas/src/digital-garden/index.tsx
diff --git a/packages/canvas/src/DigitalGarden/light.png → packages/canvas/src/digital-garden/light.png b/packages/canvas/src/DigitalGarden/light.png → packages/canvas/src/digital-garden/light.png
diff --git a/packages/canvas/src/Home/index.tsx → packages/canvas/src/home/index.tsx b/packages/canvas/src/Home/index.tsx → packages/canvas/src/home/index.tsx
diff --git a/packages/canvas/src/main.tsx b/packages/canvas/src/main.tsx
@@ -1,11 +1,11 @@
-import { DigitalGarden } from '@/DigitalGarden';
-import { Home } from '@/Home';
-import { ThoughtsOnModernFrameworkFeatures } from '@/ThoughtsOnModernFrameworkFeatures';
-import { TypescriptMonoreposAreAMess } from '@/TypescriptMonoreposAreAMess';
 import { route } from '@/router/route.ts';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { RouterProvider, createBrowserRouter } from 'react-router-dom';
+import { DigitalGarden } from 'src/digital-garden';
+import { Home } from 'src/home';
+import { ThoughtsOnModernFrameworkFeatures } from 'src/thoughts-on-modern-framework-features';
+import { TypescriptMonoreposAreAMess } from 'src/typescript-monorepos-are-a-mess';
 import './index.css';
 
 const router = createBrowserRouter([

diff --git a/...nModernFrameworkFeatures/angular-logo.png → ...odern-framework-features/angular-logo.png b/...nModernFrameworkFeatures/angular-logo.png → ...odern-framework-features/angular-logo.png
diff --git a/...oughtsOnModernFrameworkFeatures/index.tsx → ...ts-on-modern-framework-features/index.tsx b/...oughtsOnModernFrameworkFeatures/index.tsx → ...ts-on-modern-framework-features/index.tsx
diff --git a/...sOnModernFrameworkFeatures/react-logo.svg → ...-modern-framework-features/react-logo.svg b/...sOnModernFrameworkFeatures/react-logo.svg → ...-modern-framework-features/react-logo.svg
diff --git a/...rnFrameworkFeatures/spider-man-triple.jpg → ...-framework-features/spider-man-triple.jpg b/...rnFrameworkFeatures/spider-man-triple.jpg → ...-framework-features/spider-man-triple.jpg
diff --git a/...htsOnModernFrameworkFeatures/vue-logo.png → ...on-modern-framework-features/vue-logo.png b/...htsOnModernFrameworkFeatures/vue-logo.png → ...on-modern-framework-features/vue-logo.png
diff --git a/...scriptMonoreposAreAMess/git-logo-dark.svg → ...pt-monorepos-are-a-mess/git-logo-dark.svg b/...scriptMonoreposAreAMess/git-logo-dark.svg → ...pt-monorepos-are-a-mess/git-logo-dark.svg
diff --git a/.../TypescriptMonoreposAreAMess/git-logo.svg → ...escript-monorepos-are-a-mess/git-logo.svg b/.../TypescriptMonoreposAreAMess/git-logo.svg → ...escript-monorepos-are-a-mess/git-logo.svg
diff --git a/...src/TypescriptMonoreposAreAMess/index.tsx → ...typescript-monorepos-are-a-mess/index.tsx b/...src/TypescriptMonoreposAreAMess/index.tsx → ...typescript-monorepos-are-a-mess/index.tsx
diff --git a/...escriptMonoreposAreAMess/ts-logo-dark.svg → ...ipt-monorepos-are-a-mess/ts-logo-dark.svg b/...escriptMonoreposAreAMess/ts-logo-dark.svg → ...ipt-monorepos-are-a-mess/ts-logo-dark.svg
diff --git a/...c/TypescriptMonoreposAreAMess/ts-logo.svg → ...pescript-monorepos-are-a-mess/ts-logo.svg b/...c/TypescriptMonoreposAreAMess/ts-logo.svg → ...pescript-monorepos-are-a-mess/ts-logo.svg
diff --git a/...criptMonoreposAreAMess/yarn-logo-dark.svg → ...t-monorepos-are-a-mess/yarn-logo-dark.svg b/...criptMonoreposAreAMess/yarn-logo-dark.svg → ...t-monorepos-are-a-mess/yarn-logo-dark.svg
diff --git a/...TypescriptMonoreposAreAMess/yarn-logo.svg → ...script-monorepos-are-a-mess/yarn-logo.svg b/...TypescriptMonoreposAreAMess/yarn-logo.svg → ...script-monorepos-are-a-mess/yarn-logo.svg
diff --git a/packages/canvas/tailwind.config.mjs → packages/canvas/tailwind.config.js b/packages/canvas/tailwind.config.mjs → packages/canvas/tailwind.config.js
diff --git a/packages/canvas/vite.config.mjs → packages/canvas/vite.config.js b/packages/canvas/vite.config.mjs → packages/canvas/vite.config.js
@@ -1,10 +1,12 @@
 import react from '@vitejs/plugin-react';
 import { fileURLToPath, URL } from 'node:url';
 import { defineConfig } from 'vite';
+import postcss from './postcss.config.js';
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  css: { postcss },
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),