Merge pull request #1080 from ThornWalli/beta

pnpm migration
ThornWalli · Aug 24, 2024 · 20b1131 · 20b1131
2 parents 017195b + 6e2c5e8
commit 20b1131
Show file tree

Hide file tree

Showing 49 changed files with 15,689 additions and 2,343 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -20,23 +20,21 @@ jobs:
         node: [20]
 
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: cache node_modules
-        uses: actions/cache@v4
-        id: cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v4
         with:
-          path: |
-            node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
       - name: Test
-        run: npm run test
+        run: pnpm run test
         env:
           FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
           FIREBASE_URL: ${{ secrets.FIREBASE_URL }}
@@ -54,19 +52,19 @@ jobs:
         node: [20]
 
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-
       - name: Checkout Repo
         uses: actions/checkout@v4
-
-      - name: cache node_modules
-        uses: actions/cache@v4
-        id: cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
+          version: 9
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
 
       - name: Versioning
         env:
@@ -77,7 +75,7 @@ jobs:
 
       - name: Build
         run: |
-          npm run generate --workspace=@web-workbench/app
+          pnpm run --filter=app generate
         env:
           WEBSITE_HOST: https://beta.lammpee.de
           FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,23 +20,21 @@ jobs:
         node: [20]
 
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: cache node_modules
-        uses: actions/cache@v4
-        id: cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v4
         with:
-          path: |
-            node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
       - name: Test
-        run: npm run test
+        run: pnpm run test
         env:
           FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
           FIREBASE_URL: ${{ secrets.FIREBASE_URL }}
@@ -54,19 +52,19 @@ jobs:
         node: [20]
 
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-
       - name: Checkout Repo
         uses: actions/checkout@v4
-
-      - name: cache node_modules
-        uses: actions/cache@v4
-        id: cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
+          version: 9
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
 
       - name: Versioning
         env:
@@ -77,7 +75,7 @@ jobs:
 
       - name: Build
         run: |
-          npm run generate --workspace=@web-workbench/app
+          pnpm run generate --workspace=@web-workbench/app
           cp firebase.json ./packages/app/.output/public/firebase.json
           cp .firebaserc ./packages/app/.output/public/.firebaserc
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,26 +14,21 @@ jobs:
         node: [20]
 
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-
       - name: Checkout Repo
         uses: actions/checkout@v4
-
-      - name: cache node_modules
-        uses: actions/cache@v4
-        id: cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
-
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci
-
+          version: 9
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
       - name: Test
-        run: npm run test
+        run: pnpm run test
         env:
           FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
           FIREBASE_URL: ${{ secrets.FIREBASE_URL }}

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -2,60 +2,28 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "type": "node",
-      "request": "launch",
+      "command": "pnpm run --filter=app dev",
       "name": "Debug (dev)",
-      "runtimeVersion": "default",
-      "runtimeArgs": [
-        "--inspect"
-      ],
-      "program": "${workspaceFolder}/node_modules/.bin/nuxt",
-      "outputCapture": "std",
-      "args": [
-        "dev"
-      ]
+      "request": "launch",
+      "type": "node-terminal"
     },
     {
-      "type": "node",
-      "request": "launch",
+      "command": "pnpm run --filter=app generate",
       "name": "Debug (generate)",
-      "runtimeVersion": "default",
-      "runtimeArgs": [
-        "--inspect"
-      ],
-      "program": "${workspaceFolder}/node_modules/.bin/nuxt",
-      "outputCapture": "std",
-      "args": [
-        "generate"
-      ]
+      "request": "launch",
+      "type": "node-terminal"
     },
     {
-      "type": "node",
+      "command": "pnpm run --filter=app build",
+      "name": "Debug (build)",
       "request": "launch",
-      "name": "Debug (start)",
-      "runtimeVersion": "default",
-      "runtimeArgs": [
-        "--inspect"
-      ],
-      "program": "${workspaceFolder}/node_modules/.bin/nuxt",
-      "outputCapture": "std",
-      "args": [
-        "start"
-      ]
+      "type": "node-terminal"
     },
     {
-      "type": "node",
+      "command": "pnpm run --filter=app start",
+      "name": "Debug (start)",
       "request": "launch",
-      "name": "Debug (build)",
-      "runtimeVersion": "default",
-      "runtimeArgs": [
-        "--inspect"
-      ],
-      "program": "${workspaceFolder}/node_modules/.bin/nuxt",
-      "outputCapture": "std",
-      "args": [
-        "build"
-      ]
+      "type": "node-terminal"
     }
   ]
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Project Changelog
 
+## [1.3.33-beta.1](https://github.com/ThornWalli/web-workbench/compare/v1.3.32...v1.3.33-beta.1) (2024-08-24)
+
+
+### Bug Fixes
+
+* **tools:** added tools ([e619686](https://github.com/ThornWalli/web-workbench/commit/e619686a62c9a39d686d2c3532600be2cb5b6376))
+* **update:** improvements ([e431e6d](https://github.com/ThornWalli/web-workbench/commit/e431e6d5500591f4046caf0325fa5a21d8ed37c5))
+
 ## [1.3.32](https://github.com/ThornWalli/web-workbench/compare/v1.3.31...v1.3.32) (2024-08-09)
 
 

diff --git a/jsconfig.json b/jsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "./packages/app/.nuxt/tsconfig.json",
   "compilerOptions": {
     "target": "esnext",
     "module": "es2015",
@@ -25,4 +26,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}