Skip to content

Commit 3c59582

Browse files
devversionandrewseguin
authored andcommitted
refactor: switch "dev-app" away from cross-package relative Sass imports
1 parent f6310fb commit 3c59582

File tree

11 files changed

+21
-30
lines changed

11 files changed

+21
-30
lines changed

src/cdk/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ prebuiltStyleTargets = ["%s_prebuilt" % file for [
4040
_,
4141
] in prebuiltStyles]
4242

43-
# Makes the public Sass API bundle available in the release output as `angular/cdk`.
4443
sass_library(
45-
name = "sass_index",
44+
name = "sass_lib",
4645
srcs = ["_index.scss"],
46+
deps = CDK_SCSS_LIBS,
4747
)
4848

4949
# Creates the @angular/cdk package published to npm.
5050
ng_package(
5151
name = "npm_package",
5252
srcs = ["package.json"],
53-
data = [":sass_index"] + prebuiltStyleTargets + CDK_SCSS_LIBS,
53+
data = [":sass_lib"] + prebuiltStyleTargets + CDK_SCSS_LIBS,
5454
nested_packages = [
5555
"//src/cdk/schematics:npm_package",
5656
],

src/dev-app/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ sass_binary(
131131
"external/npm/node_modules",
132132
],
133133
deps = [
134-
"//src/material:theming_bundle",
135-
"//src/material-experimental:theming_bundle",
134+
"//src/material:sass_lib",
135+
"//src/material-experimental:sass_lib",
136136
"//src/material/core:theming_scss_lib",
137137
],
138138
)

src/dev-app/datepicker/BUILD.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ ng_module(
2727
sass_binary(
2828
name = "datepicker_demo_scss",
2929
src = "datepicker-demo.scss",
30-
deps = [
31-
"//src/material/datepicker:datepicker_scss_lib",
32-
],
30+
deps = ["//src/material:sass_lib"],
3331
)
3432

3533
sass_binary(

src/dev-app/datepicker/datepicker-demo.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../material/datepicker/datepicker-theme';
1+
@use '@angular/material' as mat;
22

33
mat-calendar {
44
width: 300px;
@@ -9,5 +9,6 @@ mat-calendar {
99
}
1010

1111
.demo-custom-range {
12-
@include datepicker-theme.date-range-colors(hotpink, teal, yellow, purple);
12+
@include mat.datepicker-date-range-colors(
13+
hotpink, teal, yellow, purple);
1314
}

src/dev-app/input/BUILD.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ ng_module(
2828
sass_binary(
2929
name = "input_demo_scss",
3030
src = "input-demo.scss",
31-
deps = [
32-
"//src/cdk/text-field:text_field_scss_lib",
33-
],
31+
deps = ["//src/cdk:sass_lib"],
3432
)

src/dev-app/input/input-demo.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../cdk/text-field';
1+
@use '@angular/cdk';
22

33
.demo-basic {
44
padding: 0;
@@ -33,7 +33,7 @@
3333
}
3434

3535
.demo-custom-autofill-style {
36-
@include text-field.text-field-autofill-color(transparent, red);
36+
@include cdk.text-field-autofill-color(transparent, red);
3737
}
3838

3939
.demo-rows {

src/dev-app/mdc-dialog/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ sass_binary(
2525
name = "mdc_dialog_demo_scss",
2626
src = "mdc-dialog-demo.scss",
2727
include_paths = ["external/npm/node_modules"],
28-
deps = ["//src/material-experimental/mdc-dialog:mdc_dialog_scss_lib"],
28+
deps = ["//src/material-experimental:sass_lib"],
2929
)

src/dev-app/mdc-dialog/mdc-dialog-demo.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../material-experimental/mdc-dialog/dialog-legacy-padding';
1+
@use '@angular/material-experimental' as experimental;
22

33
.demo-dialog-card {
44
max-width: 600px;
@@ -24,5 +24,5 @@
2424
}
2525

2626
.demo-dialog-legacy-padding {
27-
@include dialog-legacy-padding.legacy-padding();
27+
@include experimental.mdc-dialog-legacy-padding();
2828
}

src/dev-app/mdc-input/BUILD.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,5 @@ ng_module(
2929
sass_binary(
3030
name = "mdc_input_demo_scss",
3131
src = "mdc-input-demo.scss",
32-
deps = [
33-
"//src/cdk/text-field:text_field_scss_lib",
34-
],
32+
deps = ["//src/cdk:sass_lib"],
3533
)

src/dev-app/mdc-input/mdc-input-demo.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../cdk/text-field';
1+
@use '@angular/cdk';
22

33
.demo-basic {
44
padding: 0;
@@ -41,7 +41,7 @@
4141
}
4242

4343
.demo-custom-autofill-style {
44-
@include text-field.text-field-autofill-color(transparent, red);
44+
@include cdk.text-field-autofill-color(transparent, red);
4545
}
4646

4747
.demo-rows {

src/dev-app/theme.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@use '../material' as mat;
2-
@use '../material-experimental' as experimental;
3-
@use '../material-experimental/mdc-slider/slider-theme' as mdc-slider-theme;
4-
@use '../material/core/density/private/all-density' as private-all-density;
1+
@use '@angular/material' as mat;
2+
@use '@angular/material-experimental' as experimental;
53

64
// Plus imports for other components in your app.
75

@@ -59,8 +57,6 @@ $candy-app-theme: mat.define-light-theme((
5957
@include experimental.all-mdc-component-colors($dark-colors);
6058
@include experimental.column-resize-color($dark-colors);
6159
@include experimental.popover-edit-color($dark-colors);
62-
// We add this in manually for now, because it isn't included in `all-mdc-component-themes`.
63-
@include mdc-slider-theme.color($dark-colors);
6460

6561
// Include the dark theme colors for focus indicators.
6662
&.demo-strong-focus {
@@ -75,7 +71,7 @@ $candy-app-theme: mat.define-light-theme((
7571
$density-scales: (-1, -2, minimum, maximum);
7672
@each $density in $density-scales {
7773
.demo-density-#{$density} {
78-
@include private-all-density.all-component-densities($density);
74+
@include mat.private-all-component-densities($density);
7975
@include experimental.all-mdc-component-densities($density);
8076
}
8177
}

0 commit comments

Comments
 (0)