Yarn v4 (#968)

steveukx · web-flow · commit 9bfdf08d2f00 · 2024-02-03T12:31:30.000Z
* Explicitly specify `packageManager` as yarn v1

* Explicitly specify `packageManager` as yarn v4.1.0
Cache yarn release binary and use repo level module cache

* Add opt-in script for purging module cache (from npm and yarn)

* Add opt-in script for purging module cache (from npm and yarn)

* Run prettier, update remote tests for increased coverage

* Changeset

* Use `*` notation for interdependent packages in the workspace
diff --git a/.changeset/honest-paws-cry.md b/.changeset/honest-paws-cry.md
@@ -0,0 +1,5 @@
+---
+"simple-git": minor
+---
+
+Bump package manager from yarn v1 to v4
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,19 @@
 .idea/
 .DS_Store
+
 node_modules/
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 coverage/
 dist/
 *.bak
 *.log
 *.tsbuildinfo
+
 package-lock.json
diff --git a/.yarn/releases/yarn-4.1.0.cjs b/.yarn/releases/yarn-4.1.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,5 @@
+enableGlobalCache: false
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
diff --git a/package.json b/package.json
@@ -7,17 +7,20 @@
     "simple-git"
   ],
   "resolutions": {
-    "typescript": "4.7.4"
+    "typescript": "4.7.4",
+    "jest": "29.7.0"
   },
   "scripts": {
     "build": "lerna run build",
-    "clean": "git clean -fxd -e .idea -e node_modules",
+    "clean": "git clean -fxd -e .idea -e node_modules -e .yarn",
+    "clean:cache": "git clean -fxd .yarn node_modules packages simple-git",
     "test": "lerna run test"
   },
   "dependencies": {
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "lerna": "^8.0.1",
     "prettier": "^3.0.1"
-  }
+  },
+  "packageManager": "yarn@4.1.0"
 }
diff --git a/packages/test-es-module-consumer/package.json b/packages/test-es-module-consumer/package.json
@@ -7,7 +7,7 @@
     "test": "node test.mjs"
   },
   "dependencies": {
-    "simple-git": "^3.10.0"
+    "simple-git": "*"
   },
   "repository": {
     "type": "git",
diff --git a/packages/test-javascript-consumer/package.json b/packages/test-javascript-consumer/package.json
@@ -6,7 +6,7 @@
     "test": "node test.js && node test-default.js"
   },
   "dependencies": {
-    "simple-git": "^3.10.0"
+    "simple-git": "*"
   },
   "repository": {
     "type": "git",
diff --git a/packages/test-typescript-consumer/package.json b/packages/test-typescript-consumer/package.json
@@ -16,12 +16,15 @@
     "test:jest": "jest"
   },
   "dependencies": {
-    "@simple-git/babel-config": "^1.0.0",
-    "simple-git": "^3.10.0"
+    "@simple-git/babel-config": "*",
+    "simple-git": "*"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/steveukx/git-js.git",
     "directory": "packages/test-typescript-consumer"
+  },
+  "devDependencies": {
+    "jest": "^29.7.0"
   }
 }
diff --git a/packages/test-typescript-consumer/tsconfig.json b/packages/test-typescript-consumer/tsconfig.json
@@ -8,7 +8,7 @@
     "baseUrl": ".",
     "paths": {},
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": false
+    "allowSyntheticDefaultImports": false,
   },
-  "files": ["test/ts-default-from-root.spec.ts"]
+  "files": ["test/ts-default-from-root.spec.ts"],
 }
diff --git a/packages/test-typescript-esm-consumer/package.json b/packages/test-typescript-esm-consumer/package.json
@@ -14,12 +14,15 @@
     "test": "jest"
   },
   "dependencies": {
-    "@simple-git/babel-config": "^1.0.0",
-    "simple-git": "^3.10.0"
+    "@simple-git/babel-config": "*",
+    "simple-git": "*"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/steveukx/git-js.git",
     "directory": "packages/test-typescript-consumer"
+  },
+  "devDependencies": {
+    "jest": "^29.7.0"
   }
 }
diff --git a/packages/test-typescript-esm-consumer/tsconfig.json b/packages/test-typescript-esm-consumer/tsconfig.json
@@ -5,7 +5,7 @@
     "moduleResolution": "node16",
     "noEmit": true,
     "allowSyntheticDefaultImports": true,
-    "baseUrl": "."
+    "baseUrl": ".",
     //    "emitDecoratorMetadata": true,
     //    "experimentalDecorators": true,
     //    "forceConsistentCasingInFileNames": true,
@@ -18,5 +18,5 @@
     //    "sourceMap": true,
     //    "strictBindCallApply": true,
     //    "strictNullChecks": false,
-  }
+  },
 }
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -3,6 +3,6 @@
   "version": "4.0.0",
   "private": true,
   "peerDependencies": {
-    "simple-git": "^3.22.0"
+    "simple-git": "*"
   }
 }
diff --git a/simple-git/src/lib/tasks/remote.ts b/simple-git/src/lib/tasks/remote.ts
@@ -5,7 +5,7 @@ import { straightThroughStringTask } from './task';
 export function addRemoteTask(
    remoteName: string,
    remoteRepo: string,
-   customArgs: string[] = []
+   customArgs: string[]
 ): StringTask<string> {
    return straightThroughStringTask(['remote', 'add', ...customArgs, remoteName, remoteRepo]);
 }
@@ -23,7 +23,7 @@ export function getRemotesTask(verbose: boolean): StringTask<any> {
    };
 }
 
-export function listRemotesTask(customArgs: string[] = []): StringTask<string> {
+export function listRemotesTask(customArgs: string[]): StringTask<string> {
    const commands = [...customArgs];
    if (commands[0] !== 'ls-remote') {
       commands.unshift('ls-remote');
@@ -32,7 +32,7 @@ export function listRemotesTask(customArgs: string[] = []): StringTask<string> {
    return straightThroughStringTask(commands);
 }
 
-export function remoteTask(customArgs: string[] = []): StringTask<string> {
+export function remoteTask(customArgs: string[]): StringTask<string> {
    const commands = [...customArgs];
    if (commands[0] !== 'remote') {
       commands.unshift('remote');
diff --git a/simple-git/tsconfig.json b/simple-git/tsconfig.json
@@ -26,14 +26,14 @@
     "declarationMap": false,
     "sourceMap": true,
     "paths": {},
-    "noEmit": true
+    "noEmit": true,
   },
   "exclude": ["node_modules"],
   "include": [
     "src/lib/**/*.ts",
     "test/__fixtures__/**/*.ts",
     "test/integration/**/*.ts",
     "test/unit/**/*.ts",
-    "typings/index.d.ts"
-  ]
+    "typings/index.d.ts",
+  ],
 }
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"simple-git": minor
 +---
++
 +Bump package manager from yarn v1 to v4