Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix/cssTypo
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalerba committed Sep 26, 2023
2 parents 6366248 + 6b57edb commit fec2efb
Show file tree
Hide file tree
Showing 265 changed files with 15,697 additions and 15,182 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-dev-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# the number of concurrent actions is determined based on the host resources.
- run: bazel build //src/dev-app:web_package --symlink_prefix=dist/ --jobs=32

- uses: angular/dev-infra/github-actions/deploy-previews/pack-and-upload-artifact@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
- uses: angular/dev-infra/github-actions/previews/pack-and-upload-artifact@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
with:
workflow-artifact-name: 'dev-app'
pull-number: '${{github.event.pull_request.number}}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
npx -y firebase-tools@latest target:clear --project ${{env.PREVIEW_PROJECT}} hosting dev-app
npx -y firebase-tools@latest target:apply --project ${{env.PREVIEW_PROJECT}} hosting dev-app ${{env.PREVIEW_SITE}}
- uses: angular/dev-infra/github-actions/deploy-previews/upload-artifacts-to-firebase@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
- uses: angular/dev-infra/github-actions/previews/upload-artifacts-to-firebase@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
with:
github-token: '${{secrets.GITHUB_TOKEN}}'
workflow-artifact-name: 'dev-app'
Expand Down
37 changes: 1 addition & 36 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"./tools/stylelint/no-nested-mixin.ts",
"./tools/stylelint/no-concrete-rules.ts",
"./tools/stylelint/no-top-level-ampersand-in-mixin.ts",
"./tools/stylelint/theme-mixin-api.ts",
"./tools/stylelint/no-import.ts",
"./tools/stylelint/single-line-comment-only.ts",
"./tools/stylelint/no-unused-import.ts",
Expand All @@ -33,7 +32,6 @@
"filePattern": "**/!(*-example.css)"
}
],
"material/theme-mixin-api": true,
"material/selector-no-deep": true,
"material/no-nested-mixin": true,
"material/no-unused-import": true,
Expand Down Expand Up @@ -143,38 +141,5 @@
"resolveNestedSelectors": true
}
]
},
"overrides": [
{
"files": [
"**/_button-theme.scss",
"**/_card-theme.scss",
"**/_checkbox-theme.scss",
"**/_column-resize-theme.scss",
"**/_core-theme.scss",
"**/_datepicker-theme.scss",
"**/_fab-theme.scss",
"**/_form-field-theme.scss",
"**/_icon-button-theme.scss",
"**/_input-theme.scss",
"**/_list-theme.scss",
"**/_optgroup-theme.scss",
"**/_option-theme.scss",
"**/_paginator-theme.scss",
"**/_popover-edit-theme.scss",
"**/_progress-bar-theme.scss",
"**/_pseudo-checkbox-theme.scss",
"**/_radio-theme.scss",
"**/_ripple-theme.scss",
"**/_slide-toggle-theme.scss",
"**/_slider-theme.scss",
"**/_sort-theme.scss",
"**/_stepper-theme.scss",
"**/_tree-theme.scss"
],
"rules": {
"material/theme-mixin-api": false
}
}
]
}
}
86 changes: 86 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,89 @@
<a name="17.0.0-next.4"></a>
# 17.0.0-next.4 "titanium-turtle" (2023-09-20)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [2409e7071](https://github.com/angular/components/commit/2409e7071a4c1e035a6f212249e96ba36d7aeb4f) | fix | **schematics:** account for single string in styles and new styleUrl ([#27798](https://github.com/angular/components/pull/27798)) |
| [31187abae](https://github.com/angular/components/commit/31187abae619cf76e7f0a7771ca6e5900a50e90c) | fix | **scrolling:** unsubscribe from scrolled stream when viewport is destroyed ([#27800](https://github.com/angular/components/pull/27800)) |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [8c3d8d645](https://github.com/angular/components/commit/8c3d8d645857a381cb2a752a600796c36338ea9e) | fix | **form-field:** style the cursor the same way as the rest of the input ([#26491](https://github.com/angular/components/pull/26491)) ([#27795](https://github.com/angular/components/pull/27795)) |
| [c7db4960e](https://github.com/angular/components/commit/c7db4960e16d0f74b0764cfa5be752392e8c30f6) | fix | **list:** Emit tokens under mixin root selector ([#27711](https://github.com/angular/components/pull/27711)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="16.2.5"></a>
# 16.2.5 "cardboard-plane" (2023-09-20)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [80acf7910](https://github.com/angular/components/commit/80acf7910bfd114a129995551b19574a9844f583) | fix | **scrolling:** unsubscribe from scrolled stream when viewport is destroyed ([#27800](https://github.com/angular/components/pull/27800)) |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [158d5f37a](https://github.com/angular/components/commit/158d5f37abfcf457720c79558aee9215fb26607d) | fix | **form-field:** style the cursor the same way as the rest of the input ([#26491](https://github.com/angular/components/pull/26491)) ([#27795](https://github.com/angular/components/pull/27795)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="17.0.0-next.3"></a>
# 17.0.0-next.3 "rock-rock" (2023-09-13)
### material
| Commit | Type | Description |
| -- | -- | -- |
| [db06fa8d89](https://github.com/angular/components/commit/db06fa8d8939d793f598bc3dbedc96a5a71c0db0) | fix | **autocomplete:** requireSelection incorrectly resetting value when there are no options ([#27781](https://github.com/angular/components/pull/27781)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="16.2.4"></a>
# 16.2.4 "wood-wagon" (2023-09-13)
### material
| Commit | Type | Description |
| -- | -- | -- |
| [38ebf49060](https://github.com/angular/components/commit/38ebf4906057b2e7ad6d6cec881268339f43c972) | fix | **autocomplete:** requireSelection incorrectly resetting value when there are no options ([#27781](https://github.com/angular/components/pull/27781)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="17.0.0-next.2"></a>
# 17.0.0-next.2 "metal-monkey" (2023-09-07)
## Breaking Changes
### multiple
- - Themes are now more strictly validated when calling Angular Material
theme mixins. For example, calling `mat.button-typography` with a theme
has `typography: null` is now an error.
- The `mat.legacy-typography-hierarchy` mixin has been removed in favor
of `mat.typography-hierarchy`
### material
| Commit | Type | Description |
| -- | -- | -- |
| [cac7a41f7b](https://github.com/angular/components/commit/cac7a41f7b7a6034d8049be77fe53a082c3aa5f2) | fix | **dialog:** css structure change ([#27510](https://github.com/angular/components/pull/27510)) |
| [726fc069e3](https://github.com/angular/components/commit/726fc069e3bed2fcbc9b53de02ee7ce18c2fce5d) | fix | **tabs:** add aria-hidden to inactive tabs ([#27742](https://github.com/angular/components/pull/27742)) |
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [aa1d01d169](https://github.com/angular/components/commit/aa1d01d1696360d25e18cb0328f56b9fca9d71c4) | fix | **drag-drop:** constrainPosition now working well with boundary ([#27730](https://github.com/angular/components/pull/27730)) |
| [8eb494e975](https://github.com/angular/components/commit/8eb494e975bb75e52c9c81ad68d3d4b993546dfe) | fix | **menu:** run change detection for changes to overlay ref of trigger ([#27726](https://github.com/angular/components/pull/27726)) |
### multiple
| Commit | Type | Description |
| -- | -- | -- |
| [90465a1882](https://github.com/angular/components/commit/90465a1882028144a8e56eabc03b4cc93947df9f) | refactor | convert components to theme inspection API (round 4) ([#27740](https://github.com/angular/components/pull/27740)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="16.2.3"></a>
# 16.2.3 "plastic-part" (2023-09-07)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [ffd4209318](https://github.com/angular/components/commit/ffd4209318cdc5dc3e1e247698712679ebdf93d7) | fix | **drag-drop:** constrainPosition now working well with boundary ([#27730](https://github.com/angular/components/pull/27730)) |
| [08dd2322ac](https://github.com/angular/components/commit/08dd2322accbac10cdb93181d51770cb4db7cf68) | fix | **menu:** run change detection for changes to overlay ref of trigger ([#27726](https://github.com/angular/components/pull/27726)) |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [72a5d1eedc](https://github.com/angular/components/commit/72a5d1eedc090cbd08d3aaed30cea6c05601272e) | fix | **tabs:** add aria-hidden to inactive tabs ([#27742](https://github.com/angular/components/pull/27742)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="16.2.2"></a>
# 16.2.2 "baryte-barnacle" (2023-08-30)
### cdk
Expand Down
2 changes: 1 addition & 1 deletion integration/ng-add-standalone/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ node_integration_test(

# Generate a new standalone project with the default options.
# Skip installation since we installed the dependencies already.
"yarn ng new --defaults --standalone --skip-install --style=scss --name=%s" % APP_NAME,
"yarn ng new --defaults --standalone --skip-install --style=scss --skip-git --name=%s" % APP_NAME,
# Delete the package.json that the CLI generated since we want to use the existing one.
"rm -f %s/package.json" % APP_NAME,
# Delete the Karma config since we need to use a headless browser.
Expand Down
9 changes: 3 additions & 6 deletions integration/ng-add-standalone/_angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/ng-add-standalone",
"index": "src/index.html",
"main": "src/main.ts",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
Expand All @@ -51,12 +51,9 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
}
},
"defaultConfiguration": "production"
Expand Down
22 changes: 11 additions & 11 deletions integration/ng-add-standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^16.0.0-next.7",
"@angular/animations": "^17.0.0-next.4",
"@angular/cdk": "file:../../dist/releases/cdk",
"@angular/common": "^16.0.0-next.7",
"@angular/compiler": "^16.0.0-next.7",
"@angular/core": "^16.0.0-next.7",
"@angular/forms": "^16.0.0-next.7",
"@angular/common": "^17.0.0-next.4",
"@angular/compiler": "^17.0.0-next.4",
"@angular/core": "^17.0.0-next.4",
"@angular/forms": "^17.0.0-next.4",
"@angular/material": "file:../../dist/releases/material",
"@angular/platform-browser": "^16.0.0-next.7",
"@angular/platform-browser-dynamic": "^16.0.0-next.7",
"@angular/router": "^16.0.0-next.7",
"@angular/platform-browser": "^17.0.0-next.4",
"@angular/platform-browser-dynamic": "^17.0.0-next.4",
"@angular/router": "^17.0.0-next.4",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.0.0-next.7",
"@angular/cli": "~16.0.0-next.7",
"@angular/compiler-cli": "^16.0.0-next.7",
"@angular-devkit/build-angular": "^17.0.0-next.4",
"@angular/cli": "^17.0.0-next.4",
"@angular/compiler-cli": "^17.0.0-next.4",
"@types/jasmine": "~4.3.0",
"jasmine-core": "~4.6.0",
"karma": "~6.4.0",
Expand Down
Loading

0 comments on commit fec2efb

Please sign in to comment.