Skip to content

Build: Ship the default TypeScript .d.ts declaration files, not rollups #1593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 16, 2024
Merged

Build: Ship the default TypeScript .d.ts declaration files, not rollups #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47d6dbb
Build: Ship the default TypeScript .d.ts declaration files, not rollups
adamziel Jul 9, 2024
a3f0c50
Adjust the rollup path in generate-schema.js
adamziel Jul 9, 2024
5249224
Correct the dependency chain on php-wasm/node/project.json
adamziel Jul 9, 2024
cc43976
Add mkdir command
adamziel Jul 12, 2024
9468922
use mkdir -p
adamziel Jul 15, 2024
d91fa0f
Attempt to fix build failure due to missing dir
brandonpayton Jul 16, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions packages/php-wasm/fs-journal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -33,19 +33,6 @@
"outputPath": "dist/packages/php-wasm/fs-journal"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/fs-journal/src/rollup.d.ts -- packages/php-wasm/fs-journal/src/index.ts",
"rimraf dist/packages/php-wasm/fs-journal/lib/*.d.ts",
"rimraf dist/packages/php-wasm/fs-journal/*.d.ts",
"cp packages/php-wasm/fs-journal/src/rollup.d.ts dist/packages/php-wasm/fs-journal/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"test": {
"executor": "nx:noop",
"dependsOn": ["test:vite"]
Expand Down
26 changes: 11 additions & 15 deletions packages/php-wasm/node/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"cp packages/php-wasm/node/README.md dist/packages/php-wasm/node"
]
},
"dependsOn": ["build:rollup-declarations"]
"dependsOn": ["build:mkdir"]
},
"build:copy-wasms": {
"executor": "nx:run-commands",
Expand All @@ -26,19 +26,6 @@
],
"parallel": false
},
"dependsOn": ["build:rollup-declarations"]
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/node/src/rollup.d.ts -- packages/php-wasm/node/src/index.ts",
"rimraf dist/packages/php-wasm/node/lib/*.d.ts",
"rimraf dist/packages/php-wasm/node/*.d.ts",
"cp packages/php-wasm/node/src/rollup.d.ts dist/packages/php-wasm/node/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:package-json"]
},
"build:package-json": {
Expand All @@ -47,7 +34,8 @@
"tsConfig": "packages/php-wasm/node/tsconfig.lib.json",
"outputPath": "dist/packages/php-wasm/node",
"buildTarget": "php-wasm-node:build:bundle:production"
}
},
"dependsOn": ["build:mkdir"]
},
"build:bundle": {
"executor": "@nx/esbuild:esbuild",
Expand All @@ -56,6 +44,14 @@
"options": {
"command": "node packages/php-wasm/node/build.js",
"parallel": false
},
"dependsOn": ["build:mkdir"]
},
"build:mkdir": {
"executor": "nx:run-commands",
"options": {
"commands": ["mkdir -p dist/packages/php-wasm/node"],
"parallel": false
}
},
"recompile-php": {
Expand Down
15 changes: 1 addition & 14 deletions packages/php-wasm/stream-compression/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -33,19 +33,6 @@
"outputPath": "dist/packages/php-wasm/stream-compression"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/stream-compression/src/rollup.d.ts -- packages/php-wasm/stream-compression/src/index.ts",
"rimraf dist/packages/php-wasm/stream-compression/lib/*.d.ts",
"rimraf dist/packages/php-wasm/stream-compression/*.d.ts",
"cp packages/php-wasm/stream-compression/src/rollup.d.ts dist/packages/php-wasm/stream-compression/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"test": {
"executor": "@nx/vite:test",
"outputs": ["{options.reportsDirectory}"],
Expand Down
15 changes: 1 addition & 14 deletions packages/php-wasm/universal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -33,19 +33,6 @@
"outputPath": "dist/packages/php-wasm/universal"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/universal/src/rollup.d.ts -- packages/php-wasm/universal/src/index.ts",
"rimraf dist/packages/php-wasm/universal/lib/*.d.ts",
"rimraf dist/packages/php-wasm/universal/*.d.ts",
"cp packages/php-wasm/universal/src/rollup.d.ts dist/packages/php-wasm/universal/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"test": {
"executor": "nx:noop",
"dependsOn": ["test:vite"]
Expand Down
15 changes: 1 addition & 14 deletions packages/php-wasm/util/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -33,19 +33,6 @@
"outputPath": "dist/packages/php-wasm/util"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/util/src/rollup.d.ts -- packages/php-wasm/util/src/index.ts",
"rimraf dist/packages/php-wasm/util/lib/*.d.ts",
"rimraf dist/packages/php-wasm/util/*.d.ts",
"cp packages/php-wasm/util/src/rollup.d.ts dist/packages/php-wasm/util/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"publish": {
"executor": "nx:run-commands",
"options": {
Expand Down
15 changes: 1 addition & 14 deletions packages/php-wasm/web/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -34,19 +34,6 @@
"outputPath": "dist/packages/php-wasm/web"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/php-wasm/web/src/rollup.d.ts -- packages/php-wasm/web/src/index.ts",
"rimraf dist/packages/php-wasm/web/lib/*.d.ts",
"rimraf dist/packages/php-wasm/web/*.d.ts",
"cp packages/php-wasm/web/src/rollup.d.ts dist/packages/php-wasm/web/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"recompile-php:light": {
"executor": "nx:run-commands",
"options": {
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/blueprints/bin/generate-schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from 'fs';

/** @type {import('ts-json-schema-generator/dist/src/Config').Config} */
const config = {
path: 'dist/packages/playground/blueprints/index.d.ts',
path: 'packages/playground/blueprints/src/rollup.d.ts',
tsconfig: './tsconfig.base.json',
type: 'Blueprint',
skipTypeCheck: true,
Expand Down
11 changes: 4 additions & 7 deletions packages/playground/blueprints/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependsOn": [
"build:bundle",
"build:blueprint-schema",
"build:rollup-declarations"
"build:rollup-declarations-for-schema-generation"
]
},
"build:blueprint-schema": {
Expand All @@ -20,17 +20,14 @@
],
"parallel": false
},
"dependsOn": ["build:rollup-declarations"]
"dependsOn": ["build:rollup-declarations-for-schema-generation"]
},
"build:rollup-declarations": {
"build:rollup-declarations-for-schema-generation": {
"executor": "nx:run-commands",
"options": {
"commands": [
"mkdir -p dist/packages/playground/blueprints",
"npx dts-bundle-generator -o packages/playground/blueprints/src/rollup.d.ts -- packages/playground/blueprints/src/index.ts",
"rimraf dist/packages/playground/blueprints/lib/*.d.ts",
"rimraf dist/packages/playground/blueprints/*.d.ts",
"cp packages/playground/blueprints/src/rollup.d.ts dist/packages/playground/blueprints/index.d.ts"
"npx dts-bundle-generator -o packages/playground/blueprints/src/rollup.d.ts -- packages/playground/blueprints/src/index.ts"
],
"parallel": false
},
Expand Down
15 changes: 1 addition & 14 deletions packages/playground/common/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand Down Expand Up @@ -42,19 +42,6 @@
},
"dependsOn": ["^build"]
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/playground/common/src/rollup.d.ts -- packages/playground/common/src/index.ts",
"rimraf dist/packages/playground/common/lib/*.d.ts",
"rimraf dist/packages/playground/common/*.d.ts",
"cp packages/playground/common/src/rollup.d.ts dist/packages/playground/common/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"publish": {
"executor": "nx:run-commands",
"options": {
Expand Down
15 changes: 1 addition & 14 deletions packages/playground/storage/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand All @@ -33,19 +33,6 @@
"outputPath": "dist/packages/playground/storage"
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/playground/storage/src/rollup.d.ts -- packages/playground/storage/src/index.ts",
"rimraf dist/packages/playground/storage/lib/*.d.ts",
"rimraf dist/packages/playground/storage/*.d.ts",
"cp packages/playground/storage/src/rollup.d.ts dist/packages/playground/storage/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"test": {
"executor": "@nx/vite:test",
"outputs": ["{workspaceRoot}/coverage/packages/playground/storage"],
Expand Down
15 changes: 1 addition & 14 deletions packages/playground/wordpress-builds/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand Down Expand Up @@ -50,19 +50,6 @@
"commands": ["rm -rf dist/packages/playground/wordpress-builds"]
}
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/playground/wordpress-builds/src/rollup.d.ts -- packages/playground/wordpress-builds/src/index.ts",
"rimraf dist/packages/playground/wordpress-builds/lib/*.d.ts",
"rimraf dist/packages/playground/wordpress-builds/*.d.ts",
"cp packages/playground/wordpress-builds/src/rollup.d.ts dist/packages/playground/wordpress-builds/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"bundle-wordpress": {
"executor": "nx:run-commands",
"options": {
Expand Down
15 changes: 1 addition & 14 deletions packages/playground/wordpress/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"targets": {
"build": {
"executor": "nx:noop",
"dependsOn": ["build:README", "build:rollup-declarations"]
"dependsOn": ["build:README"]
},
"build:README": {
"executor": "nx:run-commands",
Expand Down Expand Up @@ -44,19 +44,6 @@
},
"dependsOn": ["^build"]
},
"build:rollup-declarations": {
"executor": "nx:run-commands",
"options": {
"commands": [
"npx dts-bundle-generator -o packages/playground/wordpress/src/rollup.d.ts -- packages/playground/wordpress/src/index.ts",
"rimraf dist/packages/playground/wordpress/lib/*.d.ts",
"rimraf dist/packages/playground/wordpress/*.d.ts",
"cp packages/playground/wordpress/src/rollup.d.ts dist/packages/playground/wordpress/index.d.ts"
],
"parallel": false
},
"dependsOn": ["build:bundle"]
},
"publish": {
"executor": "nx:run-commands",
"options": {
Expand Down