Skip to content

Commit e9cff2a

Browse files
logaretmlogaretm
committed
chore: update build types commands
1 parent a46d5ac commit e9cff2a

File tree

36 files changed

+49
-102
lines changed

36 files changed

+49
-102
lines changed

‎dev-packages/rollup-utils/npmHelpers.mjs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,18 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
115115

116116
const variantSpecificConfigs = [];
117117

118+
// Determine the correct types output directory based on hasBundles
119+
// hasBundles packages output to build/npm/, so types go to build/npm/types
120+
// Regular packages output to build/, so types go to build/types
121+
const typesOutDir = baseConfig.output.dir === 'build/npm' ? 'build/npm/types' : 'build/types';
122+
123+
const dtsPlugin = dts({
124+
tsconfig: path.resolve(process.cwd(), './tsconfig.types.json'),
125+
compilerOptions: {
126+
outDir: typesOutDir,
127+
},
128+
});
129+
118130
if (emitCjs) {
119131
if (splitDevProd) {
120132
variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/dev') } });
@@ -129,11 +141,12 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
129141

130142
if (emitEsm) {
131143
if (splitDevProd) {
144+
// Add dts plugin to the dev ESM build (only needs to run once)
132145
variantSpecificConfigs.push({
133146
output: {
134147
format: 'esm',
135148
dir: path.join(baseConfig.output.dir, 'esm/dev'),
136-
plugins: [makePackageNodeEsm()],
149+
plugins: [makePackageNodeEsm(), dtsPlugin],
137150
},
138151
});
139152
variantSpecificConfigs.push({
@@ -144,13 +157,6 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
144157
},
145158
});
146159
} else {
147-
const dtsPlugin = dts({
148-
tsconfig: path.resolve(process.cwd(), './tsconfig.types.json'),
149-
compilerOptions: {
150-
outDir: 'build/types',
151-
},
152-
});
153-
154160
variantSpecificConfigs.push({
155161
output: {
156162
format: 'esm',

‎packages/astro/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"build": "run-p build:transpile build:types",
7070
"build:dev": "yarn build",
7171
"build:transpile": "rolldown -c rollup.npm.config.mjs",
72-
"build:types": "tsc -p tsconfig.types.json",
72+
"build:types": "echo 'Types generated by dts plugin'",
7373
"build:watch": "run-p build:transpile:watch build:types:watch",
7474
"build:dev:watch": "yarn build:watch",
7575
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/aws-serverless/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@
8383
"build:layer": "rimraf build/aws && rolldown -c rollup.lambda-extension.config.mjs && yarn ts-node scripts/buildLambdaLayer.ts",
8484
"build:dev": "run-p build:transpile build:types",
8585
"build:transpile": "rolldown -c rollup.npm.config.mjs && yarn build:layer",
86-
"build:types": "run-s build:types:core build:types:downlevel",
87-
"build:types:core": "tsc -p tsconfig.types.json",
88-
"build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
86+
"build:types": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
8987
"build:watch": "run-p build:transpile:watch build:types:watch",
9088
"build:dev:watch": "yarn build:watch",
9189
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/browser-utils/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@
4545
"build": "run-p build:transpile build:types",
4646
"build:dev": "yarn build",
4747
"build:transpile": "rolldown -c rollup.npm.config.mjs",
48-
"build:types": "run-s build:types:core build:types:downlevel",
49-
"build:types:core": "tsc -p tsconfig.types.json",
50-
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
48+
"build:types": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
5149
"build:watch": "run-p build:transpile:watch build:types:watch",
5250
"build:dev:watch": "run-p build:transpile:watch build:types:watch",
5351
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/browser/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
"build:dev": "run-p build:transpile build:types",
6060
"build:bundle": "rolldown -c rollup.bundle.config.mjs",
6161
"build:transpile": "rolldown -c rollup.npm.config.mjs",
62-
"build:types": "run-s build:types:core build:types:downlevel",
63-
"build:types:core": "tsc -p tsconfig.types.json",
64-
"build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
62+
"build:types": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
6563
"build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
6664
"build:dev:watch": "run-p build:transpile:watch build:types:watch",
6765
"build:bundle:watch": "rolldown -c rollup.bundle.config.mjs --watch",

‎packages/bun/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
"build": "run-p build:transpile build:types",
5050
"build:dev": "yarn build",
5151
"build:transpile": "rolldown -c rollup.npm.config.mjs",
52-
"build:types": "run-s build:types:core build:types:downlevel",
53-
"build:types:core": "tsc -p tsconfig.types.json",
54-
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
52+
"build:types": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
5553
"build:watch": "run-p build:transpile:watch build:types:watch",
5654
"build:dev:watch": "yarn build:watch",
5755
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/cloudflare/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
"build": "run-p build:transpile build:types",
7070
"build:dev": "yarn build",
7171
"build:transpile": "rolldown -c rollup.npm.config.mjs",
72-
"build:types": "run-s build:types:core build:types:downlevel",
73-
"build:types:core": "tsc -p tsconfig.types.json",
74-
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
72+
"build:types": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
7573
"build:watch": "run-p build:transpile:watch build:types:watch",
7674
"build:dev:watch": "yarn build:watch",
7775
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/core/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@
4242
"build": "run-p build:transpile build:types",
4343
"build:dev": "yarn build",
4444
"build:transpile": "rolldown -c rollup.npm.config.mjs",
45-
"build:types": "run-s build:types:core build:types:downlevel",
46-
"build:types:core": "tsc -p tsconfig.types.json",
47-
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
45+
"build:types": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
4846
"build:watch": "run-p build:transpile:watch build:types:watch",
4947
"build:dev:watch": "yarn build:watch",
5048
"build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",

‎packages/deno/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"build": "run-s build:transpile build:types",
3333
"build:dev": "yarn build",
3434
"build:transpile": "yarn deno-types && rolldown -c rollup.npm.config.mjs",
35-
"build:types": "tsc -p tsconfig.types.json",
35+
"build:types": "echo 'Types generated by dts plugin'",
3636
"build:tarball": "npm pack",
3737
"circularDepCheck": "madge --circular src/index.ts",
3838
"clean": "rimraf build build-types build-test coverage node_modules/.deno sentry-deno-*.tgz",

‎packages/feedback/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
"build:transpile": "rolldown -c rollup.npm.config.mjs",
5050
"build:bundle": "rolldown -c rollup.bundle.config.mjs",
5151
"build:dev": "run-p build:transpile build:types",
52-
"build:types": "run-s build:types:core build:types:downlevel",
53-
"build:types:core": "tsc -p tsconfig.types.json",
54-
"build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8 && yarn node ./scripts/shim-preact-export.js",
52+
"build:types": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8 && yarn node ./scripts/shim-preact-export.js",
5553
"build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
5654
"build:dev:watch": "run-p build:transpile:watch build:types:watch",
5755
"build:transpile:watch": "yarn build:transpile --watch",

0 commit comments

Comments
 (0)