Skip to content

Commit 703652c

Browse files
authored
Remove some files from the repo root (microsoft#51446)
1 parent 3c99d50 commit 703652c

File tree

9 files changed

+20
-28
lines changed

9 files changed

+20
-28
lines changed

.eslintignore

-23
This file was deleted.

.eslintrc.json

+12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"parser": "@typescript-eslint/parser",
34
"parserOptions": {
45
"warnOnUnsupportedTypeScriptVersion": false,
@@ -12,6 +13,17 @@
1213
"plugins": [
1314
"@typescript-eslint", "no-null", "import", "eslint-plugin-local"
1415
],
16+
"ignorePatterns": [
17+
"**/node_modules/**",
18+
"/built/**",
19+
"/tests/**",
20+
"/lib/**",
21+
"/src/lib/*.generated.d.ts",
22+
"/scripts/**/*.js",
23+
"/scripts/**/*.d.*",
24+
"/internal/**",
25+
"/coverage/**"
26+
],
1527
"rules": {
1628
"sort-imports": ["error", {
1729
"ignoreCase": true,

.yarnrc

-1
This file was deleted.

Herebyfile.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const glob = util.promisify(_glob);
2121
/** @typedef {ReturnType<typeof task>} Task */
2222
void 0;
2323

24-
const copyrightFilename = "CopyrightNotice.txt";
24+
const copyrightFilename = "./scripts/CopyrightNotice.txt";
2525
const copyright = memoize(async () => {
2626
const contents = await fs.promises.readFile(copyrightFilename, "utf-8");
2727
return contents.replace(/\r\n/g, "\n");
File renamed without changes.

scripts/dtsBundler.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ emitAsNamespace("ts", moduleSymbol);
401401

402402
write("export = ts;", WriteTarget.Both);
403403

404-
const copyrightNotice = fs.readFileSync(path.join(__dirname, "..", "CopyrightNotice.txt"), "utf-8");
404+
const copyrightNotice = fs.readFileSync(path.join(__dirname, "CopyrightNotice.txt"), "utf-8");
405405
const publicContents = copyrightNotice + publicLines.join(newLine);
406406
const internalContents = copyrightNotice + internalLines.join(newLine);
407407

src/testRunner/externalCompileRunner.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@ export class DockerfileRunner extends ExternalCompileRunnerBase {
144144
describe(`${this.kind()} code samples`, function (this: Mocha.Suite) {
145145
this.timeout(cls.timeout); // 20 minutes
146146
before(() => {
147-
cls.exec("docker", ["build", ".", "-t", "typescript/typescript"], { cwd: IO.getWorkspaceRoot() }); // cached because workspace is hashed to determine cacheability
147+
// cached because workspace is hashed to determine cacheability
148+
cls.exec("docker", ["build", ".", "-t", "typescript/typescript", "-f", cls.testDir + "Dockerfile"], {
149+
cwd: IO.getWorkspaceRoot(),
150+
env: { ...process.env, DOCKER_BUILDKIT: "1" }, // We need buildkit to allow Dockerfile.dockerignore to work.
151+
});
148152
});
149153
for (const test of testList) {
150154
const directory = typeof test === "string" ? test : test.file;
@@ -160,7 +164,7 @@ export class DockerfileRunner extends ExternalCompileRunnerBase {
160164
}
161165

162166
private timeout = 1_200_000; // 20 minutes;
163-
private exec(command: string, args: string[], options: { cwd: string }): void {
167+
private exec(command: string, args: string[], options: { cwd: string; env?: NodeJS.ProcessEnv }): void {
164168
const cp: typeof import("child_process") = require("child_process");
165169
const stdio = isWorker ? "pipe" : "inherit";
166170
const res = cp.spawnSync(isWorker ? `${command} 2>&1` : command, args, { timeout: this.timeout, shell: true, stdio, ...options });
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)