@gkalpak/aliases 0.10.2 → 0.10.4

package/README.md

@@ -59,6 +59,7 @@ Here is the list of all global dependencies with associated min. version (older
 - `grep`: [grep] >=3 (could come through a bash emulation environment on Windows, such as [git for
     Windows][git-win]' `Git BASH`)
 - `http-server`: [http-server] >=0.12.0 (installed globally via [npm] or [yarn])
+- `kdiff3`: [kdiff3] >=0.9
 - `light-server`: [light-server] >=2.5.0 (installed globally via [npm] or [yarn])
 - `ls`: [ls] >=8 (could come through a bash emulation environment on Windows, such as [git for
     Windows][git-win]' `Git BASH`)
@@ -115,6 +116,7 @@ Things I want to (but won't necessarily) do:
 [git-win]: https://git-for-windows.github.io/
 [grep]: https://en.wikipedia.org/wiki/Grep
 [http-server]: https://www.npmjs.com/package/http-server
+[kdiff3]: https://invent.kde.org/sdk/kdiff3
 [light-server]: https://www.npmjs.com/package/light-server
 [ls]: https://en.wikipedia.org/wiki/Ls
 [ng-maintain]: https://www.npmjs.com/package/@gkalpak/ng-maintain

package/bin/config/cfgbash.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.2]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfgbash.wsl.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.2]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfggit.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.2]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

package/bin/config/cfggit.win32.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+import {stripIndentation} from '../../lib/utils.js';
+console.log(stripIndentation(`
+  ### [Generated by: @gkalpak/aliases v0.10.4]
+  ### Run the following commands:
+
+  git config --global commit.gpgSign true
+  git config --global core.editor "vim"
+  git config --global credential.helper "manager"
+  git config --global merge.tool "kdiff3"
+  git config --global mergetool.kdiff3.path "C:/Program Files/KDiff3/bin/kdiff3.exe"
+  git config --global mergetool.kdiff3.trustExitCode "false"
+  git config --global push.default "upstream"
+  git config --global rebase.autosquash "true"
+  git config --global rebase.autostash "true"
+  git config --global tag.gpgSign true
+  git config --global user.email "kalpakas.g@gmail.com"
+  git config --global user.name "George Kalpakas"
+  git config --global user.signingKey "0FF21FC44ECE9F07"
+`));

package/bin/config/cfggit.wsl.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.2]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
-  git config --global credential.helper "/mnt/c/Program\\ Files/Git/mingw64/bin/git-credential-manager.exe"
+  git config --global credential.helper "/mnt/c/Program Files/Git/mingw64/bin/git-credential-manager.exe"
   git config --global merge.tool "kdiff3"
-  git config --global mergetool.kdiff3.path "/path/to/kdiff3"
+  git config --global mergetool.kdiff3.path "/mnt/c/Program Files/KDiff3/bin/kdiff3.exe"
   git config --global mergetool.kdiff3.trustExitCode "false"
   git config --global push.default "upstream"
   git config --global rebase.autosquash "true"

package/bin/config/cfgvim.js

@@ -2,6 +2,6 @@
 import {readFileSync} from 'node:fs';
 import {fileURLToPath} from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
-console.log('""" [Generated by: @gkalpak/aliases v0.10.2]');
+console.log('""" [Generated by: @gkalpak/aliases v0.10.4]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/misc/alv.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-console.log('@gkalpak/aliases v0.10.2');
+console.log('@gkalpak/aliases v0.10.4');

package/bin/node/naga.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'npm install --global @angular/cli @gkalpak/aliases @gkalpak/cli-utils @gkalpak/ng-maintain csslint eslint firebase-tools grunt-cli gulp-cli http-server light-server shx typescript typescript-run watch yarn $*';
+const cmd = 'npm install --global @angular/cli @gkalpak/aliases @gkalpak/cli-utils @gkalpak/ng-maintain eslint firebase-tools http-server light-server shx typescript typescript-run watch yarn $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/node/yaga.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'yarn global add @angular/cli @gkalpak/aliases @gkalpak/cli-utils @gkalpak/ng-maintain csslint eslint firebase-tools grunt-cli gulp-cli http-server light-server shx typescript typescript-run watch $*';
+const cmd = 'yarn global add @angular/cli @gkalpak/aliases @gkalpak/cli-utils @gkalpak/ng-maintain eslint firebase-tools http-server light-server shx typescript typescript-run watch $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/lib/constants.js

@@ -26,11 +26,8 @@ const GLOBAL_NPM_PACKAGES = [
   '@gkalpak/aliases',
   '@gkalpak/cli-utils',
   '@gkalpak/ng-maintain',
-  'csslint',
   'eslint',
   'firebase-tools',
-  'grunt-cli',
-  'gulp-cli',
   'http-server',
   'light-server',
   'shx',
@@ -90,7 +87,7 @@ const CFGBASH_SPEC = isWsl => new AliasSpec(
     /* eslint-enable max-len */
     'Show configuration instructions for `bash`.');
 
-const CFGGIT_SPEC_WITH_CRED_HELPER = credHelper => new AliasSpec(
+const CFGGIT_SPEC_WITH_CRED_HELPER = (credHelper, kdiff3Path) => new AliasSpec(
     stripIndentation(`
       #!/usr/bin/env node
       import {stripIndentation} from '../../lib/utils.js';
@@ -102,7 +99,7 @@ const CFGGIT_SPEC_WITH_CRED_HELPER = credHelper => new AliasSpec(
         git config --global core.editor "vim"
         git config --global credential.helper "${credHelper}"
         git config --global merge.tool "kdiff3"
-        git config --global mergetool.kdiff3.path "/path/to/kdiff3"
+        git config --global mergetool.kdiff3.path "${kdiff3Path}"
         git config --global mergetool.kdiff3.trustExitCode "false"
         git config --global push.default "upstream"
         git config --global rebase.autosquash "true"
@@ -472,9 +469,13 @@ const ALIASES = {
 
     // GIT
     cfggit: new Alias({
-      default: CFGGIT_SPEC_WITH_CRED_HELPER('manager'),
+      default: CFGGIT_SPEC_WITH_CRED_HELPER('manager', '/path/to/kdiff3'),
+      win32: CFGGIT_SPEC_WITH_CRED_HELPER(
+          'manager',
+          'C:/Program Files/KDiff3/bin/kdiff3.exe'),
       wsl: CFGGIT_SPEC_WITH_CRED_HELPER(
-          '/mnt/c/Program\\\\ Files/Git/mingw64/bin/git-credential-manager.exe'),
+          '/mnt/c/Program Files/Git/mingw64/bin/git-credential-manager.exe',
+          '/mnt/c/Program Files/KDiff3/bin/kdiff3.exe'),
     }),
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -190,18 +190,18 @@
   },
   "dependencies": {
     "@gkalpak/cli-utils": "^0.1.10",
-    "chalk": "^5.2.0",
-    "inquirer": "^9.1.5",
-    "is-wsl": "^2.2.0"
+    "chalk": "^5.3.0",
+    "inquirer": "^9.2.10",
+    "is-wsl": "^3.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.36.0",
+    "eslint": "^8.47.0",
     "eslint-plugin-jasmine": "^4.1.3",
     "eslint-plugin-ordered-imports": "^0.6.0",
-    "jasmine": "^4.6.0",
+    "jasmine": "^5.1.0",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.5",
-    "strip-ansi": "^7.0.1",
+    "strip-ansi": "^7.1.0",
     "watch": "^1.0.2"
   }
 }