Chore: bump lerna, jest and create prettier workflow (#862)

steveukx · web-flow · commit 774648049eb3 · 2022-11-12T13:46:07.000Z
* Chore: bump lerna to latest `6.0.3`
* Chore: prettier and add lint action
diff --git a/.changeset/poor-tools-doubt.md b/.changeset/poor-tools-doubt.md
@@ -0,0 +1,5 @@
+---
+'simple-git': minor
+---
+
+Disables the use of inline configuration arguments to prevent unitentionally allowing non-standard remote protocols without explicitly opting in to this practice with the new `allowUnsafeProtocolOverride` property having been enabled.
diff --git a/.changeset/skip-hop-jump.md b/.changeset/skip-hop-jump.md
@@ -0,0 +1,6 @@
+---
+'simple-git': patch
+---
+
+- Upgrade repo dependencies - lerna and jest
+- Include node@19 in the test matrix
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,7 +1,6 @@
 # These are supported funding model platforms
 
 github: [steveukx]
-
 # patreon: # Replace with a single Patreon username
 # open_collective: # Replace with a single Open Collective username
 # ko_fi: # Replace with a single Ko-fi username
diff --git a/.github/delete-merged-branch-config.yml b/.github/delete-merged-branch-config.yml
@@ -1,3 +1,3 @@
 exclude:
-   -  changeset-release/*
+   - changeset-release/*
 delete_closed_pr: false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 version: 2
 updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-      interval: "weekly"
+   - package-ecosystem: 'github-actions'
+     directory: '/'
+     schedule:
+        interval: 'weekly'
diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
@@ -9,21 +9,21 @@ jobs:
    release:
       runs-on: ubuntu-latest
       steps:
-        -  name: Checkout Repo
+         - name: Checkout Repo
            uses: actions/checkout@v3
            with:
-             fetch-depth: 0
+              fetch-depth: 0
 
-        -  uses: actions/setup-node@v3
+         - uses: actions/setup-node@v3
            with:
-               node-version: 16
+              node-version: 18
 
-        -  run: yarn --frozen-lockfile
-        -  run: yarn build
+         - run: yarn --frozen-lockfile
+         - run: yarn build
 
-        -  uses: changesets/action@v1
+         - uses: changesets/action@v1
            with:
               publish: yarn changeset publish
            env:
-               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-               NPM_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
+              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              NPM_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,32 +2,32 @@ name: CI
 
 on:
    push:
-      branches: [ main ]
+      branches: [main]
    pull_request:
-      branches: [ main ]
+      branches: [main]
 
 permissions:
-  contents: read
+   contents: read
 
 jobs:
    build:
       runs-on: ubuntu-latest
       strategy:
          matrix:
-            node-version: [14, 16, 18]
+            node-version: [14, 16, 18, 19]
       steps:
          - uses: actions/checkout@v3
          - name: Use Node.js ${{ matrix.node-version }}
            uses: actions/setup-node@v3
            with:
-             node-version: ${{ matrix.node-version }}
-             cache: yarn
+              node-version: ${{ matrix.node-version }}
+              cache: yarn
          - run: node --version
          - run: git --version
          - run: yarn install --frozen-lockfile
          - run: yarn build
          - name: Test
            env:
-              GIT_AUTHOR_NAME: "Simple Git Tests"
-              GIT_AUTHOR_EMAIL: "tests@simple-git.dev"
+              GIT_AUTHOR_NAME: 'Simple Git Tests'
+              GIT_AUTHOR_EMAIL: 'tests@simple-git.dev'
            run: yarn test
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -0,0 +1,23 @@
+name: Lint
+
+on:
+   push:
+      branches: [main]
+   pull_request:
+      branches: [main]
+
+permissions:
+   contents: read
+
+jobs:
+   lint:
+      runs-on: ubuntu-latest
+      steps:
+         - uses: actions/checkout@v3
+         - name: Use Node.js
+           uses: actions/setup-node@v3
+           with:
+              node-version: 18
+              cache: yarn
+         - run: yarn install --frozen-lockfile
+         - run: yarn prettier --check .
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,5 @@
-node_modules
+*.md
+.changeset
 dist
-CHANGELOG.md
+coverage
+node_modules
diff --git a/lerna.json b/lerna.json
@@ -6,10 +6,7 @@
       "license": "MIT"
     }
   },
-  "ignoreChanges": [
-    "**/test/**",
-    "**/*.md"
-  ],
+  "ignoreChanges": ["**/test/**", "**/*.md"],
   "useWorkspaces": true,
   "version": "2.48.0"
 }
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "@changesets/changelog-github": "^0.4.2",
     "@changesets/cli": "^2.20.0",
-    "lerna": "^5.5.1",
+    "lerna": "^6.0.3",
     "prettier": "^2.7.1"
   }
 }
diff --git a/packages/babel-config/babel.config.js b/packages/babel-config/babel.config.js
@@ -1,9 +1,9 @@
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 
-function resolver() {
+function resolver(resolveToDist) {
    const root = resolve(__dirname, '../..', 'simple-git');
-   const dist = resolve(root, 'dist', 'cjs');
+   const dist = resolveToDist ? resolve(root, 'dist', 'cjs') : root;
 
    const pkg = existsSync(dist) ? dist : root;
 
@@ -19,7 +19,7 @@ function resolver() {
    ];
 }
 
-module.exports = function (resolve = false) {
+module.exports = function (resolveToDist = false) {
    return {
       presets: [
          [
@@ -32,6 +32,6 @@ module.exports = function (resolve = false) {
          ],
          '@babel/preset-typescript',
       ],
-      plugins: resolve ? [resolver()] : [],
+      plugins: [resolver(resolveToDist)],
    };
 };
diff --git a/packages/test-utils/src/expectations.ts b/packages/test-utils/src/expectations.ts
@@ -1,4 +1,4 @@
-import { GitError, GitResponseError } from "simple-git";
+import { GitError, GitResponseError } from 'simple-git';
 
 /**
  * Convenience for asserting the type and message of a `GitError`
diff --git a/simple-git/package.json b/simple-git/package.json
@@ -23,11 +23,11 @@
     "@simple-git/babel-config": "^1.0.0",
     "@simple-git/test-utils": "^2.0.0",
     "@types/debug": "^4.1.5",
-    "@types/jest": "^27.0.3",
+    "@types/jest": "^29.2.2",
     "@types/node": "^16",
     "esbuild": "^0.14.10",
     "esbuild-node-externals": "^1.4.1",
-    "jest": "^27.4.5",
+    "jest": "^29.3.1",
     "ts-node": "^9.0.0",
     "typescript": "^4.1.2"
   },
diff --git a/simple-git/src/git.js b/simple-git/src/git.js
diff --git a/simple-git/src/lib/plugins/timout-plugin.ts b/simple-git/src/lib/plugins/timout-plugin.ts
diff --git a/simple-git/test/integration/broken-chains.spec.ts b/simple-git/test/integration/broken-chains.spec.ts
diff --git a/simple-git/test/integration/plugin.abort.spec.ts b/simple-git/test/integration/plugin.abort.spec.ts
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'simple-git': minor
 +---
++
 +Disables the use of inline configuration arguments to prevent unitentionally allowing non-standard remote protocols without explicitly opting in to this practice with the new `allowUnsafeProtocolOverride` property having been enabled.
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`	`"license": "MIT"`
`7`	`7`	`}`
`8`	`8`	`},`
`9`		`- "ignoreChanges": [`
`10`		`- "/test/",`
`11`		`- "*/.md"`
`12`		`- ],`
	`9`	`+ "ignoreChanges": ["/test/", "*/.md"],`
`13`	`10`	`"useWorkspaces": true,`
`14`	`11`	`"version": "2.48.0"`
`15`	`12`	`}`