From f0c681a6de28ea06addfc26e0018d9d96111872b Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 23 Aug 2017 11:42:35 -0700
Subject: [PATCH] build: disable sass under bazel(#18848)

this seems to make the travis build flaky

PR Close #18848
---
 integration/bazel/WORKSPACE                         | 10 ----------
 integration/bazel/src/hello-world/BUILD.bazel       | 13 ++-----------
 .../src/hello-world/hello-world.component.scss      | 12 ------------
 .../bazel/src/hello-world/hello-world.component.ts  |  3 ++-
 integration/bazel/src/shared/BUILD.bazel            | 13 -------------
 integration/bazel/src/shared/_colors.scss           |  2 --
 integration/bazel/src/shared/_fonts.scss            |  2 --
 packages/bazel/package.json                         |  3 ++-
 8 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 integration/bazel/src/hello-world/hello-world.component.scss
 delete mode 100644 integration/bazel/src/shared/BUILD.bazel
 delete mode 100644 integration/bazel/src/shared/_colors.scss
 delete mode 100644 integration/bazel/src/shared/_fonts.scss

diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 4fe6e6e167..a5fa8576c3 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -18,13 +18,3 @@ local_repository(
     name = "angular",
     path = "node_modules/@angular/bazel",
 )
-
-git_repository(
-    name = "io_bazel_rules_sass",
-    remote = "https://github.com/bazelbuild/rules_sass.git",
-    tag = "0.0.2",
-)
-
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
-
-sass_repositories()
\ No newline at end of file
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index e0cb4a41ab..51e2ff6fc6 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -1,19 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 load("@angular//:index.bzl", "ng_module")
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
-
-sass_binary(
-    name = "styles",
-    src = "hello-world.component.scss",
-    deps = [
-         "//src/shared:colors",
-         "//src/shared:fonts",
-    ],
-)
 
 ng_module(
     name = "hello-world",
     srcs = glob(["*.ts"]),
     tsconfig = "//src:tsconfig.json",
-    assets = [":styles"],
+    # TODO(alexeagle): re-enable
+    # assets = [":styles"],
 )
diff --git a/integration/bazel/src/hello-world/hello-world.component.scss b/integration/bazel/src/hello-world/hello-world.component.scss
deleted file mode 100644
index 2db21ad42e..0000000000
--- a/integration/bazel/src/hello-world/hello-world.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import "src/shared/fonts";
-@import "src/shared/colors";
-
-html {
-  body {
-    font-family: $default-font-stack;
-    h1 {
-      font-family: $modern-font-stack;
-      color: $example-red;
-    }
-  }
-}
diff --git a/integration/bazel/src/hello-world/hello-world.component.ts b/integration/bazel/src/hello-world/hello-world.component.ts
index 75eb306a32..753d4ab22f 100644
--- a/integration/bazel/src/hello-world/hello-world.component.ts
+++ b/integration/bazel/src/hello-world/hello-world.component.ts
@@ -8,7 +8,8 @@ import {Component, NgModule} from '@angular/core';
     <input type="text" [value]="name" (input)="name = $event.target.value"/>
   `,
   // TODO: might be better to point to .scss so this looks valid at design-time
-  styleUrls: ['./styles.css']
+  // TODO(alexeagle): re-enable SASS
+  // styleUrls: ['./styles.css']
 })
 export class HelloWorldComponent {
   name: string = 'world';
diff --git a/integration/bazel/src/shared/BUILD.bazel b/integration/bazel/src/shared/BUILD.bazel
deleted file mode 100644
index 488025b1ab..0000000000
--- a/integration/bazel/src/shared/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library")
-
-sass_library(
-    name = "colors",
-    srcs = ["_colors.scss"],
-)
-
-sass_library(
-    name = "fonts",
-    srcs = ["_fonts.scss"],
-)
diff --git a/integration/bazel/src/shared/_colors.scss b/integration/bazel/src/shared/_colors.scss
deleted file mode 100644
index 7584a9b844..0000000000
--- a/integration/bazel/src/shared/_colors.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-$example-blue: #0000ff;
-$example-red: #ff0000;
diff --git a/integration/bazel/src/shared/_fonts.scss b/integration/bazel/src/shared/_fonts.scss
deleted file mode 100644
index d17c15dc1d..0000000000
--- a/integration/bazel/src/shared/_fonts.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-$default-font-stack: Cambria, "Hoefler Text", Utopia, "Liberation Serif", "Nimbus Roman No9 L Regular", Times, "Times New Roman", serif;
-$modern-font-stack: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index a055202d87..519b9ba4b1 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -6,10 +6,11 @@
   "license": "MIT",
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
+    "@bazel/typescript": "~0.0.7",
     "typescript": "~2.3"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.git"
   }
-}
+}
\ No newline at end of file