honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: disable sass under bazel(#18848) 

this seems to make the travis build flaky

PR Close #18848
This commit is contained in:
Alex Eagle 2017-08-23 11:42:35 -07:00 committed by Miško Hevery
parent 1b9b34ed46
commit f0c681a6de
8 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
integration/bazel/WORKSPACE
View File

@ -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()

13
integration/bazel/src/hello-world/BUILD.bazel
View File

@ -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"],
)

12
integration/bazel/src/hello-world/hello-world.component.scss
View File

@ -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;
}
}
}

3
integration/bazel/src/hello-world/hello-world.component.ts
View File

@ -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';

13
integration/bazel/src/shared/BUILD.bazel
View File

@ -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"],
)

2
integration/bazel/src/shared/_colors.scss
View File

@ -1,2 +0,0 @@
$example-blue: #0000ff;
$example-red: #ff0000;

2
integration/bazel/src/shared/_fonts.scss
View File

@ -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;

3
packages/bazel/package.json
View File

@ -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"
}
}
}