Merge pull request #38 from NxtLvLSoftware/dev-to-dist

Merge dev changes to dist
NxtLvLSoftware · Dec 11, 2024 · 86f847f · 86f847f
2 parents 830b856 + 8e38a77
commit 86f847f
Show file tree

Hide file tree

Showing 15 changed files with 5,510 additions and 7,830 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,8 @@ permissions:
 
 env:
   GITHUB_ACTIONS: true
-  NODE_VERSION: 20
+  NODE_VERSION: 22
+  PNPM_VERSION: 9
 
 jobs:
   test:
@@ -20,26 +21,28 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+      - name: Use pnpm ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
 
-      - name: Cache node_modules
-        uses: actions/cache@v3
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
         with:
-          path: node_modules
-          key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
+          node-version: ${{ env.NODE_VERSION }}
+          cache: pnpm
+          cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm run clean-install
+        run: pnpm run clean-install
 
       - name: Build alpine-typescript
-        run: npm run build-dist
+        run: pnpm run build-dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: test-build-output
           path: |
@@ -54,7 +57,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           sparse-checkout: |
             examples/package
@@ -65,7 +68,7 @@ jobs:
           mv ./examples/package/* ./
           rm -rf ./examples/package
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: test-build-output
           path: ./alpine-typescript
@@ -74,22 +77,24 @@ jobs:
         run: |
           sed -i 's/file:..\/..\//file:alpine-typescript/g' package.json
 
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+      - name: Use pnpm ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
 
-      - name: Cache node_modules
-        uses: actions/cache@v3
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
         with:
-          path: node_modules
-          key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
+          node-version: ${{ env.NODE_VERSION }}
+          cache: pnpm
+          cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm run clean-install
+        run: pnpm run clean-install
 
       - name: Build package example
-        run: npm run build-dist
+        run: pnpm run build-dist
 
   test-example-project:
     name: Run example project tests
@@ -98,7 +103,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           sparse-checkout: |
             examples/project
@@ -109,7 +114,7 @@ jobs:
           mv ./examples/project/* ./
           rm -rf ./examples/project
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: test-build-output
           path: ./alpine-typescript
@@ -118,22 +123,23 @@ jobs:
         run: |
           sed -i 's/file:..\/..\//file:alpine-typescript/g' package.json
 
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+      - name: Use pnpm ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
 
-      - name: Cache node_modules
-        uses: actions/cache@v3
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
         with:
-          path: node_modules
-          key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
+          node-version: ${{ env.NODE_VERSION }}
+          cache: pnpm
 
       - name: Install dependencies
-        run: npm run clean-install
+        run: pnpm run clean && pnpm add ./alpine-typescript
 
       - name: Build package example
-        run: npm run build-dist
+        run: pnpm run build-dist
 
   stage:
     name: Stage changes as pull request
@@ -144,7 +150,7 @@ jobs:
     if: github.event_name == 'push'
     steps:
       - run: 'echo "Staging dev changes"'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: dist
 
@@ -153,31 +159,33 @@ jobs:
           git fetch origin dev:dev
           git reset --hard dev
 
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+      - name: Use pnpm ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
 
-      - name: Cache node_modules
-        uses: actions/cache@v3
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
         with:
-          path: node_modules
-          key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
+          node-version: ${{ env.NODE_VERSION }}
+          cache: pnpm
+          cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm run clean-install
+        run: pnpm run clean-install
 
       - name: Build alpine-typescript
-        run: npm run build-dist
+        run: pnpm run build-dist
 
       - name: Add dist files
         run: |
           git rm -r --force ./src
-          git add --force ./dist
-          git add --force ./types
+          git add --force ./dist/*.js
+          git add --force ./types/*.d.ts
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.STAGE_DEPLOY_KEY }}
           title: Merge dev changes to dist

diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml
@@ -15,7 +15,8 @@ concurrency:
 
 env:
   GITHUB_ACTIONS: true
-  NODE_VERSION: 20
+  NODE_VERSION: 22
+  PNPM_VERSION: 9
 
 jobs:
   publish:
@@ -27,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/pages-publish.yml b/.github/workflows/pages-publish.yml
@@ -1,8 +1,10 @@
 name: Publish Pages
 
 on:
-  push:
+  workflow_run:
+    workflows: ['Publish Package']
     branches: [dist]
+    types: [completed]
 
 permissions:
   contents: write
@@ -13,43 +15,31 @@ concurrency:
 
 env:
   GITHUB_ACTIONS: true
-  NODE_VERSION: 20
+  NODE_VERSION: 22
+  PNPM_VERSION: 9
 
 jobs:
-  wait-for-package-publish:
-    name: Wait for package publish workflow success
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: Wait for publish success
-        uses: lewagon/[email protected]
-        with:
-          ref: ${{ github.ref }}
-          check-name: Publish to npm registry
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
-
   build-docs:
     name: Generate site
-    needs: [wait-for-package-publish]
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Remove README.md index lines
         run: |
           sed -i '28,127d' README.md
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
@@ -64,7 +54,7 @@ jobs:
         run: |
           cp ./.github/favicon.ico ./docs-build/favicon.ico
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pages-docs-html
           path: ./docs-build
@@ -76,7 +66,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           sparse-checkout: |
             examples/project
@@ -92,12 +82,12 @@ jobs:
           sed -i 's/file:..\/..\//rc/g' package.json
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('package.json') }}
@@ -108,7 +98,7 @@ jobs:
       - name: Build example project
         run: npm run build-dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pages-example-html
           path: ./dist
@@ -120,12 +110,12 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pages-docs-html
           path: ./
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pages-example-html
           path: ./example
@@ -136,7 +126,7 @@ jobs:
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
 
-      - uses: actions/upload-pages-artifact@v2
+      - uses: actions/upload-pages-artifact@v3
         with:
           name: github-pages
           path: ./
@@ -158,4 +148,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Project specific files
-package-lock.json
+pnpm-lock.yaml
 /node_modules
 .github/**/node_modules
 dist/