Skip to content

Commit c6ee6b0

Browse files
committed
Fix merge/index.js imports
1 parent 79a6c0a commit c6ee6b0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

packages/cli/src/lib/__tests__/mergeBasics.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, it, describe } from 'vitest'
22

3+
import { merge } from '../merge/index.js'
34
import { concatUnique } from '../merge/strategy.js'
4-
import { merge } from '../merge.js'
55

66
import { unindented } from './fixtures/unindented.js'
77

packages/cli/src/lib/__tests__/mergeConfig.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import path from 'path'
33
import fs from 'fs-extra'
44
import { expect, it, describe, test } from 'vitest'
55

6+
import { merge } from '../merge/index.js'
67
import {
78
concatUnique,
89
interleave,
910
keepBoth,
1011
keepBothStatementParents,
1112
} from '../merge/strategy.js'
12-
import { merge } from '../merge.js'
1313

1414
import { unindented } from './fixtures/unindented.js'
1515

packages/cli/src/lib/configureStorybook.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import path from 'path'
33
import fse from 'fs-extra'
44
import prettier from 'prettier'
55

6+
import { merge } from './merge/index.js'
67
import {
78
interleave,
89
concatUnique,
910
keepBoth,
1011
keepBothStatementParents,
1112
} from './merge/strategy.js'
12-
import { merge } from './merge.js'
1313
import { isTypeScriptProject } from './project.js'
1414

1515
import { getPaths, transformTSToJS, writeFile } from './index.js'

0 commit comments

Comments
 (0)