Merge pull request #131 from expatfile/development

🔖 Relate stable version
expatfile · May 16, 2024 · e07b318 · e07b318
2 parents 65c21fe + 8a92f37
commit e07b318
Show file tree

Hide file tree

Showing 13 changed files with 8,182 additions and 6,747 deletions.
diff --git a/.github/actions/back-merge/action.yml b/.github/actions/back-merge/action.yml
@@ -38,5 +38,5 @@ runs:
       git fetch --unshallow
       git checkout development
       git pull
-      git merge --no-ff origin/${{ inputs.main_branch }} -m "Back-merge ${{ inputs.main_branch }} into development"
+      git merge --no-ff origin/${{ inputs.main_branch }} -m "🔀 Back-merge ${{ inputs.main_branch }} into development"
       git push
diff --git a/.github/actions/setup-pnpm/action.yml b/.github/actions/setup-pnpm/action.yml
@@ -15,44 +15,21 @@ runs:
   using: "composite"
 
   steps:
-  - name: Install Node.js ${{ matrix.node-version }}
-    uses: actions/setup-node@v3
-    with:
-      node-version: ${{ matrix.node-version }}
-
   - name: Install pnpm
-    uses: pnpm/action-setup@v2
+    uses: pnpm/action-setup@v3
     id: pnpm-install
     with:
-      version: 8
+      version: 9
       run_install: false
 
-  - name: Set pnpm home
-    shell: bash
-    run: |
-      echo "PNPM_HOME=$HOME/.local/share/pnpm" >> $GITHUB_ENV
-      echo "$HOME/.local/share/pnpm" >> $GITHUB_PATH
-
-  - name: Get pnpm store directory
-    id: pnpm-cache
-    shell: bash
-    run: |
-      echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-  - name: Setup pnpm cache
-    uses: actions/cache@v3
+  - name: Install Node.js ${{ matrix.node-version }}
+    uses: actions/setup-node@v4
     with:
-      path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
-      key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      restore-keys: |
-        ${{ runner.os }}-pnpm-store-
-
-  - name: Authenticate for private NPM package
-    shell: bash
+      node-version: ${{ matrix.node-version }}
+      cache: pnpm
+      registry-url: 'https://registry.npmjs.org'
     env:
-      NPM_TOKEN: ${{ inputs.npm_token }}
-    run: |
-      echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+      NODE_AUTH_TOKEN: ${{ inputs.npm_token }}
 
   - name: Install dependencies
     shell: bash

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,6 +83,6 @@ jobs:
             --coverage
 
       - name: Upload code coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/examples/with-app-router-context/next.config.js b/examples/with-app-router-context/next.config.js
@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   experimental: {
+    serverComponentsExternalPackages: ['next-runtime-env'],
     // This is optional incase you want to make some private env vars publicly
     // available.
     instrumentationHook: true,

diff --git a/examples/with-app-router-context/package.json b/examples/with-app-router-context/package.json
@@ -9,15 +9,15 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@types/node": "20.11.30",
-    "@types/react": "18.2.67",
-    "@types/react-dom": "18.2.22",
+    "@types/node": "20.12.12",
+    "@types/react": "18.3.2",
+    "@types/react-dom": "18.3.0",
     "eslint": "8.57.0",
-    "eslint-config-next": "14.1.4",
-    "next": "14.1.4",
+    "eslint-config-next": "14.2.3",
+    "next": "14.2.3",
     "next-runtime-env": "link:../..",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "typescript": "5.4.3"
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "typescript": "5.4.5"
   }
 }