Skip to content

Commit 04fd055

Browse files
committed
Remove @types/node, still causes surprising Windows CI failure
Also fix a test that never worked on Windows (we have silently not been running them)
1 parent 28f1233 commit 04fd055

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

‎.bazelci/presubmit.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ platforms:
2929
- "@nodejs//:yarn"
3030
build_targets:
3131
- "//..."
32-
test_targets:
33-
- "//..."
32+
# FIXME: enable tests on Windows after fixing them
33+
# They were accidentally disabled for a while.
34+
# test_targets:
35+
# - "//..."
3436
rbe_ubuntu1604:
3537
build_targets:
3638
- "//..."

‎internal/web_package/test/spec.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ process.chdir(path.join(process.env['TEST_SRCDIR'], 'build_bazel_rules_nodejs'))
55
console.error(fs.readdirSync('.'));
66
describe('web_package', () => {
77
it('should match the golden file', () => {
8-
const actual = fs.readFileSync('internal/web_package/test/pkg/index.html', {encoding: 'utf-8'});
9-
const expected =
10-
fs.readFileSync('internal/web_package/test/index_golden.html_', {encoding: 'utf-8'});
8+
const output = 'build_bazel_rules_nodejs/internal/web_package/test/pkg/index.html';
9+
const golden = 'build_bazel_rules_nodejs/internal/web_package/test/index_golden.html_';
10+
const actual = fs.readFileSync(require.resolve(output), {encoding: 'utf-8'});
11+
const expected = fs.readFileSync(require.resolve(golden), {encoding: 'utf-8'});
1112
// make the input hermetic by replacing the cache-buster timestamp
1213
expect(actual.replace(/\?v=\d+/, '?v=123')).toBe(expected);
1314
});

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"@bazel/bazel": "^0.21.0",
1313
"@bazel/buildifier": "^0.20.0",
1414
"@bazel/typescript": "0.23.2",
15-
"@types/node": "^10.12.21",
1615
"clang-format": "1.2.2",
1716
"husky": "^0.14.3",
1817
"shelljs": "^0.8.2",

‎yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@
5555
source-map-support "0.5.9"
5656
tsutils "2.27.2"
5757

58-
"@types/node@^10.12.21":
59-
version "10.12.21"
60-
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e"
61-
integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
62-
6358
ansi-regex@^2.0.0:
6459
version "2.1.1"
6560
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"

0 commit comments

Comments
 (0)