Skip to content

Commit dca9fbb

Browse files
committed
refactor(relizy): use deep imports for @maz-ui/utils helpers
Closes #100, #105
1 parent 1a7d8f1 commit dca9fbb

12 files changed

Lines changed: 20 additions & 27 deletions

File tree

src/commands/social.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { TweetV2PostTweetResult } from 'twitter-api-v2'
44
import type { ResolvedRelizyConfig } from '../core'
55
import type { SocialNetworkResult, SocialOptions, SocialResult } from '../types'
66
import { logger } from '@maz-ui/node'
7-
import { getErrorMessage } from '@maz-ui/utils'
7+
import { getErrorMessage } from '@maz-ui/utils/helpers/getErrorMessage'
88
import { collectContributorNames, collectPackageBumps, executeHook, generateChangelog, getPackageCommits, getReleaseUrl, getRootPackage, getSlackToken, getSlackWebhookUrl, getTwitterCredentials, isPrerelease, loadRelizyConfig, postReleaseToSlack, postReleaseToTwitter, readPackageJson, resolveTags } from '../core'
99
import { aiSafetyCheck, applyAIOverride, generateAISocialChangelog, isAISocialEnabled } from '../core/ai'
1010

src/core/__tests__/config.spec.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { LogLevel } from '@maz-ui/node'
22
import type { RelizyConfig } from '../../types'
33
import process from 'node:process'
44
import { logger } from '@maz-ui/node'
5-
import { formatJson } from '@maz-ui/utils'
5+
import { formatJson } from '@maz-ui/utils/helpers/formatJson'
66
import { loadConfig, setupDotenv } from 'c12'
77
import { getRepoConfig, resolveRepoConfig } from 'changelogen'
88
import { defu } from 'defu'
@@ -24,13 +24,9 @@ vi.mock('../npm', async (importActual) => {
2424
getNpmRegistry: vi.fn(() => 'https://registry.npmjs.org/'),
2525
}
2626
})
27-
vi.mock('@maz-ui/utils', async () => {
28-
const actual = await vi.importActual('@maz-ui/utils')
29-
return {
30-
...actual,
31-
formatJson: vi.fn(obj => JSON.stringify(obj)),
32-
}
33-
})
27+
vi.mock('@maz-ui/utils/helpers/formatJson', () => ({
28+
formatJson: vi.fn(obj => JSON.stringify(obj)),
29+
}))
3430
vi.mock('c12')
3531
vi.mock('changelogen')
3632
vi.mock('defu')

src/core/__tests__/markdown.spec.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { GitCommit } from 'changelogen'
2-
import { upperFirst } from '@maz-ui/utils'
2+
import { upperFirst } from '@maz-ui/utils/helpers/upperFirst'
33
import { formatCompareChanges, formatReference } from 'changelogen'
44
import { convert } from 'convert-gitmoji'
55
import { fetch } from 'node-fetch-native'
@@ -8,13 +8,9 @@ import { createMockCommit, createMockConfig } from '../../../tests/mocks'
88
import { getFirstCommit } from '../git'
99
import { buildChangelogBody, buildCompareLink, buildContributors, collectContributorNames, generateMarkDown, parseChangelogMarkdown } from '../markdown'
1010

11-
vi.mock('@maz-ui/utils', async () => {
12-
const actual = await vi.importActual('@maz-ui/utils')
13-
return {
14-
...actual,
15-
upperFirst: vi.fn((str: string) => str.charAt(0).toUpperCase() + str.slice(1)),
16-
}
17-
})
11+
vi.mock('@maz-ui/utils/helpers/upperFirst', () => ({
12+
upperFirst: vi.fn((str: string) => str.charAt(0).toUpperCase() + str.slice(1)),
13+
}))
1814
vi.mock('changelogen')
1915
vi.mock('convert-gitmoji')
2016
vi.mock('node-fetch-native')

src/core/changelog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { ResolvedRelizyConfig } from './config'
44
import { existsSync, readFileSync, writeFileSync } from 'node:fs'
55
import { join, relative } from 'node:path'
66
import { logger } from '@maz-ui/node'
7-
import { getErrorMessage } from '@maz-ui/utils'
7+
import { getErrorMessage } from '@maz-ui/utils/helpers/getErrorMessage'
88
import { getCurrentGitRef, getFirstCommit } from './git'
99
import { buildChangelogBody, buildCompareLink, buildContributors } from './markdown'
1010
import { getPackageCommits } from './repo'

src/core/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { LogLevel } from '@maz-ui/node'
2-
import type { DeepPartial } from '@maz-ui/utils'
2+
import type { DeepPartial } from '@maz-ui/utils/ts-helpers/DeepPartial'
33
import type { ReleaseType } from 'semver'
44
import type { AIConfig, BumpConfig, ChangelogConfig, GitProvider, MonorepoConfig, PrCommentConfig, PublishConfig, ReleaseConfig, RelizyConfig, SocialConfig } from '../types'
55
import process from 'node:process'
66
import { logger } from '@maz-ui/node'
7-
import { formatJson } from '@maz-ui/utils'
7+
import { formatJson } from '@maz-ui/utils/helpers/formatJson'
88

99
import { loadConfig, setupDotenv } from 'c12'
1010
import { getRepoConfig, resolveRepoConfig } from 'changelogen'

src/core/github.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { GitCommit } from 'changelogen'
22
import type { BumpResultTruthy, PostedRelease, ProviderReleaseOptions } from '../types'
33
import type { ResolvedRelizyConfig } from './config'
44
import { logger } from '@maz-ui/node'
5-
import { formatJson } from '@maz-ui/utils'
5+
import { formatJson } from '@maz-ui/utils/helpers/formatJson'
66
import { createGithubRelease } from 'changelogen'
77
import { generateAIProviderReleaseBody, isAIProviderReleaseEnabled } from './ai'
88
import { generateChangelog } from './changelog'

src/core/gitlab.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { BumpResultTruthy, PostedRelease, ProviderReleaseOptions } from '..
22
import type { ResolvedRelizyConfig } from './config'
33
import type { RootPackage } from './repo'
44
import { execPromise, logger } from '@maz-ui/node'
5-
import { formatJson } from '@maz-ui/utils'
5+
import { formatJson } from '@maz-ui/utils/helpers/formatJson'
66
import { generateAIProviderReleaseBody, isAIProviderReleaseEnabled } from './ai'
77
import { generateChangelog } from './changelog'
88
import { loadRelizyConfig } from './config'

src/core/markdown.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { GitCommit, ResolvedChangelogConfig } from 'changelogen'
22
import type { ResolvedRelizyConfig } from './config'
3-
import { upperFirst } from '@maz-ui/utils'
3+
import { upperFirst } from '@maz-ui/utils/helpers/upperFirst'
44
import { formatCompareChanges, formatReference } from 'changelogen'
55
import { convert } from 'convert-gitmoji'
66
import { fetch } from 'node-fetch-native'

src/core/repo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { execSync } from 'node:child_process'
55
import { existsSync, readFileSync, statSync } from 'node:fs'
66
import { join, relative, sep } from 'node:path'
77
import { logger } from '@maz-ui/node'
8-
import { getErrorMessage } from '@maz-ui/utils'
8+
import { getErrorMessage } from '@maz-ui/utils/helpers/getErrorMessage'
99
import { getGitDiff, parseCommits } from 'changelogen'
1010
import fastGlob from 'fast-glob'
1111
import { expandPackagesToBumpWithDependents, getPackageDependencies } from './dependencies'

src/core/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { BumpResultTruthy, HookConfig, PackageBase } from '../types'
22
import type { ResolvedRelizyConfig } from './config'
33
import process from 'node:process'
44
import { execPromise, logger } from '@maz-ui/node'
5-
import { getErrorMessage } from '@maz-ui/utils'
5+
import { getErrorMessage } from '@maz-ui/utils/helpers/getErrorMessage'
66
import { getPackages } from './repo'
77

88
/**

0 commit comments

Comments
 (0)