Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"npm-run-all": "4.1.5",
"prettier": "3.8.3",
"shx": "0.4.0",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"lint-staged": {
"*.{ts,js,json,md,yml}": [
Expand Down
5 changes: 3 additions & 2 deletions packages/dts-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
"sanitize-html": "2.17.3",
"semver": "^7.8.0",
"strip-json-comments": "^5.0.3",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"devDependencies": {
"@microsoft/api-extractor": "^7.58.7",
"@types/argparse": "^2.0.17",
"@types/lodash": "4.17.24",
"@types/node": "^22.0.0",
"@types/sanitize-html": "2.16.1",
"@types/urijs": "1.19.26",
"copyfiles": "^2.4.1",
Expand All @@ -57,7 +58,7 @@
"build-api-types": "api-extractor run --local --verbose",
"clean-implementation-types": "del-cli -f \"dist/**/*.d.ts.map\" \"dist/**/*.d.ts\" \"!dist/**/index.d.ts\" \"!dist/**/core-preamble.d.ts\" \"!dist/**/typed-json-model.d.ts\"",
"ci": "npm-run-all test:*",
"test:apis": "tsc ./src/types/api-json.d.ts ./src/types/ast.d.ts ./src/types/ui5-logger-types.d.ts",
"test:apis": "tsc -p tsconfig-test-apis.json",
"prewatch": "npm-run-all clean copy-files",
"watch": "tsc -w"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dts-generator/src/checkCompile/check-compile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export interface CheckCompileConfig {
dependencyFiles: string[];

/**
* The options for the TypeScript compiler, a map with properties like "strict", "noEmit", "moduleResolution" etc. (note that enums are given like ts.ModuleResolutionKind.NodeJs)
* The options for the TypeScript compiler, a map with properties like "strict", "noEmit", "moduleResolution" etc. (note that enums are given like ts.ModuleResolutionKind.Node16)
*/
tsOptions: ts.BuildOptions;

Expand Down
2 changes: 1 addition & 1 deletion packages/dts-generator/src/runCheck.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async function main() {
strict: true,
target: ScriptTarget.ES2015,
module: ModuleKind.ES2015,
moduleResolution: ModuleResolutionKind.NodeJs,
moduleResolution: ModuleResolutionKind.Node16,
},
});

Expand Down
13 changes: 13 additions & 0 deletions packages/dts-generator/tsconfig-test-apis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"noEmit": true,
"module": "Node16",
"moduleResolution": "Node16",
"strict": false
},
"include": [
"./src/types/api-json.d.ts",
"./src/types/ast.d.ts",
"./src/types/ui5-logger-types.d.ts"
]
}
4 changes: 4 additions & 0 deletions packages/dts-generator/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
"module": "Node16",
"moduleResolution": "Node16",
"target": "es2022",
"types": ["node"],
"rootDir": "./src",
Comment thread
akudev marked this conversation as resolved.
"outDir": "./dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"noImplicitAny": false,
"strict": false,
"skipLibCheck": true,
"resolveJsonModule": true,
"allowJs": true
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ts-interface-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"jest": "30.4.2",
"npm-run-all": "4.1.5",
"ts-jest": "29.4.9",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"dependencies": {
"hjson": "3.2.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const standardTsConfig: ts.CompilerOptions = {
esModuleInterop: true,
skipLibCheck: true,
forceConsistentCasingInFileNames: true,
types: ["openui5"],
};

describe("Single Testcases", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"types": ["openui5"],
"noEmit": true,
"paths": {
"my/*": ["${configDir}/*"]
Expand Down
3 changes: 2 additions & 1 deletion packages/ts-interface-generator/tsconfig-testcontrol.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"moduleResolution": "node16",
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"forceConsistentCasingInFileNames": true,
"types": ["openui5"]
},
"include": ["./src/test/samples/sampleControl/**/*"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"moduleResolution": "node16",
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"forceConsistentCasingInFileNames": true,
"types": ["openui5"]
},
"include": ["./src/test/samples/sampleManagedObject/**/*"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"moduleResolution": "node16",
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"forceConsistentCasingInFileNames": true,
"types": ["openui5"]
},
"include": ["./src/test/samples/sampleWebComponent/**/*"]
}
2 changes: 1 addition & 1 deletion test-packages/openui5-snapshot-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@ui5/dts-generator": "link:../../packages/dts-generator",
"fs-extra": "11.3.5",
"lodash": "4.18.1",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"devDependencies": {
"@types/jquery": "3.5.32",
Expand Down
1 change: 1 addition & 0 deletions test-packages/openui5-snapshot-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"include": ["playground", "output-dts"],
"compilerOptions": {
"module": "ES2022",
"moduleResolution": "bundler",
"target": "ES2022",
"noEmit": true,
"checkJs": true,
Expand Down
2 changes: 1 addition & 1 deletion test-packages/typed-json-model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@ui5/linter": "^1.21.0",
"eslint": "^10.3.0",
"globals": "^17.6.0",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"typescript-eslint": "^8.59.2",
"ui5-middleware-livereload": "^3",
"ui5-middleware-simpleproxy": "^3",
Expand Down
4 changes: 1 addition & 3 deletions test-packages/typed-json-model/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
"compilerOptions": {
"target": "es2023",
"module": "es2022",
"moduleResolution": "node",
"moduleResolution": "bundler",
"skipLibCheck": true,
"allowJs": true,
"strict": true,
"strictPropertyInitialization": false,
"rootDir": "./webapp",
"baseUrl": "./",
"paths": {},
"composite": true,
"outDir": "./dist",
"types": ["@openui5/types"]
Expand Down
19 changes: 18 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2904,6 +2904,13 @@
dependencies:
undici-types "~7.14.0"

"@types/node@^22.0.0":
version "22.19.18"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.18.tgz#fde5e5e082daa1e69535deb9e2bbfa928f61b5e3"
integrity sha512-9v00a+dn2yWVsYDEunWC4g/TcRKVq3r8N5FuZp7u0SGrPvdN9c2yXI9bBuf5Fl0hNCb+QTIePTn5pJs2pwBOQQ==
dependencies:
undici-types "~6.21.0"

"@types/normalize-package-data@^2.4.0", "@types/normalize-package-data@^2.4.3":
version "2.4.4"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
Expand Down Expand Up @@ -3221,7 +3228,7 @@
sanitize-html "2.17.3"
semver "^7.8.0"
strip-json-comments "^5.0.3"
typescript "^5.9.3"
typescript "^6.0.3"

"@ui5/fs@^4.0.5":
version "4.0.5"
Expand Down Expand Up @@ -11767,6 +11774,11 @@ typescript@5.9.3, "typescript@>=3 < 6", typescript@^5.9.3:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==

typescript@6.0.3, typescript@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==

uc.micro@^2.0.0, uc.micro@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
Expand Down Expand Up @@ -11834,6 +11846,11 @@ underscore@~1.13.2:
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.8.tgz#a93a21186c049dbf0e847496dba72b7bd8c1e92b"
integrity sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==

undici-types@~6.21.0:
version "6.21.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==

undici-types@~7.14.0:
version "7.14.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.14.0.tgz#4c037b32ca4d7d62fae042174604341588bc0840"
Expand Down
Loading