Skip to content

Commit 271c62a

Browse files
committed
fix: json import
1 parent cdaa5f2 commit 271c62a

File tree

6 files changed

+184
-116
lines changed

6 files changed

+184
-116
lines changed

apps/test-bot/src/app.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Client, Partials } from 'discord.js';
22
import { Logger, commandkit } from 'commandkit';
33
import { setDriver } from '@commandkit/tasks';
44
import { SQLiteDriver } from '@commandkit/tasks/sqlite';
5+
import config from './config.json' with { type: 'json' };
56

67
const client = new Client({
78
intents: [
@@ -28,4 +29,6 @@ commandkit.setPrefixResolver((message) => {
2829
];
2930
});
3031

32+
console.dir({ importedConfig: config }, { depth: null });
33+
3134
export default client;

apps/test-bot/src/config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"foo": "bar",
3+
"bar": {
4+
"baz": "qux"
5+
}
6+
}

packages/commandkit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"picocolors": "^1.1.1",
175175
"rfdc": "^1.3.1",
176176
"rimraf": "^6.0.0",
177-
"tsdown": "^0.14.2",
177+
"tsdown": "^0.15.2",
178178
"use-macro": "^1.1.0"
179179
},
180180
"devDependencies": {
@@ -190,4 +190,4 @@
190190
"engines": {
191191
"node": ">=24"
192192
}
193-
}
193+
}

packages/commandkit/src/cli/build.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { existsSync } from 'node:fs';
22
import { writeFile } from 'node:fs/promises';
33
import { join } from 'node:path';
44
import { rimraf } from 'rimraf';
5-
import { build, Options } from 'tsdown';
5+
import type { Options } from 'tsdown';
66

77
import { MaybeArray } from '../components';
88
import { loadConfigFile } from '../config/loader';
99
import { mergeDeep } from '../config/utils';
1010
import { CompilerPlugin, CompilerPluginRuntime } from '../plugins';
1111
import { COMMANDKIT_CWD } from '../utils/constants';
12-
import { copyLocaleFiles } from './common';
12+
import { copyLocaleFiles, loadTsdown } from './common';
1313
import { devEnvFileArgs, prodEnvFileArgs } from './env';
1414
import { performTypeCheck } from './type-checker';
1515

@@ -65,6 +65,7 @@ export async function buildApplication({
6565
isDev,
6666
configPath,
6767
}: ApplicationBuildOptions) {
68+
const { build } = await loadTsdown();
6869
const config = await loadConfigFile(configPath);
6970

7071
if (!isDev && !config?.typescript?.ignoreBuildErrors) {
@@ -118,7 +119,7 @@ export async function buildApplication({
118119
return defaultLog(level, log);
119120
},
120121
moduleTypes: {
121-
'.json': 'js',
122+
'.json': 'json',
122123
'.node': 'binary',
123124
},
124125
},

packages/commandkit/src/cli/common.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { execSync } from 'node:child_process';
88
import { COMMANDKIT_CWD } from '../utils/constants';
99

1010
let ts: typeof import('typescript') | undefined;
11+
let tsdown: typeof import('tsdown') | undefined;
1112

1213
/**
1314
* @private
@@ -234,3 +235,15 @@ export async function copyLocaleFiles(_from: string, _to: string) {
234235
});
235236
}
236237
}
238+
239+
/**
240+
* @private
241+
* @internal
242+
*/
243+
export async function loadTsdown(): Promise<typeof import('tsdown')> {
244+
if (tsdown) return tsdown;
245+
246+
tsdown = await import('tsdown');
247+
248+
return tsdown;
249+
}

0 commit comments

Comments
 (0)