This is an automated email from the ASF dual-hosted git repository. benweidig pushed a commit to branch javax in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit f8a60747869692d1ea4ceacdfaa8d6764b1ef20c Author: Ben Weidig <[email protected]> AuthorDate: Sun Apr 19 12:01:10 2026 +0200 TAP5-2809: Don't emit TypeScript typings into es-emoduls The TypeScript project package.json/tsconfig.json was slightly improved, no longer emitting the typings into the es-modules, and hardening script calling in general. --- tapestry-core/src/main/typescript/package.json | 22 +++++++++++----------- tapestry-core/src/main/typescript/tsconfig.json | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/tapestry-core/src/main/typescript/package.json b/tapestry-core/src/main/typescript/package.json index 51d7af186..d13fdc044 100644 --- a/tapestry-core/src/main/typescript/package.json +++ b/tapestry-core/src/main/typescript/package.json @@ -10,21 +10,21 @@ }, "dependencies": {}, "scripts": { - "build": "npm run build-es-module; npm run build-amd; rm -f .", - "build-es-module": "npx tsc --outDir ../resources/META-INF/assets/es-modules/; npm run adjust-es-module;", - "build-amd": "npx tsc --module amd --outDir ../resources/META-INF/modules/; npm run adjust-amd;", - "clean-amd": "rm -rf ../resources/META-INF/modules/t5/core/*.js; rm -rf ../resources/META-INF/modules/t5/beanvalidation/*.js;", - "clean-es-module": "rm -rf ../resources/META-INF/assets/es-modules/t5/core/*.js; ../resources/META-INF/assets/es-modules/t5/beanvalidation/*.js;", - "clean": "npm run clean-amd; npm run clean-es-module; npm run clean-docs; npm run clean-tsc;", - "adjust-amd": "mv ../resources/META-INF/modules/t5/core/messages-amd.js ../resources/META-INF/modules/t5/core/messages.js; rm ../resources/META-INF/modules/t5/core/messages-es-module.js;", - "adjust-es-module": "mv ../resources/META-INF/assets/es-modules/t5/core/messages-es-module.js ../resources/META-INF/assets/es-modules/t5/core/messages.js; rm ../resources/META-INF/assets/es-modules/t5/core/messages-amd.js;", + "build": "npm run build-es-module && npm run build-amd", + "build-es-module": "tsc --outDir ../resources/META-INF/assets/es-modules/ && npm run adjust-es-module", + "build-amd": "tsc --module amd --outDir ../resources/META-INF/modules/ && npm run adjust-amd", + "clean-amd": "rm -rf ../resources/META-INF/modules/t5/core/*.js && rm -rf ../resources/META-INF/modules/t5/beanvalidation/*.js", + "clean-es-module": "rm -rf ../resources/META-INF/assets/es-modules/t5/core/*.js && rm -rf ../resources/META-INF/assets/es-modules/t5/beanvalidation/*.js", + "clean": "npm run clean-amd && npm run clean-es-module && npm run clean-docs && npm run clean-tsc", + "adjust-amd": "mv ../resources/META-INF/modules/t5/core/messages-amd.js ../resources/META-INF/modules/t5/core/messages.js && rm ../resources/META-INF/modules/t5/core/messages-es-module.js", + "adjust-es-module": "mv ../resources/META-INF/assets/es-modules/t5/core/messages-es-module.js ../resources/META-INF/assets/es-modules/t5/core/messages.js && rm ../resources/META-INF/assets/es-modules/t5/core/messages-amd.js", "docs": "typedoc", "clean-docs": "rm -rf docs", "tsc": "tsc", "clean-tsc": "rm -rf ./types/*", - "generate-type-definitions": "tsc --emitDeclarationOnly --outDir ./types", - "test-publish-to-npm": "npm run clean-tsc; npm run generate-type-definitions; npm pack;", - "publish-to-npm": "npm run clean-tsc; npm run generate-type-definitions; npm publish --access public;" + "generate-type-definitions": "tsc --declaration --emitDeclarationOnly --outDir ./types", + "test-publish-to-npm": "npm run clean-tsc && npm run generate-type-definitions && npm pack", + "publish-to-npm": "npm run clean-tsc && npm run generate-type-definitions && npm publish --access public" }, "license": "Apache-2.0", "name": "@thiagohp/tapestry-5", diff --git a/tapestry-core/src/main/typescript/tsconfig.json b/tapestry-core/src/main/typescript/tsconfig.json index 33aa9ddde..bd501e030 100644 --- a/tapestry-core/src/main/typescript/tsconfig.json +++ b/tapestry-core/src/main/typescript/tsconfig.json @@ -34,8 +34,6 @@ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */, - "declaration": true, - "outDir": "output", "rootDir": "src",
