Lock file maintenance

Revert "Update dependency vue to v3"

.github/workflows/build.yml

@@ -10,37 +10,35 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
           always-auth: true
           registry-url: https://registry.npmjs.org
       - id: cache_npm
         name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.npm
             ./node_modules.tar.zstd
-          key: ${{ runner.OS }}-npm-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.OS }}-node16.x-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.OS }}-npm-
-            ${{ runner.OS }}-
+            ${{ runner.OS }}-node16.x-
       - name: Install dependencies with NPM
         if: steps.cache_npm.outputs.cache-hit != 'true'
         run: npm ci
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
       - name: Archive node_modules
         if: steps.cache_npm.outputs.cache-hit != 'true'
         run: tar --use-compress-program "zstd -T0 --long=31 -1" -cf node_modules.tar.zstd -P node_modules
       - name: Persisting node_modules artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: node_modules.tar.zstd
           path: node_modules.tar.zstd
+          retention-days: 2
 
   #
   # lint job
@@ -51,32 +49,32 @@ jobs:
 
     steps:
       # Setup
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.MADSCI_BUILD_USER_TOKEN }} # allows commit of any fixes to trigger a new workflow run
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v2
+          token: ${{ secrets.BUILD_USER_TOKEN || github.token }} # allows commit of any fixes to trigger a new workflow run
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
           always-auth: true
           registry-url: https://registry.npmjs.org
       - name: Restore node_modules artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: node_modules.tar.zstd
       - name: Unarchive node_modules
         run: tar --use-compress-program "zstd -d --long=31" -xf node_modules.tar.zstd
       # Lint
       - name: Run linters
-        uses: wearerequired/lint-action@v1
+        uses: wearerequired/lint-action@v2
         with:
           prettier: true
           eslint: true
           eslint_args: "--ext '.ts,.js' --ignore-path '.gitignore' --ignore-pattern '.github/*'"
           continue_on_error: false
-          auto_fix: true
-          git_name: Madbot
-          git_email: 64821814+madsci-bot@users.noreply.github.com
+          auto_fix: ${{ secrets.BUILD_USER_TOKEN && 'true' || 'false' }}
+          git_name: equabot
+          git_email: git@equalogic.com
 
   #
   # build job
@@ -87,15 +85,15 @@ jobs:
 
     steps:
       # Setup
-      - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
           always-auth: true
           registry-url: https://registry.npmjs.org
       - name: Restore node_modules artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: node_modules.tar.zstd
       - name: Unarchive node_modules
@@ -123,9 +121,15 @@ jobs:
 
     steps:
       # Setup
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          always-auth: true
+          registry-url: https://registry.npmjs.org
       - name: Restore node_modules artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: node_modules.tar.zstd
       - name: Unarchive node_modules
@@ -135,9 +139,3 @@ jobs:
         run: node_modules/.bin/dotenv -e .env.ci -- npm run test:ci
         env:
           CI: true
-      - if: always()
-        name: Persisting test-results.html artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: test-results.html
-          path: test/.results/test-results.html

.github/workflows/cleanup.yml

@@ -1,18 +0,0 @@
-name: Cleanup
-
-on:
-  schedule:
-    - cron: '0 1 * * *' # every day at 1am
-
-jobs:
-  remove-old-artifacts:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Remove old artifacts
-        uses: c-hive/gha-remove-artifacts@v1
-        with:
-          age: '1 days'    # delete artifacts older than this
-          skip-tags: false # don't treat artifacts created by runs on tagged commits any differently
-          skip-recent: 2   # keep the last 2 runs, regardless of age

.github/workflows/publish.yml

@@ -3,6 +3,7 @@ name: Publish
 on:
   release:
     types: [created]
+  workflow_dispatch:
 
 jobs:
   #
@@ -12,30 +13,27 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
           always-auth: true
           registry-url: https://registry.npmjs.org
       # Dependencies
       - id: cache_npm
         name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.npm
             ./node_modules.tar.zstd
-          key: ${{ runner.OS }}-npm-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.OS }}-node16.x-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.OS }}-npm-
-            ${{ runner.OS }}-
+            ${{ runner.OS }}-node16.x-
       - name: Install dependencies with NPM
         if: steps.cache_npm.outputs.cache-hit != 'true'
         run: npm ci
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
       - name: Unarchive node_modules
         if: steps.cache_npm.outputs.cache-hit == 'true'
         run: tar --use-compress-program "zstd -d --long=31" -xf node_modules.tar.zstd
@@ -56,6 +54,6 @@ jobs:
       - name: Copy extra files into dist directory
         run: cp package.json README* dist/
       - name: Publish release to NPM registry
-        run: npm publish dist
+        run: npm publish dist/
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_PUBLISHING }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.nvmrc

@@ -1 +1 @@
-16.12.0
+16.16.0

package.json

@@ -2,14 +2,14 @@
   "name": "vue-apollo-smart-ops",
   "version": "0.2.0-beta.1",
   "description": "Create TypeScript-typed operation functions for your Vue Apollo queries and mutations.",
-  "author": "Madscience Ltd",
+  "author": "Equalogic Ltd",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/madscience/vue-apollo-smart-ops.git"
+    "url": "https://github.com/equalogic/vue-apollo-smart-ops.git"
   },
   "scripts": {
     "prebuild": "rimraf dist && npm run barrels:generate",
@@ -36,41 +36,39 @@
   "peerDependencies": {
     "apollo-client": ">=2.6",
     "apollo-link": ">=1.2",
-    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0",
+    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
     "vue": ">=2.6",
     "vue-apollo": ">=3"
   },
   "devDependencies": {
-    "@types/jest": "27.0.2",
-    "@types/lodash.isplainobject": "4.0.6",
-    "@types/lodash.mapvalues": "4.6.6",
-    "@typescript-eslint/eslint-plugin": "5.1.0",
-    "@typescript-eslint/parser": "5.1.0",
-    "@vue/test-utils": "1.2.2",
+    "@types/jest": "27.5.2",
+    "@types/lodash.isplainobject": "4.0.7",
+    "@types/lodash.mapvalues": "4.6.7",
+    "@typescript-eslint/eslint-plugin": "5.30.5",
+    "@typescript-eslint/parser": "5.30.5",
+    "@vue/test-utils": "1.3.0",
     "apollo-client": "2.6.10",
     "apollo-link": "1.2.14",
-    "barrelsby": "2.3.0",
-    "dotenv-cli": "4.0.0",
-    "eslint": "8.0.1",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.25.2",
-    "eslint-plugin-jest": "25.2.2",
+    "barrelsby": "2.3.4",
+    "dotenv-cli": "6.0.0",
+    "eslint": "8.19.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-jest": "26.5.3",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "5.1.0",
-    "eslint-plugin-vue": "7.19.1",
-    "graphql": "15.6.1",
-    "graphql-tag": "2.12.5",
-    "husky": "7.0.4",
-    "jest": "27.3.1",
-    "lint-staged": "11.2.3",
+    "eslint-plugin-promise": "6.0.0",
+    "eslint-plugin-vue": "9.2.0",
+    "graphql": "15.8.0",
+    "graphql-tag": "2.12.6",
+    "jest": "27.5.1",
     "mkdirp": "1.0.4",
-    "np": "7.5.0",
-    "prettier": "2.4.1",
+    "np": "7.6.1",
+    "prettier": "2.7.1",
     "rimraf": "3.0.2",
-    "ts-jest": "27.0.7",
-    "typescript": "4.4.4",
+    "ts-jest": "27.1.5",
+    "typescript": "4.7.4",
     "vue": "2.6.14",
-    "vue-apollo": "3.0.8",
+    "vue-apollo": "3.1.0",
     "vue-class-component": "7.2.6",
     "vue-property-decorator": "9.1.2"
   },
@@ -78,13 +76,5 @@
     "node": ">=12.9.0"
   },
   "main": "index.js",
-  "types": "index.d.ts",
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{ts,js}": "eslint --ext .ts,.js --ignore-path .gitignore --fix --cache"
-  }
+  "types": "index.d.ts"
 }

renovate.json

@@ -2,7 +2,7 @@
   "extends": [
     "config:js-lib",
     ":automergeMajor",
-    ":automergePr",
+    ":automergeBranch",
     ":automergeRequireAllStatusChecks",
     ":dependencyDashboard",
     ":semanticCommitsDisabled"
@@ -12,6 +12,7 @@
   "prCreation": "not-pending",
   "stabilityDays": 3,
   "rebaseWhen": "conflicted",
+  "lockFileMaintenance": true,
   "labels": ["dependencies"],
   "reviewers": ["sgarner"],
   "packageRules": [
@@ -22,6 +23,12 @@
     {
       "packagePatterns": ["jest"],
       "groupName": "jest"
+    },
+    {
+      "matchDatasources": ["nvm", "npm"],
+      "matchPackageNames": ["node", "@types/node"],
+      "groupName": "Node.js",
+      "allowedVersions": "^16"
     }
   ]
 }