Merge pull request #67 from arkahna/chore/dependency-upgrades

Upgraded dependencies
arkahna · Oct 29, 2022 · 2d58f8c · 2d58f8c
2 parents e40dd10 + e5ca7fb
commit 2d58f8c
Show file tree

Hide file tree

Showing 17 changed files with 1,561 additions and 1,305 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -7,7 +7,7 @@
     "updateInternalDependencies": "patch",
     "ignore": [],
     "changelog": [
-        "@changesets/changelog-github",
+        "@svitejs/changesets-changelog-github-compact",
         {
             "repo": "arkahna/oss-nx-packages"
         }

diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
@@ -9,31 +9,41 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+        uses: nrwl/nx-set-shas@v3
 
       - name: Enable node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
-      - name: Cache pnpm modules
-        uses: actions/cache@v2
+      - uses: pnpm/[email protected]
         with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
+          version: 7
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: pnpm/[email protected]
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          version: 7
-          run_install: true
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: pnpm install
+        run: |
+          pnpm install --frozen-lockfile
 
       - name: TypeCheck
         run: pnpm tsc -b

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,28 +19,34 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
 
       - name: Setup Node.js 16.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
-      - uses: pnpm/action-setup@v2.1.0
+      - uses: pnpm/action-setup@v2.2.4
         with:
           version: 7
-          run_install: true
+          run_install: false
 
-      - name: Cache pnpm modules
-        uses: actions/cache@v2
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          path: ~/.pnpm-store
-          key: \${{ runner.os }}-\${{ hashFiles('**/pnpm-lock.yaml') }}
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            \${{ runner.os }}-
+            ${{ runner.os }}-pnpm-store-
 
       - name: pnpm install
         run: |

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
       - name: get pull request ref
         id: get_pull_request_ref
-        uses: octokit/request-action@v2.1.0
+        uses: octokit/request-action@v2.x
         with:
           route: GET /repos/{owner}/{repository}/pulls/{issue_id}
           owner: ${{ github.repository_owner }}
@@ -53,20 +53,34 @@ jobs:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: pull the repo.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           persist-credentials: true
           repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}
 
       - name: Setup Node.js 16.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
-      - uses: pnpm/action-setup@v2.1.0
+      - uses: pnpm/action-setup@v2.2.4
         with:
           version: 7
-          run_install: true
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       - name: pnpm install
         run: |

diff --git a/libs/nx-terraform/package.json b/libs/nx-terraform/package.json
@@ -12,15 +12,15 @@
         "url": "https://github.com/arkahna/oss-nx-packages.git"
     },
     "dependencies": {
-        "@arkahna/nx-workspace": "0.3.1",
+        "@arkahna/nx-workspace": "workspace:0.3.1",
         "execa": "5.1.1",
         "front-matter": "^4.0.2",
         "node-fetch": "^2.6.7",
         "public-ip": "^4.0.4",
-        "uuid-by-string": "^3.0.6"
+        "uuid-by-string": "^3.0.7"
     },
     "optionalDependencies": {
-        "@azure/arm-resources": "^5.0.0",
+        "@azure/arm-resources": "^5.0.1",
         "@azure/identity": "^3.0.0",
         "@azure/logger": "^1.0.3"
     },

diff --git a/libs/nx-terraform/src/executors/apply/schema.json b/libs/nx-terraform/src/executors/apply/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Apply executor",
@@ -65,7 +67,5 @@
             "description": "Leave firewall exceptions in place after apply"
         }
     },
-    "required": [
-        "environment"
-    ]
+    "required": ["environment"]
 }
diff --git a/libs/nx-terraform/src/executors/destroy/schema.json b/libs/nx-terraform/src/executors/destroy/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Destroy executor",
@@ -60,9 +62,6 @@
             "type": "boolean",
             "description": "Run the Destroy action without user prompt for approval"
         }
-
     },
-    "required": [
-        "environment"
-    ]
+    "required": ["environment"]
 }
diff --git a/libs/nx-terraform/src/executors/force-unlock/schema.json b/libs/nx-terraform/src/executors/force-unlock/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Force unlock executor",
@@ -30,7 +32,5 @@
             "default": 5
         }
     },
-    "required": [
-        "environment"
-    ]
+    "required": ["environment"]
 }
diff --git a/libs/nx-terraform/src/executors/lint/schema.json b/libs/nx-terraform/src/executors/lint/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Lint executor",

diff --git a/libs/nx-terraform/src/executors/output/schema.json b/libs/nx-terraform/src/executors/output/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform output executor",
@@ -33,7 +35,5 @@
             "default": 5
         }
     },
-    "required": [
-        "environment"
-    ]
+    "required": ["environment"]
 }
diff --git a/libs/nx-terraform/src/executors/plan/schema.json b/libs/nx-terraform/src/executors/plan/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Plan executor",
@@ -62,7 +64,5 @@
             "description": "The target resource to deploy"
         }
     },
-    "required": [
-        "environment"
-    ]
+    "required": ["environment"]
 }
diff --git a/libs/nx-terraform/src/executors/state/schema.json b/libs/nx-terraform/src/executors/state/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform State executor",
@@ -13,10 +15,7 @@
         "address": {
             "type": "string",
             "description": "The address of the resource",
-            "aliases": [
-                "r",
-                "p"
-            ]
+            "aliases": ["r", "p"]
         },
         "environment": {
             "type": "string",
@@ -44,8 +43,5 @@
             "default": false
         }
     },
-    "required": [
-        "environment",
-        "command"
-    ]
+    "required": ["environment", "command"]
 }
diff --git a/libs/nx-terraform/src/executors/tf-init/schema.json b/libs/nx-terraform/src/executors/tf-init/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "cli": "nx",
     "title": "Terraform Init executor",

diff --git a/libs/nx-workspace/src/executors/run-command/schema.json b/libs/nx-workspace/src/executors/run-command/schema.json
@@ -1,4 +1,6 @@
 {
+    "version": 2,
+    "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/schema",
     "type": "object",
     "cli": "nx",
@@ -12,7 +14,5 @@
             "description": "The working directory to run the command in"
         }
     },
-    "required": [
-        "command"
-    ]
+    "required": ["command"]
 }
diff --git a/nx.json b/nx.json
@@ -11,26 +11,28 @@
         "default": {
             "runner": "nx/tasks-runners/default",
             "options": {
-                "cacheableOperations": [
-                    "build",
-                    "lint",
-                    "test",
-                    "e2e"
-                ]
+                "cacheableOperations": ["build", "lint", "test", "e2e"]
             }
         }
     },
     "$schema": "./node_modules/nx/schemas/nx-schema.json",
     "targetDefaults": {
         "build": {
-            "dependsOn": [
-                "^build"
-            ]
+            "dependsOn": ["^build"],
+            "inputs": ["production", "^production"]
+        },
+        "lint": {
+            "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
         }
     },
     "pluginsConfig": {
         "@nrwl/js": {
             "analyzeSourceFiles": true
         }
+    },
+    "namedInputs": {
+        "default": ["{projectRoot}/**/*", "sharedGlobals"],
+        "sharedGlobals": [],
+        "production": ["default", "!{projectRoot}/.eslintrc.json"]
     }
 }