Skip to content

Commit 61d9c59

Browse files
committed
fix(core): Resolve issue with type imports
1 parent db2058d commit 61d9c59

35 files changed

Lines changed: 200 additions & 268 deletions

File tree

examples/cli-app/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
"examples-cli": "dist/examples-cli.mjs"
1414
},
1515
"dependencies": {
16-
"@storm-stack/types": "workspace:*",
16+
"@storm-stack/core": "workspace:*",
1717
"date-fns": "catalog:",
1818
"unstorage": "catalog:"
1919
},
2020
"devDependencies": {
21-
"@storm-stack/core": "workspace:*",
2221
"@storm-stack/nx": "workspace:*",
2322
"@storm-stack/plugin-cli": "workspace:*",
2423
"@storm-stack/plugin-date": "workspace:*",

examples/cli-app/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
1717
------------------------------------------------------------------- */
1818

19-
import { StormSentryLogConfig } from "@storm-stack/plugin-log-sentry/types";
19+
import { StormSentryLogConfig } from "@storm-stack/plugin-log-sentry/types/config";
2020

2121
/**
2222
* The request for the example CLI application.

examples/cloudflare-worker/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
"private": true,
1212
"dependencies": {
1313
"@cloudflare/unenv-preset": "catalog:",
14-
"@storm-stack/types": "workspace:*",
14+
"@storm-stack/core": "workspace:*",
1515
"@stryke/json": "catalog:",
1616
"@stryke/type-checks": "catalog:",
1717
"@stryke/url": "catalog:",
1818
"unenv": "catalog:",
1919
"unstorage": "catalog:"
2020
},
2121
"devDependencies": {
22-
"@storm-stack/core": "workspace:*",
2322
"@storm-stack/nx": "workspace:*",
2423
"@storm-stack/plugin-cloudflare": "workspace:*",
2524
"@storm-stack/plugin-log-console": "workspace:*",

examples/library/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@storm-stack/types": "workspace:*",
13+
"@storm-stack/core": "workspace:*",
1414
"@stryke/json": "catalog:",
1515
"@stryke/type-checks": "catalog:",
1616
"@stryke/url": "catalog:"
1717
},
1818
"devDependencies": {
19-
"@storm-stack/core": "workspace:*",
2019
"@storm-stack/devkit": "workspace:*",
2120
"@storm-stack/nx": "workspace:*",
2221
"@stryke/types": "catalog:"

examples/react-app/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@storm-stack/types": "workspace:*",
13+
"@storm-stack/core": "workspace:*",
1414
"date-fns": "catalog:",
1515
"react": "catalog:",
1616
"react-dom": "catalog:",
1717
"unstorage": "catalog:",
1818
"vite": "catalog:"
1919
},
2020
"devDependencies": {
21-
"@storm-stack/core": "workspace:*",
2221
"@storm-stack/nx": "workspace:*",
2322
"@storm-stack/plugin-react": "workspace:*",
2423
"@types/react": "catalog:",

packages/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"@storm-stack/plugin-log-sentry": "workspace:*",
3838
"@storm-stack/plugin-log-storage": "workspace:*",
3939
"@storm-stack/plugin-storage-fs": "workspace:*",
40-
"@storm-stack/types": "workspace:*",
4140
"@types/node": "catalog:"
4241
},
4342
"publishConfig": {

packages/cli/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
1717
------------------------------------------------------------------- */
1818

19-
import { StormSentryLogConfig } from "@storm-stack/plugin-log-sentry/types";
19+
import { StormSentryLogConfig } from "@storm-stack/plugin-log-sentry/types/config";
2020

2121
export interface StormStackCLIConfig extends StormSentryLogConfig {
2222
/**

packages/cli/storm.d.ts

Lines changed: 6 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// Generated with Storm Stack
55
// Note: Do not edit this file manually - it will be overwritten automatically
66

7-
// This file is an augmentation to the built-in StormContext interface
8-
// Thus cannot contain any top-level imports
9-
// <https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation>
10-
117
/**
128
* The various types of date formats used in Storm Stack applications.
139
*/
@@ -2033,21 +2029,6 @@ declare module "storm:config" {
20332029
* @title Object
20342030
*/
20352031
export interface StormConfigBase extends StormConfigInterface {
2036-
/**
2037-
* ARGV
2038-
*
2039-
* @title ARGV
2040-
* @domain cli
2041-
*/
2042-
ARGV?: Array<string>;
2043-
/**
2044-
* The inverse of the no-banner option.
2045-
*
2046-
* @title BANNER
2047-
* @domain cli
2048-
* @defaultValue true
2049-
*/
2050-
BANNER?: boolean;
20512032
/**
20522033
* The Storm Stack application's cached data directory.
20532034
*
@@ -2062,13 +2043,6 @@ declare module "storm:config" {
20622043
* @defaultValue false
20632044
*/
20642045
CI: boolean;
2065-
/**
2066-
* The configuration file to append the completion script to.
2067-
*
2068-
* @title CONFIG
2069-
* @domain cli
2070-
*/
2071-
CONFIG?: string | true;
20722046
/**
20732047
* The Storm Stack application's configuration data directory.
20742048
*
@@ -2154,29 +2128,13 @@ declare module "storm:config" {
21542128
* @defaultValue false
21552129
*/
21562130
FORCE_HYPERLINK: boolean | number;
2157-
/**
2158-
* Show help information.
2159-
*
2160-
* @title HELP
2161-
* @domain cli
2162-
* @defaultValue false
2163-
*/
2164-
HELP?: boolean;
21652131
/**
21662132
* Indicates if error data should be included.
21672133
*
21682134
* @title INCLUDE ERROR DATA
21692135
* @defaultValue false
21702136
*/
21712137
INCLUDE_ERROR_DATA: boolean;
2172-
/**
2173-
* The inverse of the no-interactive option.
2174-
*
2175-
* @title INTERACTIVE
2176-
* @domain cli
2177-
* @defaultValue true
2178-
*/
2179-
INTERACTIVE?: boolean;
21802138
/**
21812139
* The Storm Stack application's logging directory.
21822140
*
@@ -2205,47 +2163,13 @@ declare module "storm:config" {
22052163
* @defaultValue development
22062164
*/
22072165
MODE: "development" | "staging" | "production";
2208-
/**
2209-
* The name of the library.
2210-
*
2211-
* @title NAME
2212-
* @domain cli
2213-
* @defaultValue storm-stack
2214-
*/
2215-
NAME?: string;
2216-
/**
2217-
* Hide the banner displayed while running the CLI application (will be set to true if running in a CI pipeline).
2218-
*
2219-
* @title NO BANNER
2220-
* @domain cli
2221-
* @defaultValue false
2222-
*/
2223-
NO_BANNER?: boolean;
22242166
/**
22252167
* An indicator that specifies the current runtime is a no color environment.
22262168
*
22272169
* @title NO COLOR
22282170
* @defaultValue false
22292171
*/
22302172
NO_COLOR: boolean;
2231-
/**
2232-
* Disable interactive mode (will be set to true if running in a CI pipeline).
2233-
*
2234-
* @title NO INTERACTIVE
2235-
* @alias NO_INTERACTIVE
2236-
* @domain cli
2237-
* @defaultValue false
2238-
*/
2239-
NO_INTERACT?: boolean;
2240-
/**
2241-
* Disable interactive mode (will be set to true if running in a CI pipeline).
2242-
*
2243-
* @title NO INTERACTIVE
2244-
* @alias NO_INTERACT
2245-
* @domain cli
2246-
* @defaultValue false
2247-
*/
2248-
NO_INTERACTIVE?: boolean;
22492173
/**
22502174
* The mode in which the application is running.
22512175
*
@@ -2279,43 +2203,13 @@ declare module "storm:config" {
22792203
* @defaultValue memory
22802204
*/
22812205
OUTPUT_MODE?: "memory" | "fs";
2282-
/**
2283-
* The name of the library.
2284-
*
2285-
* @title PACKAGE NAME
2286-
* @domain cli
2287-
*/
2288-
PACKAGE_NAME?: string;
22892206
/**
22902207
* The platform for which the application was built.
22912208
*
22922209
* @title PLATFORM
22932210
* @defaultValue node
22942211
*/
22952212
PLATFORM: "node" | "neutral" | "browser";
2296-
/**
2297-
* The root directory of the Storm Stack project.
2298-
*
2299-
* @title ROOT
2300-
* @alias ROOT
2301-
* @domain cli
2302-
*/
2303-
PROJECT?: string;
2304-
/**
2305-
* The root directory of the Storm Stack project.
2306-
*
2307-
* @title ROOT
2308-
* @alias PROJECT
2309-
* @domain cli
2310-
*/
2311-
ROOT?: string;
2312-
/**
2313-
* The path to write the completion script to.
2314-
*
2315-
* @title SCRIPT
2316-
* @domain cli
2317-
*/
2318-
SCRIPT?: string | true;
23192213
/**
23202214
* The DSN for Sentry
23212215
*
@@ -2343,22 +2237,6 @@ declare module "storm:config" {
23432237
* @defaultValue false
23442238
*/
23452239
TEST: boolean;
2346-
/**
2347-
* Enable verbose output.
2348-
*
2349-
* @title VERBOSE
2350-
* @domain cli
2351-
* @defaultValue false
2352-
*/
2353-
VERBOSE?: boolean;
2354-
/**
2355-
* Show the version of the application.
2356-
*
2357-
* @title VERSION
2358-
* @domain cli
2359-
* @defaultValue false
2360-
*/
2361-
VERSION?: boolean;
23622240
/**
23632241
* The appcircle build ID. This value is set by certain CI/CD systems.
23642242
*
@@ -2457,15 +2335,15 @@ declare module "storm:config" {
24572335
* The unique identifier for the build.
24582336
*
24592337
* @title BUILD Identifier
2460-
* @defaultValue b13b2c68-ca9d-436e-8717-a66512af1e7f
2338+
* @defaultValue fcf17c61-edeb-491a-9372-aac18eaceb11
24612339
* @readonly
24622340
*/
24632341
readonly BUILD_ID: string;
24642342
/**
24652343
* The timestamp the build was ran at.
24662344
*
24672345
* @title BUILD TIMESTAMP
2468-
* @defaultValue 2025-09-08T03:48:53.251Z
2346+
* @defaultValue 2025-09-08T07:36:55.521Z
24692347
* @readonly
24702348
*/
24712349
readonly BUILD_TIMESTAMP: string;
@@ -2698,7 +2576,7 @@ declare module "storm:config" {
26982576
* The unique identifier for the release.
26992577
*
27002578
* @title RELEASE Identifier
2701-
* @defaultValue 3b2c68ca-9d13-4e07-97a6-6512af1e7f93
2579+
* @defaultValue f17c61ed-ebe9-4a93-b2aa-c18eaceb116c
27022580
* @readonly
27032581
*/
27042582
readonly RELEASE_ID: string;
@@ -3411,15 +3289,15 @@ declare module "storm:context" {
34113289
/**
34123290
* Environment/runtime specific application data.
34133291
*/
3414-
env: import("@storm-stack/types/node/env").StormNodeEnv;
3292+
env: import("@storm-stack/core/runtime-types/node/env").StormNodeEnv;
34153293
/**
34163294
* The root application logger for the Storm Stack application.
34173295
*/
3418-
log: import("@storm-stack/types/shared/log").StormLogInterface;
3296+
log: import("@storm-stack/core/runtime-types/shared/log").StormLogInterface;
34193297
/**
34203298
* The {@link StormStorageInterface} instance used by the Storm Stack application.
34213299
*/
3422-
storage: import("@storm-stack/types/shared/storage").StormStorageInterface;
3300+
storage: import("@storm-stack/core/runtime-types/shared/storage").StormStorageInterface;
34233301
/**
34243302
* The configuration parameters for the Storm application.
34253303
*/

packages/core/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,6 @@
907907
"@storm-software/config": "catalog:",
908908
"@storm-software/config-tools": "catalog:",
909909
"@storm-software/esbuild": "catalog:",
910-
"@storm-stack/types": "workspace:*",
911910
"@stryke/capnp": "catalog:",
912911
"@stryke/convert": "catalog:",
913912
"@stryke/env": "catalog:",

packages/core/src/commands/init/install/shared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { PluginPackageDependencies } from "../../../types/plugin";
2727
*/
2828
export function getSharedDeps(context: Context): PluginPackageDependencies {
2929
context.packageDeps ??= {};
30-
context.packageDeps["@storm-stack/types"] = { type: "devDependency" };
30+
context.packageDeps["@storm-stack/core"] = { type: "dependency" };
3131

3232
if (context.options.projectType === "application") {
3333
context.packageDeps.unstorage = { type: "dependency" };

0 commit comments

Comments
 (0)