Skip to content

Commit

Permalink
Remove some files from the repo root (microsoft#51446)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakebailey authored Dec 6, 2022
1 parent 3c99d50 commit 703652c
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 28 deletions.
23 changes: 0 additions & 23 deletions .eslintignore

This file was deleted.

12 changes: 12 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"warnOnUnsupportedTypeScriptVersion": false,
Expand All @@ -12,6 +13,17 @@
"plugins": [
"@typescript-eslint", "no-null", "import", "eslint-plugin-local"
],
"ignorePatterns": [
"**/node_modules/**",
"/built/**",
"/tests/**",
"/lib/**",
"/src/lib/*.generated.d.ts",
"/scripts/**/*.js",
"/scripts/**/*.d.*",
"/internal/**",
"/coverage/**"
],
"rules": {
"sort-imports": ["error", {
"ignoreCase": true,
Expand Down
1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

2 changes: 1 addition & 1 deletion Herebyfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const glob = util.promisify(_glob);
/** @typedef {ReturnType<typeof task>} Task */
void 0;

const copyrightFilename = "CopyrightNotice.txt";
const copyrightFilename = "./scripts/CopyrightNotice.txt";
const copyright = memoize(async () => {
const contents = await fs.promises.readFile(copyrightFilename, "utf-8");
return contents.replace(/\r\n/g, "\n");
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/dtsBundler.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ emitAsNamespace("ts", moduleSymbol);

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

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

Expand Down
8 changes: 6 additions & 2 deletions src/testRunner/externalCompileRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ export class DockerfileRunner extends ExternalCompileRunnerBase {
describe(`${this.kind()} code samples`, function (this: Mocha.Suite) {
this.timeout(cls.timeout); // 20 minutes
before(() => {
cls.exec("docker", ["build", ".", "-t", "typescript/typescript"], { cwd: IO.getWorkspaceRoot() }); // cached because workspace is hashed to determine cacheability
// cached because workspace is hashed to determine cacheability
cls.exec("docker", ["build", ".", "-t", "typescript/typescript", "-f", cls.testDir + "Dockerfile"], {
cwd: IO.getWorkspaceRoot(),
env: { ...process.env, DOCKER_BUILDKIT: "1" }, // We need buildkit to allow Dockerfile.dockerignore to work.
});
});
for (const test of testList) {
const directory = typeof test === "string" ? test : test.file;
Expand All @@ -160,7 +164,7 @@ export class DockerfileRunner extends ExternalCompileRunnerBase {
}

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

0 comments on commit 703652c

Please sign in to comment.