mirror of
https://github.com/angular/angular
synced 2026-05-24 09:28:37 +00:00
parent
3598d212a6
commit
31c7bc1cf4
5 changed files with 6 additions and 6 deletions
|
|
@ -471,7 +471,7 @@ Because both branches include commits 1-7, they now have the same content.
|
|||
|
||||
### Merging your work into a changed main branch
|
||||
|
||||
Being able to `fast-foward` a merge is simple.
|
||||
Being able to `fast-forward` a merge is simple.
|
||||
Unfortunately, in a repo like `angular/angular` that has many contributors, the main branch is changing frequently.
|
||||
A more likely scenario is illustrated here, where the `main` branch changed while you're working on your changes in the `working` branch.
|
||||
The resulting branches could be imagined as the following illustration.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
/**
|
||||
* Script that deletes all `yarn.lock` files for integration tests and
|
||||
* re-builds them from scratch. This script is useful as lock fils in
|
||||
* re-builds them from scratch. This script is useful as lock files in
|
||||
* integration tests are not necessarily up-to-date, given dependencies
|
||||
* being linked from the root `/package.json`, or locally-built 1st party
|
||||
* packages being used from tarball archives.
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ Because the first import of an NgModule from a user library to a `.d.ts` is alwa
|
|||
Aliasing is currently used in two cases:
|
||||
|
||||
1. To address strict dependency checking issues when using a `UnifiedModulesHost`.
|
||||
2. To support dependening on non-Angular Package Format packages (e.g. private libraries in monorepos) which do not have an entrypoint file through which all directives/pipes/modules are exported.
|
||||
2. To support depending on non-Angular Package Format packages (e.g. private libraries in monorepos) which do not have an entrypoint file through which all directives/pipes/modules are exported.
|
||||
|
||||
In environments with "strict dependency checking" as described above, an NgModule which exports another NgModule from one of its dependencies needs to export its directives/pipes as well, in order to make them available to the downstream compiler.
|
||||
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ the task is explicitly cancelled, e.g with `clearInterval(id)`.
|
|||
- **zone.js:** fix several test cases which trigger `done()` multiple times ([#45025](https://github.com/angular/angular/issues/45025)) ([d5565cc](https://github.com/angular/angular/commit/d5565ccdb4573a47eb329b09c6852c1ae39672a6))
|
||||
- **zone.js:** only one listener should also re-throw an error correctly ([#41868](https://github.com/angular/angular/issues/41868)) ([299f92c](https://github.com/angular/angular/commit/299f92c3b62a43c94cff4a204f9e41c46a159efc)), closes [#41867](https://github.com/angular/angular/issues/41867) [/github.com/angular/angular/pull/41562#issuecomment-822696973](https://github.com//github.com/angular/angular/pull/41562/issues/issuecomment-822696973)
|
||||
- **zone.js:** patch global instead of Mocha object ([#45047](https://github.com/angular/angular/issues/45047)) ([8efbdb5](https://github.com/angular/angular/commit/8efbdb57c11a6c632f69d7e142a632b6a853fa46)), closes [#42834](https://github.com/angular/angular/issues/42834)
|
||||
- **zone.js:** should continue to executue listeners when throw error ([#41562](https://github.com/angular/angular/issues/41562)) ([008eaf3](https://github.com/angular/angular/commit/008eaf3b7df90b2cdd9c83e229d23d4014d6dbc9)), closes [#41522](https://github.com/angular/angular/issues/41522)
|
||||
- **zone.js:** should continue to execute listeners when throw error ([#41562](https://github.com/angular/angular/issues/41562)) ([008eaf3](https://github.com/angular/angular/commit/008eaf3b7df90b2cdd9c83e229d23d4014d6dbc9)), closes [#41522](https://github.com/angular/angular/issues/41522)
|
||||
- **zone.js:** update several flaky cases ([#41526](https://github.com/angular/angular/issues/41526)) ([25a83eb](https://github.com/angular/angular/commit/25a83eb264aa19fc4616cea45e04d790b9bcd777)), closes [#41434](https://github.com/angular/angular/issues/41434)
|
||||
|
||||
### Features
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ import 'zone.js/mix'; // add zone-mix to patch both Browser and Nodejs
|
|||
import 'zone.js/plugins/zone-patch-electron'; // add zone-patch-electron to patch Electron native API
|
||||
```
|
||||
|
||||
there is a sampel repo [zone-electron](https://github.com/JiaLiPassion/zone-electron).
|
||||
there is a sample repo [zone-electron](https://github.com/JiaLiPassion/zone-electron).
|
||||
|
||||
* socket.io-client
|
||||
|
||||
|
|
@ -224,7 +224,7 @@ detail usage.
|
|||
provide a helper method to patch jsonp. Because jsonp has a lot of implementation, so
|
||||
user need to provide the information to let json `send` and `callback` in zone.
|
||||
|
||||
there is a sampel repo [zone-jsonp](https://github.com/JiaLiPassion/test-zone-js-with-jsonp) here,
|
||||
there is a sample repo [zone-jsonp](https://github.com/JiaLiPassion/test-zone-js-with-jsonp) here,
|
||||
sample usage is:
|
||||
|
||||
```javascript
|
||||
|
|
|
|||
Loading…
Reference in a new issue