From 6c869096f30f27884a6d0f9295de600d755007f7 Mon Sep 17 00:00:00 2001 From: Jason Jafari Date: Wed, 13 Nov 2024 21:43:19 -0500 Subject: [PATCH] WIP --- bashUtils/auto-completion.ts | 6 +++--- bashUtils/discover.ts | 2 +- cli/help.ts | 2 +- cli/secrets.ts | 12 ++++++------ package.json | 6 +++--- tsconfig.json | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bashUtils/auto-completion.ts b/bashUtils/auto-completion.ts index 9682a75..2ba91c1 100755 --- a/bashUtils/auto-completion.ts +++ b/bashUtils/auto-completion.ts @@ -1,8 +1,8 @@ #!/usr/bin/env bun -import { bashRunAndReturnSync } from "@helpers/bashUtils" -import { dynamicStringHandler } from "@helpers/dynamicStringHandler" -import { getJJConfigByKeyChain } from "@helpers/jjConfigUtils" +import { bashRunAndReturnSync } from "@jjHelpers/bashUtils" +import { dynamicStringHandler } from "@jjHelpers/dynamicStringHandler" +import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils" async function main() { const inputArgs = [...process.argv] diff --git a/bashUtils/discover.ts b/bashUtils/discover.ts index 416bb12..1641358 100755 --- a/bashUtils/discover.ts +++ b/bashUtils/discover.ts @@ -1,6 +1,6 @@ #!/usr/bin/env bun -import { getJJConfigByKeyChain } from "@helpers/jjConfigUtils" +import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils" const firstArg = process.argv[2] diff --git a/cli/help.ts b/cli/help.ts index 85ee61c..3569c40 100644 --- a/cli/help.ts +++ b/cli/help.ts @@ -1,4 +1,4 @@ -import { getJJConfigByKeyChain } from "@helpers/jjConfigUtils" +import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils" import chalk from "chalk" const cliConfig: any = {} diff --git a/cli/secrets.ts b/cli/secrets.ts index 11d2f0b..db977ff 100644 --- a/cli/secrets.ts +++ b/cli/secrets.ts @@ -1,13 +1,13 @@ -import { dynamicStringHandler } from "@helpers/dynamicStringHandler"; -import { getJJConfigByKeyChain } from "@helpers/jjConfigUtils" -import { makeJJlogger } from "@helpers/jjLogger"; +import { dynamicStringHandler } from "@jjHelpers/dynamicStringHandler"; +import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils" +import { makeJJlogger } from "@jjHelpers/jjLogger"; import _ from 'lodash'; import fs from 'fs-extra'; import path from "path"; -import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@helpers/cryptoUtils"; -import { saveFileIfItChanged } from "@helpers/saveFileIfItChanged"; +import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@jjHelpers/cryptoUtils"; +import { saveFileIfItChanged } from "@jjHelpers/saveFileIfItChanged"; import * as YAML from "js-yaml"; -import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@helpers/gitSubRepoUtils"; +import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@jjHelpers/gitSubRepoUtils"; import moment from "moment"; const logger = makeJJlogger({ diff --git a/package.json b/package.json index ac7247f..e4c34a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jj-command-line", "description": "jj cli", - "version": "1.0.4", + "version": "1.0.5", "author": "Jason Jafari", "bin": { "jj": "./jj.sh" @@ -56,7 +56,7 @@ "pre-publish": "git add . && git push --follow-tags" }, "alias": { - "@helpers/*": "./helpers/$1", - "@src/*": "./src/$1" + "@jjHelpers/*": "./helpers/$1", + "@jjSrc/*": "./src/$1" } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 21134c4..b680180 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,8 +9,8 @@ "target": "ES6", "moduleResolution": "node", "paths": { - "@helpers/*": ["./helpers/*"], - "@src/*": ["./src/*"], + "@jjHelpers/*": ["./helpers/*"], + "@jjSrc/*": ["./src/*"], }, "jsx": "react-jsx", "resolveJsonModule": true,