Skip to content

cleanup: rename lib/ to material/ #15889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2019
Merged

cleanup: rename lib/ to material/ #15889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
182 changes: 91 additions & 91 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
# Angular Material components
/src/lib/* @jelbourn
/src/lib/autocomplete/** @crisbeto
/src/lib/badge/** @jelbourn
/src/lib/bottom-sheet/** @jelbourn @crisbeto
/src/lib/button-toggle/** @jelbourn
/src/lib/button/** @jelbourn @josephperrott
/src/lib/card/** @jelbourn
/src/lib/checkbox/** @jelbourn @devversion @josephperrott
/src/lib/chips/** @jelbourn
/src/lib/datepicker/** @mmalerba
/src/lib/dialog/** @jelbourn @crisbeto
/src/lib/divider/** @jelbourn @crisbeto
/src/lib/expansion/** @josephperrott @jelbourn
/src/lib/form-field/** @mmalerba
/src/lib/grid-list/** @jelbourn
/src/lib/icon/** @jelbourn
/src/lib/input/** @mmalerba
/src/lib/list/** @jelbourn @crisbeto @devversion
/src/lib/menu/** @crisbeto
/src/lib/paginator/** @andrewseguin
/src/lib/prebuilt-themes/** @jelbourn
/src/lib/progress-bar/** @jelbourn @crisbeto @josephperrott
/src/lib/progress-spinner/** @jelbourn @crisbeto @josephperrott
/src/lib/radio/** @jelbourn @devversion
/src/lib/schematics/** @devversion @jelbourn
/src/lib/select/** @crisbeto
/src/lib/sidenav/** @mmalerba
/src/lib/slide-toggle/** @devversion
/src/lib/slider/** @mmalerba
/src/lib/snack-bar/** @jelbourn @crisbeto @josephperrott
/src/lib/sort/** @andrewseguin
/src/lib/stepper/** @mmalerba
/src/lib/table/** @andrewseguin
/src/lib/tabs/** @andrewseguin
/src/lib/testing/** @jelbourn
/src/lib/toolbar/** @devversion
/src/lib/tooltip/** @andrewseguin
/src/lib/tree/** @jelbourn @andrewseguin
/src/material/* @jelbourn
/src/material/autocomplete/** @crisbeto
/src/material/badge/** @jelbourn
/src/material/bottom-sheet/** @jelbourn @crisbeto
/src/material/button-toggle/** @jelbourn
/src/material/button/** @jelbourn @josephperrott
/src/material/card/** @jelbourn
/src/material/checkbox/** @jelbourn @devversion @josephperrott
/src/material/chips/** @jelbourn
/src/material/datepicker/** @mmalerba
/src/material/dialog/** @jelbourn @crisbeto
/src/material/divider/** @jelbourn @crisbeto
/src/material/expansion/** @josephperrott @jelbourn
/src/material/form-field/** @mmalerba
/src/material/grid-list/** @jelbourn
/src/material/icon/** @jelbourn
/src/material/input/** @mmalerba
/src/material/list/** @jelbourn @crisbeto @devversion
/src/material/menu/** @crisbeto
/src/material/paginator/** @andrewseguin
/src/material/prebuilt-themes/** @jelbourn
/src/material/progress-bar/** @jelbourn @crisbeto @josephperrott
/src/material/progress-spinner/** @jelbourn @crisbeto @josephperrott
/src/material/radio/** @jelbourn @devversion
/src/material/schematics/** @devversion @jelbourn
/src/material/select/** @crisbeto
/src/material/sidenav/** @mmalerba
/src/material/slide-toggle/** @devversion
/src/material/slider/** @mmalerba
/src/material/snack-bar/** @jelbourn @crisbeto @josephperrott
/src/material/sort/** @andrewseguin
/src/material/stepper/** @mmalerba
/src/material/table/** @andrewseguin
/src/material/tabs/** @andrewseguin
/src/material/testing/** @jelbourn
/src/material/toolbar/** @devversion
/src/material/tooltip/** @andrewseguin
/src/material/tree/** @jelbourn @andrewseguin

# Angular Material core
/src/lib/core/* @jelbourn
/src/lib/core/animation/** @jelbourn
/src/lib/core/common-behaviors/** @jelbourn @devversion
/src/lib/core/datetime/** @mmalerba
/src/lib/core/error/** @crisbeto @mmalerba
/src/lib/core/gestures/** @jelbourn
/src/lib/core/label/** @mmalerba
/src/lib/core/line/** @jelbourn
/src/lib/core/option/** @crisbeto
/src/lib/core/placeholder/** @mmalerba
/src/lib/core/ripple/** @devversion
/src/lib/core/selection/** @jelbourn
/src/lib/core/selection/pseudo*/** @crisbeto @jelbourn
/src/lib/core/style/** @jelbourn
/src/lib/core/theming/** @jelbourn
/src/lib/core/typography/** @crisbeto
/src/lib/core/util/** @jelbourn
/src/material/core/* @jelbourn
/src/material/core/animation/** @jelbourn
/src/material/core/common-behaviors/** @jelbourn @devversion
/src/material/core/datetime/** @mmalerba
/src/material/core/error/** @crisbeto @mmalerba
/src/material/core/gestures/** @jelbourn
/src/material/core/label/** @mmalerba
/src/material/core/line/** @jelbourn
/src/material/core/option/** @crisbeto
/src/material/core/placeholder/** @mmalerba
/src/material/core/ripple/** @devversion
/src/material/core/selection/** @jelbourn
/src/material/core/selection/pseudo*/** @crisbeto @jelbourn
/src/material/core/style/** @jelbourn
/src/material/core/theming/** @jelbourn
/src/material/core/typography/** @crisbeto
/src/material/core/util/** @jelbourn

# CDK
/src/cdk/* @jelbourn
Expand Down Expand Up @@ -252,42 +252,42 @@
/tools/public_api_guard/cdk/table.d.ts @andrewseguin
/tools/public_api_guard/cdk/text-field.d.ts @mmalerba
/tools/public_api_guard/cdk/tree.d.ts @jelbourn @andrewseguin
/tools/public_api_guard/lib/autocomplete.d.ts @crisbeto
/tools/public_api_guard/lib/badge.d.ts @jelbourn
/tools/public_api_guard/lib/bottom-sheet.d.ts @jelbourn @crisbeto
/tools/public_api_guard/lib/button-toggle.d.ts @jelbourn
/tools/public_api_guard/lib/button.d.ts @jelbourn @josephperrott
/tools/public_api_guard/lib/card.d.ts @jelbourn
/tools/public_api_guard/lib/checkbox.d.ts @jelbourn @devversion @josephperrott
/tools/public_api_guard/lib/chips.d.ts @jelbourn
/tools/public_api_guard/lib/core.d.ts @jelbourn
/tools/public_api_guard/lib/datepicker.d.ts @mmalerba
/tools/public_api_guard/lib/dialog.d.ts @jelbourn @crisbeto
/tools/public_api_guard/lib/divider.d.ts @jelbourn @crisbeto
/tools/public_api_guard/lib/expansion.d.ts @josephperrott @jelbourn
/tools/public_api_guard/lib/form-field.d.ts @mmalerba
/tools/public_api_guard/lib/grid-list.d.ts @jelbourn
/tools/public_api_guard/lib/icon.d.ts @jelbourn
/tools/public_api_guard/lib/input.d.ts @mmalerba
/tools/public_api_guard/lib/list.d.ts @jelbourn @crisbeto @devversion
/tools/public_api_guard/lib/menu.d.ts @crisbeto
/tools/public_api_guard/lib/paginator.d.ts @andrewseguin
/tools/public_api_guard/lib/progress-bar.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/lib/progress-spinner.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/lib/radio.d.ts @jelbourn @devversion
/tools/public_api_guard/lib/select.d.ts @crisbeto
/tools/public_api_guard/lib/sidenav.d.ts @mmalerba
/tools/public_api_guard/lib/slide-toggle.d.ts @devversion
/tools/public_api_guard/lib/slider.d.ts @mmalerba
/tools/public_api_guard/lib/snack-bar.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/lib/sort.d.ts @andrewseguin
/tools/public_api_guard/lib/stepper.d.ts @mmalerba
/tools/public_api_guard/lib/table.d.ts @andrewseguin
/tools/public_api_guard/lib/tabs.d.ts @andrewseguin
/tools/public_api_guard/lib/toolbar.d.ts @devversion
/tools/public_api_guard/lib/tooltip.d.ts @andrewseguin
/tools/public_api_guard/lib/tree.d.ts @jelbourn @andrewseguin
/tools/public_api_guard/lib/lib.d.ts @jelbourn
/tools/public_api_guard/material/autocomplete.d.ts @crisbeto
/tools/public_api_guard/material/badge.d.ts @jelbourn
/tools/public_api_guard/material/bottom-sheet.d.ts @jelbourn @crisbeto
/tools/public_api_guard/material/button-toggle.d.ts @jelbourn
/tools/public_api_guard/material/button.d.ts @jelbourn @josephperrott
/tools/public_api_guard/material/card.d.ts @jelbourn
/tools/public_api_guard/material/checkbox.d.ts @jelbourn @devversion @josephperrott
/tools/public_api_guard/material/chips.d.ts @jelbourn
/tools/public_api_guard/material/core.d.ts @jelbourn
/tools/public_api_guard/material/datepicker.d.ts @mmalerba
/tools/public_api_guard/material/dialog.d.ts @jelbourn @crisbeto
/tools/public_api_guard/material/divider.d.ts @jelbourn @crisbeto
/tools/public_api_guard/material/expansion.d.ts @josephperrott @jelbourn
/tools/public_api_guard/material/form-field.d.ts @mmalerba
/tools/public_api_guard/material/grid-list.d.ts @jelbourn
/tools/public_api_guard/material/icon.d.ts @jelbourn
/tools/public_api_guard/material/input.d.ts @mmalerba
/tools/public_api_guard/material/list.d.ts @jelbourn @crisbeto @devversion
/tools/public_api_guard/material/menu.d.ts @crisbeto
/tools/public_api_guard/material/paginator.d.ts @andrewseguin
/tools/public_api_guard/material/progress-bar.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/material/progress-spinner.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/material/radio.d.ts @jelbourn @devversion
/tools/public_api_guard/material/select.d.ts @crisbeto
/tools/public_api_guard/material/sidenav.d.ts @mmalerba
/tools/public_api_guard/material/slide-toggle.d.ts @devversion
/tools/public_api_guard/material/slider.d.ts @mmalerba
/tools/public_api_guard/material/snack-bar.d.ts @jelbourn @crisbeto @josephperrott
/tools/public_api_guard/material/sort.d.ts @andrewseguin
/tools/public_api_guard/material/stepper.d.ts @mmalerba
/tools/public_api_guard/material/table.d.ts @andrewseguin
/tools/public_api_guard/material/tabs.d.ts @andrewseguin
/tools/public_api_guard/material/toolbar.d.ts @devversion
/tools/public_api_guard/material/tooltip.d.ts @andrewseguin
/tools/public_api_guard/material/tree.d.ts @jelbourn @andrewseguin
/tools/public_api_guard/material/material.d.ts @jelbourn

# Misc
/* @jelbourn
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2774,7 +2774,7 @@ We expect to have the tool ready when we release version 6.0.0.
* **menu:** not closing when overlay is detached externally ([#8868](https://github.com/angular/material2/issues/8868)) ([534c797](https://github.com/angular/material2/commit/534c797))
* **overlay:** export OverlaySizeConfig ([#8932](https://github.com/angular/material2/issues/8932)) ([adfa31e](https://github.com/angular/material2/commit/adfa31e))
* **paginator:** set default display value ([#8455](https://github.com/angular/material2/issues/8455)) ([ccb325e](https://github.com/angular/material2/commit/ccb325e)), closes [#8454](https://github.com/angular/material2/issues/8454)
* **portal:** inaccurate hasAttahed result and portal being cleared if attached too early ([#8642](https://github.com/angular/material2/issues/8642)) ([93e6c53](https://github.com/angular/material2/commit/93e6c53)), closes [/github.com/angular/material2/blob/master/src/lib/dialog/dialog-container.ts#L118](https://github.com//github.com/angular/material2/blob/master/src/lib/dialog/dialog-container.ts/issues/L118) [#8628](https://github.com/angular/material2/issues/8628)
* **portal:** inaccurate hasAttahed result and portal being cleared if attached too early ([#8642](https://github.com/angular/material2/issues/8642)) ([93e6c53](https://github.com/angular/material2/commit/93e6c53)), closes [/github.com/angular/material2/blob/master/src/material/dialog/dialog-container.ts#L118](https://github.com//github.com/angular/material2/blob/master/src/material/dialog/dialog-container.ts/issues/L118) [#8628](https://github.com/angular/material2/issues/8628)
* **select:** alt + arrow key not opening in single-selection mode ([#8910](https://github.com/angular/material2/issues/8910)) ([85f83f9](https://github.com/angular/material2/commit/85f83f9))
* **select:** change event emitted before data binding is updated ([#8740](https://github.com/angular/material2/issues/8740)) ([2493797](https://github.com/angular/material2/commit/2493797)), closes [#8739](https://github.com/angular/material2/issues/8739)
* **select:** complete state change event ([#8777](https://github.com/angular/material2/issues/8777)) ([46411e3](https://github.com/angular/material2/commit/46411e3))
Expand Down Expand Up @@ -3159,7 +3159,7 @@ information](https://github.com/angular/material2/blob/master/CHANGELOG.md#break
available from @angular/material and instead must be imported from @angular/cdk/collections
* `isFocusTrapEnabled` is now properly marked internal.
* The `OverlayRef.getState` method has been renamed to `OverlayRef.getConfig`.
* `defaultErrorStateMatcher` has been replaced by `ErrorStateMatcher`. For more info, see the [input docs](https://github.com/angular/material2/blob/master/src/lib/input/input.md#custom-error-matcher).
* `defaultErrorStateMatcher` has been replaced by `ErrorStateMatcher`. For more info, see the [input docs](https://github.com/angular/material2/blob/master/src/material/input/input.md#custom-error-matcher).

### Features

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ label for a list of issues where we could use help from the community.
[16]: https://material.angular.io/components/slider/overview
[17]: https://material.angular.io/components/menu/overview
[18]: https://material.angular.io/components/tooltip/overview
[19]: https://github.com/angular/material2/blob/master/src/lib/core/ripple/ripple.md
[19]: https://github.com/angular/material2/blob/master/src/material/core/ripple/ripple.md
[20]: https://material.angular.io/guide/theming
[21]: https://material.angular.io/components/snack-bar/overview
[22]: https://material.angular.io/components/dialog/overview
Expand Down
2 changes: 1 addition & 1 deletion guides/theming.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export class UnicornCandyAppModule {
```

#### Theming only certain components
The `angular-material-theme` mixin will output styles for [all components in the library](https://github.com/angular/material2/blob/master/src/lib/core/theming/_all-theme.scss).
The `angular-material-theme` mixin will output styles for [all components in the library](https://github.com/angular/material2/blob/master/src/material/core/theming/_all-theme.scss).
If you are only using a subset of the components (or if you want to change the theme for specific
components), you can include component-specific theme mixins. You also will need to include
the `mat-core-theme` mixin as well, which contains theme-specific styles for common behaviors
Expand Down
2 changes: 1 addition & 1 deletion guides/typography.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ If you're using Material's theming, you can also pass in your typography config
```

For more details about the typography functions and default config, see the
[source](https://github.com/angular/material2/blob/master/src/lib/core/typography/_typography.scss).
[source](https://github.com/angular/material2/blob/master/src/material/core/typography/_typography.scss).


### Material typography in your custom CSS
Expand Down
4 changes: 2 additions & 2 deletions packages.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ MATERIAL_PACKAGES = [
"tree",
]

MATERIAL_TARGETS = ["//src/lib:material"] + ["//src/lib/%s" % p for p in MATERIAL_PACKAGES]
MATERIAL_TARGETS = ["//src/material:material"] + ["//src/material/%s" % p for p in MATERIAL_PACKAGES]

# List that references the sass libraries for each Material package. This can be used to create
# the theming scss-bundle or to specify dependencies for the all-theme.scss file.
MATERIAL_SCSS_LIBS = [
"//src/lib/%s:%s_scss_lib" % (p, p.replace('-', '_')) for p in MATERIAL_PACKAGES
"//src/material/%s:%s_scss_lib" % (p, p.replace('-', '_')) for p in MATERIAL_PACKAGES
]

# Each individual package uses a placeholder for the version of Angular to ensure they're
Expand Down
8 changes: 2 additions & 6 deletions scripts/bazel/build-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ mkdir -p ${packages_dist}
for p in ${packages[@]}
do
bazel build src/${p}:npm_package

# The output for "lib" should go into a directory named "material"
[[ ${p} = "lib" ]] && out_dir="material" || out_dir="${p}"

# Copy without preserving the read-only mode from bazel so that we can make final modifications
# to the generated package.
mkdir -p ${packages_dist}/${out_dir}
cp -r --no-preserve=mode ${bazel_bin}/src/${p}/npm_package/* ${packages_dist}/${out_dir}
mkdir -p ${packages_dist}/${p}
cp -r --no-preserve=mode ${bazel_bin}/src/${p}/npm_package/* ${packages_dist}/${p}
done

# Update the root @angular/material metadata file to re-export metadata from each entry-point.
Expand Down
2 changes: 1 addition & 1 deletion src/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load("//tools/dgeni:index.bzl", "dgeni_api_docs")

# List that contains all source files that need to be processed by Dgeni.
apiSourceFiles = ["//src/cdk/%s:source-files" % name for name in CDK_PACKAGES] + [
"//src/lib/%s:source-files" % name for name in MATERIAL_PACKAGES]
"//src/material/%s:source-files" % name for name in MATERIAL_PACKAGES]

exports_files([
"bazel-tsconfig-build.json",
Expand Down
Loading