Skip to content

Commit

Permalink
chore: update "material2" to "components" (angular#15905)
Browse files Browse the repository at this point in the history
This should capture things that reference the GitHub repository.
There are many other places we use "material2" that we can clean up in
subsequent changes.
  • Loading branch information
jelbourn authored and mmalerba committed Apr 25, 2019
1 parent 87b2cf6 commit fde980c
Show file tree
Hide file tree
Showing 54 changed files with 126 additions and 126 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration file for https://circleci.com/gh/angular/material2
# Configuration file for https://circleci.com/gh/angular/components

# Note: YAML anchors allow an object to be re-used, reducing duplication.
# The ampersand declares an alias for an object, then later the `<<: *name`
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ chances of your issue being dealt with quickly:
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
causing the problem (line of code or commit)

You can file new issues by providing the above information [here](https://github.com/angular/material2/issues/new).
You can file new issues by providing the above information [here](https://github.com/angular/components/issues/new).


### <a name="submit-pr"></a> Submitting a Pull Request (PR)
Before you submit your Pull Request (PR) consider the following guidelines:

* Search [GitHub](https://github.com/angular/material2/pulls) for an open or closed PR
* Search [GitHub](https://github.com/angular/components/pulls) for an open or closed PR
that relates to your submission. You don't want to duplicate effort.
* Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
We cannot accept code without this.
Expand Down Expand Up @@ -106,7 +106,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
git push my-fork my-fix-branch
```

* In GitHub, send a pull request to `material2:master`.
* In GitHub, send a pull request to `components:master`.
* If we suggest changes then:
* Make the required updates.
* Re-run the Angular Material test suites to ensure tests are still passing.
Expand Down Expand Up @@ -239,9 +239,9 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
[coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/preview
[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
[dev-doc]: https://github.com/angular/material2/blob/master/DEV_ENVIRONMENT.md
[github]: https://github.com/angular/material2
[gitter]: https://gitter.im/angular/material2
[dev-doc]: https://github.com/angular/components/blob/master/DEV_ENVIRONMENT.md
[github]: https://github.com/angular/components
[gitter]: https://gitter.im/angular/components
[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
[codepen]: http://codepen.io/
Expand Down
6 changes: 3 additions & 3 deletions DEV_ENVIRONMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
1. Make sure you have `node` installed with a version at _least_ 10.0.0 and `yarn` with a version
of at least 1.10.0. We recommend using `nvm` to manage your node versions.
2. Run `yarn global add gulp` to install gulp.
3. Fork the `angular/material2` repo on GitHub.
3. Fork the `angular/components` repo on GitHub.
4. Clone your fork to your machine with `git clone`.
Recommendation: name your git remotes `upstream` for `angular/material2`
and `<your-username>` for your fork. Also see the [team git shortcuts](https://github.com/angular/material2/wiki/Team-git----bash-shortcuts).
Recommendation: name your git remotes `upstream` for `angular/components`
and `<your-username>` for your fork. Also see the [team git shortcuts](https://github.com/angular/components/wiki/Team-git----bash-shortcuts).
5. From the root of the project, run `yarn`.


Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# Components and Material Design for Angular
[![npm version](https://badge.fury.io/js/%40angular%2Fmaterial.svg)](https://www.npmjs.com/package/%40angular%2Fmaterial)
[![Build status](https://circleci.com/gh/angular/material2.svg?style=svg)](https://circleci.com/gh/angular/material2)
[![Gitter](https://badges.gitter.im/angular/material2.svg)](https://gitter.im/angular/material2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Build status](https://circleci.com/gh/angular/components.svg?style=svg)](https://circleci.com/gh/angular/components)
[![Gitter](https://badges.gitter.im/angular/components.svg)](https://gitter.im/angular/material2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

This is the home for the Angular team's UI components built for and with Angular.
These include Material Design components and the Angular Component Development Kit (CDK).

#### Quick links
[Documentation, demos, and guides][aio] |
[Google group](https://groups.google.com/forum/#!forum/angular-material2) |
[Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
[Contributing](https://github.com/angular/components/blob/master/CONTRIBUTING.md) |
[StackBlitz Template](https://goo.gl/wwnhMV)

### Getting started

See our [Getting Started Guide][getting-started]
if you're building your first project with Angular Material.

Check out our [directory of design documents](https://github.com/angular/material2/wiki/Design-doc-directory)
Check out our [directory of design documents](https://github.com/angular/components/wiki/Design-doc-directory)
for more insight into our process.

If you'd like to contribute, you must follow our [contributing guidelines](https://github.com/angular/material2/blob/master/CONTRIBUTING.md).
If you'd like to contribute, you must follow our [contributing guidelines](https://github.com/angular/components/blob/master/CONTRIBUTING.md).
You can look through the GitHub issues (which should be up-to-date on who is working on which features
and which pieces are blocked) and make a comment.

Please see our [`help wanted`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
Please see our [`help wanted`](https://github.com/angular/components/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
label for a list of issues where we could use help from the community.

#### High level stuff planned for Q1 → Q2 2019 (January - June):
* Most of the Angular Material team is on loan to the framework team
* Most of the Angular Components team is on loan to the framework team
helping with [Ivy](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7).
We've been using the Angular CDK and Angular Material tests to validate code paths as well
as helping debug issues in switching Google applications to the new rendering pipeline.
Expand Down 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/material/core/ripple/ripple.md
[19]: https://github.com/angular/components/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
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/material/core/theming/_all-theme.scss).
The `angular-material-theme` mixin will output styles for [all components in the library](https://github.com/angular/components/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
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/material/core/typography/_typography.scss).
[source](https://github.com/angular/components/blob/master/src/material/core/typography/_typography.scss).


### Material typography in your custom CSS
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "material2-srcs",
"name": "components-srcs",
"description": "Material Design components for Angular",
"homepage": "https://github.com/angular/material2",
"bugs": "https://github.com/angular/material2/issues",
"homepage": "https://github.com/angular/components",
"bugs": "https://github.com/angular/components/issues",
"repository": {
"type": "git",
"url": "https://github.com/angular/material2.git"
"url": "https://github.com/angular/components.git"
},
"license": "MIT",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/caretaking/write-presubmit-scheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const github = new GitHubApi();

/** CONFIGURATION: change these things if you want to tweak how the runs are made. */

/** Path to the local material2. By default based on the location of this script. */
/** Path to the local components repo. By default based on the location of this script. */
const localRepo = path.resolve(__dirname, '..', '..');

/** Where to write the output from the presubmit script. */
Expand All @@ -32,7 +32,7 @@ const githubSearchOptions = {
// Use the maximum of allowed items per Github API query. 100 pull requests should be
// enough to continuously run presubmits through night.
per_page: 100,
q: 'repo:angular/material2 is:open type:pr label:"pr: merge ready" -label:"pr: merge safe"',
q: 'repo:angular/components is:open type:pr label:"pr: merge ready" -label:"pr: merge safe"',
};

/** END OF CONFIGURATION. */
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy/publish-docs-content.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ docsContentPath="${projectPath}/tmp/material2-docs-content"
examplesPackagePath="$(bazel info bazel-bin)/src/material-examples/npm_package"

# Git clone URL for the material2-docs-content repository.
docsContentRepoUrl="https://github.com/angular/material2-docs-content"
docsContentRepoUrl="https://github.com/angular/components-docs-content"

# Current version of Angular Material from the package.json file
buildVersion=$(node -pe "require('./package.json').version")
Expand Down
4 changes: 2 additions & 2 deletions src/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Angular Material
=======

The sources for this package are in the main [Angular Material](https://github.com/angular/material2) repo. Please file issues and pull requests against that repo.
The sources for this package are in the main [Angular Material](https://github.com/angular/components) repo. Please file issues and pull requests against that repo.

License: MIT
License: MIT
6 changes: 3 additions & 3 deletions src/cdk-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"typings": "./cdk-experimental.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/angular/material2.git"
"url": "https://github.com/angular/components.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/material2/issues"
"url": "https://github.com/angular/components/issues"
},
"homepage": "https://github.com/angular/material2#readme",
"homepage": "https://github.com/angular/components#readme",
"peerDependencies": {
"@angular/cdk": "0.0.0-PLACEHOLDER",
"@angular/core": "0.0.0-NG"
Expand Down
6 changes: 3 additions & 3 deletions src/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"typings": "./cdk.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/angular/material2.git"
"url": "https://github.com/angular/components.git"
},
"keywords": [
"angular",
Expand All @@ -19,9 +19,9 @@
],
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/material2/issues"
"url": "https://github.com/angular/components/issues"
},
"homepage": "https://github.com/angular/material2#readme",
"homepage": "https://github.com/angular/components#readme",
"peerDependencies": {
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG"
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/platform/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let hasV8BreakIterator: boolean;
// cause IE to throw. These cases are tied to particular versions of Windows and can happen if
// the consumer is providing a polyfilled `Map`. See:
// https://github.com/Microsoft/ChakraCore/issues/3189
// https://github.com/angular/material2/issues/15687
// https://github.com/angular/components/issues/15687
try {
hasV8BreakIterator = (typeof Intl !== 'undefined' && (Intl as any).v8BreakIterator);
} catch {
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/ng-update/data/attribute-selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface AttributeSelectorUpgradeData {
export const attributeSelectors: VersionChanges<AttributeSelectorUpgradeData> = {
[TargetVersion.V6]: [
{
pr: 'https://github.com/angular/material2/pull/10257',
pr: 'https://github.com/angular/components/pull/10257',
changes: [
{
replace: 'cdkPortalHost',
Expand Down
6 changes: 3 additions & 3 deletions src/cdk/schematics/ng-update/data/class-names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface ClassNameUpgradeData {
export const classNames: VersionChanges<ClassNameUpgradeData> = {
[TargetVersion.V6]: [
{
pr: 'https://github.com/angular/material2/pull/10161',
pr: 'https://github.com/angular/components/pull/10161',
changes: [
{
replace: 'ConnectedOverlayDirective',
Expand All @@ -33,7 +33,7 @@ export const classNames: VersionChanges<ClassNameUpgradeData> = {
},

{
pr: 'https://github.com/angular/material2/pull/10267',
pr: 'https://github.com/angular/components/pull/10267',
changes: [
{
replace: 'ObserveContent',
Expand All @@ -43,7 +43,7 @@ export const classNames: VersionChanges<ClassNameUpgradeData> = {
},

{
pr: 'https://github.com/angular/material2/pull/10325',
pr: 'https://github.com/angular/components/pull/10325',
changes: [
{
replace: 'FocusTrapDirective',
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/ng-update/data/constructor-checks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type ConstructorChecksUpgradeData = string;
export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
[TargetVersion.V8]: [
{
pr: 'https://github.com/angular/material2/pull/15647',
pr: 'https://github.com/angular/components/pull/15647',
changes: [
'CdkDrag', 'CdkDropList', 'ConnectedPositionStrategy', 'FlexibleConnectedPositionStrategy',
'OverlayPositionBuilder', 'CdkTable'
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/ng-update/data/input-names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface InputNameUpgradeData {
export const inputNames: VersionChanges<InputNameUpgradeData> = {
[TargetVersion.V6]: [
{
pr: 'https://github.com/angular/material2/pull/10161',
pr: 'https://github.com/angular/components/pull/10161',
changes: [
{
replace: 'origin',
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/ng-update/data/method-call-checks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface MethodCallUpgradeData {
export const methodCallChecks: VersionChanges<MethodCallUpgradeData> = {
[TargetVersion.V6]: [
{
pr: 'https://github.com/angular/material2/pull/10325',
pr: 'https://github.com/angular/components/pull/10325',
changes: [
{
className: 'FocusMonitor',
Expand Down
8 changes: 4 additions & 4 deletions src/cdk/schematics/ng-update/data/property-names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface PropertyNameUpgradeData {
export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
[TargetVersion.V7]: [
{
pr: 'https://github.com/angular/material2/pull/8286',
pr: 'https://github.com/angular/components/pull/8286',
changes: [
{
replace: 'onChange',
Expand All @@ -37,7 +37,7 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
},

{
pr: 'https://github.com/angular/material2/pull/12927',
pr: 'https://github.com/angular/components/pull/12927',
changes: [
{
replace: 'flexibleDiemsions',
Expand All @@ -52,7 +52,7 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {

[TargetVersion.V6]: [
{
pr: 'https://github.com/angular/material2/pull/10161',
pr: 'https://github.com/angular/components/pull/10161',
changes: [
{
replace: '_deprecatedOrigin',
Expand Down Expand Up @@ -142,7 +142,7 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
},

{
pr: 'https://github.com/angular/material2/pull/10257',
pr: 'https://github.com/angular/components/pull/10257',
changes: [
{
replace: '_deprecatedPortal',
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/ng-update/update-schematic.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ because the non-separated upgrade data would just include: _`onChange` => `onVal
Also besides separating the upgrade data based on the target version, we split the upgrade data
based on the type of code that is affected by these migrations:
* See here: [src/material/schematics/update/material/data](https://github.com/angular/material2/tree/master/src/material/schematics/update/material/data)
* See here: [src/material/schematics/update/material/data](https://github.com/angular/components/tree/master/src/material/schematics/update/material/data)
### Adding upgrade data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class Rule extends Rules.TypedRule {
applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[] {
// Note that the data for this rule is not distinguished based on the target version because
// we don't keep track of the new signature and don't want to update incrementally.
// See: https://github.com/angular/material2/pull/12970#issuecomment-418337566
// See: https://github.com/angular/components/pull/12970#issuecomment-418337566
const data = getAllChanges<ConstructorChecksUpgradeData>
(this.getOptions().ruleArguments[1].constructorChecks);
return this.applyWithFunction(sourceFile, visitSourceFile, data, program);
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/schematics/utils/build-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export function buildComponent(options: ComponentOptions,
// In case the specified style extension is not part of the supported CSS supersets,
// we generate the stylesheets with the "css" extension. This ensures that we don't
// accidentally generate invalid stylesheets (e.g. drag-drop-comp.styl) which will
// break the Angular CLI project. See: https://github.com/angular/material2/issues/15164
// break the Angular CLI project. See: https://github.com/angular/components/issues/15164
if (!supportedCssExtensions.includes(options.style!)) {
// TODO: Cast is necessary as we can't use the Style enum which has been introduced
// within CLI v7.3.0-rc.0. This would break the schematic for older CLI versions.
Expand Down
2 changes: 1 addition & 1 deletion src/dev-app/dev-app/dev-app-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {DevAppLayout} from './dev-app-layout';
exports: [DevAppLayout],

// We need to pass this in here, because the gesture config currently doesn't for lazy-loaded
// modules. See https://github.com/angular/material2/issues/4595#issuecomment-416641018.
// modules. See https://github.com/angular/components/issues/4595#issuecomment-416641018.
providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
})
export class DevAppModule {
Expand Down
2 changes: 1 addition & 1 deletion src/e2e-app/devserver-configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ require.config({
}
});

// Workaround until https://github.com/angular/material2/issues/13883 has been addressed.
// Workaround until https://github.com/angular/components/issues/13883 has been addressed.
var module = {id: ''};
2 changes: 1 addition & 1 deletion src/e2e-app/e2e-app/e2e-app-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {E2eAppLayout, Home} from './e2e-app-layout';
exports: [E2eAppLayout],

// We need to pass this in here, because the gesture config currently doesn't for lazy-loaded
// modules. See https://github.com/angular/material2/issues/4595#issuecomment-416641018.
// modules. See https://github.com/angular/components/issues/4595#issuecomment-416641018.
providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
})
export class E2eAppModule {
Expand Down
6 changes: 3 additions & 3 deletions src/material-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"private": true,
"repository": {
"type": "git",
"url": "https://github.com/angular/material2.git"
"url": "https://github.com/angular/components.git"
},
"keywords": [
"angular",
Expand All @@ -19,9 +19,9 @@
],
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/material2/issues"
"url": "https://github.com/angular/components/issues"
},
"homepage": "https://github.com/angular/material2#readme",
"homepage": "https://github.com/angular/components#readme",
"peerDependencies": {
"@angular/cdk": "0.0.0-PLACEHOLDER",
"@angular/core": "0.0.0-NG",
Expand Down
Loading

0 comments on commit fde980c

Please sign in to comment.