Skip to content

[EngSys] add typescript v7 dev dependency #39225

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

Open
jeremymeng wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[EngSys] add typescript v7 dev dependency #39225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2eb213e
[EngSys] add typescript v7 dev dependency
jeremymeng Jul 9, 2026
23b6068
address CR feedback
jeremymeng Jul 9, 2026
a27fa6d
update lock file
jeremymeng Jul 9, 2026
4ab6387
update vite-plugin-browser-test-map
jeremymeng Jul 10, 2026
6bf9e71
update dev-tool build-test to use vendored tsc which is v7
jeremymeng Jul 10, 2026
a6e4ce1
[test-utils] fix TS7 TS2320 error in vitest module augmentation
jeremymeng Jul 11, 2026
1f6083b
[dev-tool] Update samples dependency generation
jeremymeng Jul 13, 2026
7d98137
Merge remote-tracking branch 'upstream/main' into engsys/ts-v7
jeremymeng Jul 13, 2026
44636a8
Merge remote-tracking branch 'upstream/main' into engsys/ts-v7
jeremymeng Jul 13, 2026
ad931cc
update lock file
jeremymeng Jul 13, 2026
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
3 changes: 2 additions & 1 deletion common/tools/dev-tool/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"tar": "^7.4.3",
"ts-morph": "^27.0.0",
"tslib": "^2.8.1",
"typescript": "~6.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"unzipper": "~0.12.3",
"yaml": "^2.3.4"
Comment thread
jeremymeng marked this conversation as resolved.
},
Expand All @@ -83,6 +83,7 @@
"eslint": "catalog:",
"mkdirp": "^3.0.1",
"rimraf": "catalog:",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript-eslint": "~8.60.0",
"vitest": "catalog:testing"
}
Expand Down
9 changes: 8 additions & 1 deletion common/tools/dev-tool/src/commands/run/build-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { createPrinter } from "../../util/printer.ts";
import { resolveProject } from "../../util/resolveProject.ts";
import { type ResolvedConfigResult, resolveConfig } from "../../util/resolveTsConfig.ts";
import { spawnSync } from "node:child_process";
import { isWindows } from "../../util/platform.ts";

const log = createPrinter("build-test");

Expand Down Expand Up @@ -65,6 +66,11 @@ async function findAndRunTypeScriptConfig(
return false;
}

const DOT_BIN_PATH = path.resolve(import.meta.dirname, "..", "..", "..", "node_modules", ".bin");
const commandPath = isWindows()
? path.join(DOT_BIN_PATH, "tsc.CMD")
: path.join(DOT_BIN_PATH, "tsc");

export default leafCommand(commandInfo, async (options) => {
const browserTest = options["browser-test"];
const browserConfig = options["browser-config"];
Expand Down Expand Up @@ -134,7 +140,8 @@ export default leafCommand(commandInfo, async (options) => {
});

async function runTypeScript(tsConfig: string): Promise<boolean> {
const res = spawnSync(`tsc -b ${tsConfig}`, [], {
log.info(`Running TypeScript build: ${commandPath} -b ${tsConfig}`);
const res = spawnSync(`${commandPath} -b ${tsConfig}`, [], {
stdio: "inherit",
shell: true,
cwd: process.cwd(),
Expand Down
19 changes: 14 additions & 5 deletions common/tools/dev-tool/src/util/samples/generation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export async function makeSampleGenerationInfo(
// If we are a beta package, use "beta", otherwise we will use "latest"
[projectInfo.name]: projectInfo.version.includes("beta") ? "beta" : "latest",
// We use this universally
dotenv: "latest",
dotenv: devToolPackageJson.dependencies["dotenv"],
};

const { packageJson } = projectInfo;
Expand Down Expand Up @@ -275,14 +275,23 @@ export async function makeSampleGenerationInfo(
devDependencies: {
...typesDependencies,
"@types/node": `^${MIN_SUPPORTED_NODE_VERSION}`,
"cross-env": "latest",
rimraf: "latest",
typescript: devToolPackageJson.dependencies.typescript,
"cross-env": resolveDependencyVersion(
"cross-env",
devToolPackageJson.devDependencies["cross-env"],
),
rimraf: resolveDependencyVersion(
"rimraf",
devToolPackageJson.devDependencies["rimraf"],
),
typescript: resolveDependencyVersion("typescript", "catalog:"),
},
}
: {
devDependencies: {
"cross-env": "latest",
"cross-env": resolveDependencyVersion(
"cross-env",
devToolPackageJson.devDependencies["cross-env"],
),
},
}),
};
Expand Down
4 changes: 2 additions & 2 deletions common/tools/dev-tool/test/samples/files/expectations/cjs-forms/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/cjs-forms",
"dependencies": {
"cjs-forms": "latest",
"dotenv": "latest",
"dotenv": "^16.0.0",
"@azure/test1": "latest",
"@azure-test2/test2": "beta"
},
"devDependencies": {
"cross-env": "latest"
"cross-env": "^10.1.0"
}
}
8 changes: 4 additions & 4 deletions common/tools/dev-tool/test/samples/files/expectations/cjs-forms/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/cjs-forms",
"dependencies": {
"cjs-forms": "latest",
"dotenv": "latest",
"dotenv": "^16.0.0",
"@azure/test1": "latest",
"@azure-test2/test2": "beta"
},
"devDependencies": {
"@types/node": "^22.0.0",
"cross-env": "latest",
"rimraf": "latest",
"typescript": "~6.0.2"
"cross-env": "^10.1.0",
"rimraf": "^6.1.0",
"typescript": "~7.0.2"
}
}
4 changes: 2 additions & 2 deletions ...ols/dev-tool/test/samples/files/expectations/output-customization/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/output-customization",
"dependencies": {
"output-customization": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"cross-env": "latest"
"cross-env": "^10.1.0"
}
}
8 changes: 4 additions & 4 deletions ...ols/dev-tool/test/samples/files/expectations/output-customization/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/output-customization",
"dependencies": {
"output-customization": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"cross-env": "latest",
"rimraf": "latest",
"typescript": "~6.0.2"
"cross-env": "^10.1.0",
"rimraf": "^6.1.0",
"typescript": "~7.0.2"
}
}
4 changes: 2 additions & 2 deletions common/tools/dev-tool/test/samples/files/expectations/simple/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/simple",
"dependencies": {
"simple": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"cross-env": "latest"
"cross-env": "^10.1.0"
}
}
8 changes: 4 additions & 4 deletions common/tools/dev-tool/test/samples/files/expectations/simple/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/simple",
"dependencies": {
"simple": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"cross-env": "latest",
"rimraf": "latest",
"typescript": "~6.0.2"
"cross-env": "^10.1.0",
"rimraf": "^6.1.0",
"typescript": "~7.0.2"
}
}
4 changes: 2 additions & 2 deletions ...ools/dev-tool/test/samples/files/expectations/simple@1.0.0-beta.1/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/simple@1.0.0-beta.1",
"dependencies": {
"simple@1.0.0-beta.1": "beta",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"cross-env": "latest"
"cross-env": "^10.1.0"
}
}
8 changes: 4 additions & 4 deletions ...ools/dev-tool/test/samples/files/expectations/simple@1.0.0-beta.1/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/simple@1.0.0-beta.1",
"dependencies": {
"simple@1.0.0-beta.1": "beta",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"cross-env": "latest",
"rimraf": "latest",
"typescript": "~6.0.2"
"cross-env": "^10.1.0",
"rimraf": "^6.1.0",
"typescript": "~7.0.2"
}
}
4 changes: 2 additions & 2 deletions ...tools/dev-tool/test/samples/files/expectations/special-characters/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/special-characters",
"dependencies": {
"special-characters": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"cross-env": "latest"
"cross-env": "^10.1.0"
}
}
8 changes: 4 additions & 4 deletions ...tools/dev-tool/test/samples/files/expectations/special-characters/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/common/tools/dev-tool/test/samples/files/expectations/special-characters",
"dependencies": {
"special-characters": "latest",
"dotenv": "latest"
"dotenv": "^16.0.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"cross-env": "latest",
"rimraf": "latest",
"typescript": "~6.0.2"
"cross-env": "^10.1.0",
"rimraf": "^6.1.0",
"typescript": "~7.0.2"
}
}
2 changes: 1 addition & 1 deletion common/tools/eslint-plugin-azure-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"glob": "^13.0.0",
"js-yaml": "^4.1.1",
"tslib": "^2.6.2",
"typescript": "~6.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"typescript-eslint": "~8.60.0"
},
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion common/tools/vite-plugin-browser-test-map/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"eslint": "catalog:",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"typescript": "catalog:",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript-eslint": "~8.60.0"
}
}
3 changes: 2 additions & 1 deletion common/tools/warp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"esbuild": "^0.27.3",
"tsx": "catalog:",
"typescript": "catalog:",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"yaml": "^2.8.2"
Comment thread
jeremymeng marked this conversation as resolved.
},
"devDependencies": {
Expand All @@ -44,6 +44,7 @@
"prettier": "catalog:",
"rimraf": "catalog:",
"tslib": "^2.8.1",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript-eslint": "~8.60.0",
"vitest": "catalog:testing"
},
Expand Down
Loading
Loading