Skip to content

Commit a3746cf

Browse files
jackkavclaude
andcommitted
fix: restore object alias format in vite.config.ts to fix rollup build
Array-form alias with find:'~' was not matching prefix imports like ~/common/insomnia-fetch in the react-router production build. Object form behaves correctly in Vite 7. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent bea2628 commit a3746cf

3 files changed

Lines changed: 17 additions & 10 deletions

File tree

packages/insomnia-inso/src/cli.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ import { matchIdIsh } from './db/models/util';
3838
import { loadWorkspace, promptWorkspace } from './db/models/workspace';
3939
import type { Database } from './db/types';
4040
import { InsoError } from './errors';
41+
<<<<<<< Updated upstream
42+
=======
43+
import { LogLevels } from 'consola';
44+
45+
>>>>>>> Stashed changes
4146
import { BasicReporter, logger } from './logger';
4247
import { logTestResult, logTestResultSummary, reporterTypes, type TestReporter } from './reporter';
4348
import { generateDocumentation } from './scripts/docs';

packages/insomnia-inso/src/logger.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
<<<<<<< Updated upstream
12
import type { ConsolaOptions, LogObject, LogType } from 'consola';
3+
=======
4+
import type { ConsolaOptions, LogObject, logType } from 'consola';
5+
>>>>>>> Stashed changes
26
import { createConsola } from 'consola';
37

48
type LogsByType = Partial<Record<LogType, string[]>>;
59

610
type ModifiedConsola = ReturnType<typeof createConsola> & { __getLogs: () => LogsByType };
711

812
const consolaLogger = createConsola({
13+
<<<<<<< Updated upstream
14+
=======
15+
fancy: true,
16+
>>>>>>> Stashed changes
917
formatOptions: {
1018
date: false,
1119
},

packages/insomnia/vite.config.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,10 @@ export default defineConfig(({ mode }) => {
5151
include: ['codemirror-graphql/utils/SchemaReference', '@stoplight/spectral-core', 'isomorphic-git'],
5252
},
5353
resolve: {
54-
alias: [
55-
{
56-
find: '~/network/network-adapter',
57-
replacement: path.resolve(__dirname, './src/network/network-adapter.renderer'),
58-
},
59-
{
60-
find: '~',
61-
replacement: path.resolve(__dirname, './src'),
62-
},
63-
],
54+
alias: {
55+
'~/network/network-adapter': path.resolve(__dirname, './src/network/network-adapter.renderer'),
56+
'~': path.resolve(__dirname, './src'),
57+
},
6458
},
6559
plugins: [
6660
// Allows us to import modules that will be resolved by Node's require() function.

0 commit comments

Comments
 (0)