Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ test --nolegacy_external_runfiles
# when running bazel via `yarn bazel`.
build --incompatible_strict_action_env

# Do not build runfile forests by default. If an execution strategy relies on runfile
# forests, the forest is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
build --nobuild_runfile_links

###############################
# Output control #
###############################
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Add NodeJS rules
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
sha256 = "d14076339deb08e5460c221fae5c5e9605d2ef4848eee1f0c81c9ffdc1ab31c1",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.1/rules_nodejs-1.6.1.tar.gz"],
)

load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repositories", "yarn_install")
Expand Down
499 changes: 263 additions & 236 deletions demos/yarn.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/trimox/angular-mdc-web.git"
},
"license": "MIT",
"version": "6.0.0-canary.8",
"version": "6.0.0-canary.9",
"engines": {
"node": ">= 12.0.0",
"yarn": ">= 1.19.1"
Expand Down Expand Up @@ -53,10 +53,10 @@
"@angular/router": "^9.1.2",
"@bazel/bazelisk": "^1.4.0",
"@bazel/buildifier": "^2.2.1",
"@bazel/ibazel": "^0.12.4",
"@bazel/jasmine": "~1.5.0",
"@bazel/karma": "~1.5.0",
"@bazel/typescript": "~1.5.0",
"@bazel/ibazel": "^0.13.0",
"@bazel/jasmine": "~1.6.1",
"@bazel/karma": "~1.6.1",
"@bazel/typescript": "~1.6.1",
"@types/fs-extra": "^8.1.0",
"@types/jasmine": "^3.5.9",
"@types/minimatch": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/material-components-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/trimox/angular-mdc-web.git"
},
"version": "6.0.0-canary.8",
"version": "6.0.0-canary.9",
"license": "MIT",
"keywords": [
"angular-mdc",
Expand Down
2 changes: 1 addition & 1 deletion tools/postinstall/apply-patches.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const fs = require('fs');
* Version of the post install patch. Needs to be incremented when
* existing patches or edits have been modified.
*/
const PATCH_VERSION = 4;
const PATCH_VERSION = 5;

/** Path to the project directory. */
const projectDir = path.join(__dirname, '../..');
Expand Down
56 changes: 33 additions & 23 deletions tools/postinstall/manifest_externs_hermeticity.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git node_modules/@bazel/typescript/internal/build_defs.bzl node_modules/@bazel/typescript/internal/build_defs.bzl
index 7fef44c..4e25ed7 100644
index 03cb68fdf..2f604234c 100755
--- node_modules/@bazel/typescript/internal/build_defs.bzl
+++ node_modules/@bazel/typescript/internal/build_defs.bzl
@@ -93,25 +93,23 @@ def _filter_ts_inputs(all_inputs):
if f.path.endswith(".js") or f.path.endswith(".ts") or f.path.endswith(".json")
@@ -102,17 +102,17 @@ def _filter_ts_inputs(all_inputs):
if f.extension in ["js", "jsx", "ts", "tsx", "json"]
]

+def _filter_compile_outputs(all_outputs):
+ return [
+ f
Expand All @@ -24,41 +24,51 @@ index 7fef44c..4e25ed7 100644
- ctx.actions.write(output, content = "")
- else:
- action_outputs.append(output)
-
- # TODO(plf): For now we mock creation of files other than {name}.js.
- for externs_file in externs_files:
- ctx.actions.write(output = externs_file, content = "")
+ compile_outputs = _filter_compile_outputs(outputs)


# TODO(plf): For now we mock creation of files other than {name}.js.
for externs_file in externs_files:
@@ -120,7 +120,9 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description

# A ts_library that has only .d.ts inputs will have no outputs,
# therefore there are no actions to execute
- if not action_outputs:
+ if not compile_outputs:
+ for file in [f for f in outputs if not f in compile_outputs]:
+ ctx.actions.write(output = file, content = "")
+ ctx.actions.write(output = file, content = "")
return None

action_inputs.extend(_filter_ts_inputs(ctx.files.node_modules))
@@ -146,7 +142,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
mnemonic = mnemonic,
inputs = action_inputs,
- outputs = action_outputs,
+ outputs = outputs,
# Use the built-in shell environment
# Allow for users who set a custom shell that can locate standard binaries like tr and uname
# See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
@@ -163,7 +159,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
@@ -156,7 +158,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
mnemonic = "TypeScriptCompile",
inputs = action_inputs,
- outputs = action_outputs,
+ outputs = outputs,
# Use the built-in shell environment
# Allow for users who set a custom shell that can locate standard binaries like tr and uname
# See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
@@ -179,7 +181,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
mnemonic = "tsc",
inputs = action_inputs,
- outputs = action_outputs,
+ outputs = compile_outputs,
# Use the built-in shell environment
# Allow for users who set a custom shell that can locate standard binaries like tr and uname
# See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
@@ -194,7 +196,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
label = ctx.label,
tsconfig = tsconfig_file,
inputs = action_inputs,
- outputs = action_outputs,
+ outputs = compile_outputs,
compiler = ctx.executable.compiler,
)


diff --git node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
index 0346123..3d9bc64 100644
index ec813f654..738342a8f 100755
--- node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
+++ node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
@@ -381,6 +381,23 @@ function createProgramAndEmit(fileLoader, options, bazelOpts, files, disabledTse
Expand All @@ -84,4 +94,4 @@ index 0346123..3d9bc64 100644
+ }
}
if (diagnostics.length > 0) {
worker_1.debug('compilation failed at', new Error().stack);
worker_1.debug('compilation failed at', new Error().stack);
Loading