Skip to content

Commit

Permalink
test: be explicit about which types are used in ts_project tests
Browse files Browse the repository at this point in the history
This prevents @types packages added to the root package.json from inadvertently breaking tests on buildkite Windows CI where there is no sandboxing.
  • Loading branch information
gregmagolan committed Apr 29, 2020
1 parent 9fda99a commit c74ebaf
Show file tree
Hide file tree
Showing 17 changed files with 42 additions and 12 deletions.
3 changes: 2 additions & 1 deletion internal/linker/test/local/fit/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true
"declaration": true,
"types": []
}
}
6 changes: 5 additions & 1 deletion internal/node/test/lib2/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"compilerOptions": {
"types": ["node"]
}
}
3 changes: 3 additions & 0 deletions internal/node/test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"compilerOptions": {
"types": []
},
"include": ["main.ts"]
}
3 changes: 2 additions & 1 deletion internal/pkg_npm/test/linking/fub/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true
"declaration": true,
"types": []
}
}
3 changes: 2 additions & 1 deletion internal/pkg_npm/test/linking/fuz/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true
"declaration": true,
"types": []
}
}
3 changes: 2 additions & 1 deletion internal/pkg_npm/test/linking/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"compilerOptions": {
"declaration": true
"declaration": true,
"types": []
},
"include": ["*.ts"]
}
3 changes: 2 additions & 1 deletion packages/rollup/test/integration/far/a/b/c/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"strict": true,
"target": "es2015",
"module": "esnext",
"moduleResolution": "node"
"moduleResolution": "node",
"types": []
}
}
3 changes: 2 additions & 1 deletion packages/rollup/test/integration/far/a/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"strict": true,
"target": "es2015",
"module": "esnext",
"moduleResolution": "node"
"moduleResolution": "node",
"types": []
},
// For Windows, which is not sand-boxed, we need to limit
// the typescript files included so the "@far/a" compilation
Expand Down
3 changes: 2 additions & 1 deletion packages/rollup/test/integration/foo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"strict": true,
"target": "es2015",
"module": "esnext",
"moduleResolution": "node"
"moduleResolution": "node",
"types": []
}
}
3 changes: 2 additions & 1 deletion packages/rollup/test/integration/foo_a/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"strict": true,
"target": "es2015",
"module": "esnext",
"moduleResolution": "node"
"moduleResolution": "node",
"types": []
}
}
3 changes: 2 additions & 1 deletion packages/rollup/test/integration/foo_aaa/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"strict": true,
"target": "es2015",
"module": "esnext",
"moduleResolution": "node"
"moduleResolution": "node",
"types": []
}
}
1 change: 1 addition & 0 deletions packages/typescript/src/checked_in_ts_project.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def checked_in_ts_project(name, src, checked_in_js = None, **kwargs):
module = "commonjs",
removeComments = True,
declaration = True,
skipLibCheck = True,
),
files = ["/".join([workspace_root, native.package_name(), src])],
).to_json()],
Expand Down
3 changes: 3 additions & 0 deletions packages/typescript/test/ts_project/b/tsconfig-test.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "../tsconfig-base.json",
"compilerOptions": {
"types": ["jasmine", "node"]
},
"references": [
{"path": "./"}
],
Expand Down
6 changes: 5 additions & 1 deletion packages/typescript/test/ts_project/rootdir/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"compilerOptions": {
"types": []
}
}
6 changes: 5 additions & 1 deletion packages/typescript/test/ts_project/simple/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"compilerOptions": {
"types": []
}
}
1 change: 1 addition & 0 deletions packages/typescript/test/ts_project/tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"../../../../bazel-out/k8-dbg/bin/packages/typescript/test/ts_project",
"../../../../bazel-out/x64_windows-dbg/bin/packages/typescript/test/ts_project",
],
"types": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"declarationMap": true,
"declaration": true,
"sourceMap": true,
"types": []
}
}

0 comments on commit c74ebaf

Please sign in to comment.