Merge pull request #409 from prezly/dev/simplify-pnpm-overrides

Simplify `pnpm.overrides` setting action
prezly · May 9, 2023 · e9a5cee · e9a5cee
2 parents e4985ea + 1aebcb6
commit e9a5cee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 40 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,17 +21,12 @@ jobs:
           pnpm: "8.4.0"
 
       - name: Set React ${{ matrix.react-version }}
-        uses: jossef/action-set-json-field@v2.1
+        uses: prezly/pnpm-overrides-action@v1
         with:
-          file: package.json
-          parse_json: true
-          field: pnpm.overrides
-          value: '{"@types/react":"${{ env.REACT_TYPES_VERSION }}","@types/react-dom":"${{ env.REACT_DOM_TYPES_VERSION }}","react":"${{ env.REACT_VERSION }}","react-dom":"${{ env.REACT_DOM_VERSION }}"}'
-        env:
-          REACT_TYPES_VERSION: ${{ matrix.react-version }}
-          REACT_VERSION: ${{ matrix.react-version }}
-          REACT_DOM_TYPES_VERSION: ${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}
-          REACT_DOM_VERSION: ${{ matrix.react-version }}
+          '@types/react':     "${{ matrix.react-version }}"
+          '@types/react-dom': "${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}"
+          'react':            "${{ matrix.react-version }}"
+          'react-dom':        "${{ matrix.react-version }}"
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -21,17 +21,12 @@ jobs:
           pnpm: "8.4.0"
 
       - name: Set React ${{ matrix.react-version }}
-        uses: jossef/action-set-json-field@v2.1
+        uses: prezly/pnpm-overrides-action@v1
         with:
-          file: package.json
-          parse_json: true
-          field: pnpm.overrides
-          value: '{"@types/react":"${{ env.REACT_TYPES_VERSION }}","@types/react-dom":"${{ env.REACT_DOM_TYPES_VERSION }}","react":"${{ env.REACT_VERSION }}","react-dom":"${{ env.REACT_DOM_VERSION }}"}'
-        env:
-          REACT_TYPES_VERSION: ${{ matrix.react-version }}
-          REACT_VERSION: ${{ matrix.react-version }}
-          REACT_DOM_TYPES_VERSION: ${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}
-          REACT_DOM_VERSION: ${{ matrix.react-version }}
+          '@types/react':     "${{ matrix.react-version }}"
+          '@types/react-dom': "${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}"
+          'react':            "${{ matrix.react-version }}"
+          'react-dom':        "${{ matrix.react-version }}"
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile --strict-peer-dependencies --ignore-pnpmfile --prod
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -21,17 +21,12 @@ jobs:
           pnpm: "8.4.0"
 
       - name: Set React ${{ matrix.react-version }}
-        uses: jossef/action-set-json-field@v2.1
+        uses: prezly/pnpm-overrides-action@v1
         with:
-          file: package.json
-          parse_json: true
-          field: pnpm.overrides
-          value: '{"@types/react":"${{ env.REACT_TYPES_VERSION }}","@types/react-dom":"${{ env.REACT_DOM_TYPES_VERSION }}","react":"${{ env.REACT_VERSION }}","react-dom":"${{ env.REACT_DOM_VERSION }}"}'
-        env:
-          REACT_TYPES_VERSION: ${{ matrix.react-version }}
-          REACT_VERSION: ${{ matrix.react-version }}
-          REACT_DOM_TYPES_VERSION: ${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}
-          REACT_DOM_VERSION: ${{ matrix.react-version }}
+          '@types/react':     "${{ matrix.react-version }}"
+          '@types/react-dom': "${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}"
+          'react':            "${{ matrix.react-version }}"
+          'react-dom':        "${{ matrix.react-version }}"
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,17 +21,12 @@ jobs:
           pnpm: "8.4.0"
 
       - name: Set React ${{ matrix.react-version }}
-        uses: jossef/action-set-json-field@v2.1
+        uses: prezly/pnpm-overrides-action@v1
         with:
-          file: package.json
-          parse_json: true
-          field: pnpm.overrides
-          value: '{"@types/react":"${{ env.REACT_TYPES_VERSION }}","@types/react-dom":"${{ env.REACT_DOM_TYPES_VERSION }}","react":"${{ env.REACT_VERSION }}","react-dom":"${{ env.REACT_DOM_VERSION }}"}'
-        env:
-          REACT_TYPES_VERSION: ${{ matrix.react-version }}
-          REACT_VERSION: ${{ matrix.react-version }}
-          REACT_DOM_TYPES_VERSION: ${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}
-          REACT_DOM_VERSION: ${{ matrix.react-version }}
+          '@types/react':     "${{ matrix.react-version }}"
+          '@types/react-dom': "${{ startsWith(matrix.react-version, '16.') && '16.9.9' || matrix.react-version }}"
+          'react':            "${{ matrix.react-version }}"
+          'react-dom':        "${{ matrix.react-version }}"
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile