Skip to content

release: cut the 7.2.4 release #1793

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.

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 58 commits into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3c3c10e
chore: bump package versino tp 7.3.0
SvetoslavTsenov Feb 8, 2019
3c7ad92
Merge pull request #1721 from NativeScript/svetoslavtsenov/bump-versi…
SvetoslavTsenov Feb 8, 2019
c49e65f
Merge remote-tracking branch 'origin/master' into merge-release-in-ma…
SvetoslavTsenov Feb 10, 2019
1da4cfb
Merge pull request #1725 from NativeScript/merge-release-in-master
SvetoslavTsenov Feb 11, 2019
a21454f
chor(NativeScriptPlatformRef): Destroy lastModuleRef on exitEvent
m-abs Feb 12, 2019
a4ee021
fix(tslint): missing whitespace
m-abs Feb 12, 2019
b95296c
Merge branch 'master' into myankov/merge-release-master
MartoYankov Feb 19, 2019
0f6a975
fix(router): routing services should be provided in forRoot only (#1729)
Feb 19, 2019
1119e2a
Merge branch 'master' into fix/923-module-not-destroyed
Feb 19, 2019
90753c0
Merge branch 'master' into myankov/merge-release-master
Feb 19, 2019
a16063b
Merge pull request #1741 from NativeScript/myankov/merge-release-master
MartoYankov Feb 19, 2019
849e16e
Merge remote-tracking branch 'origin/master' into merge-release-maste…
SvetoslavTsenov Feb 19, 2019
402fbde
Merge pull request #1743 from NativeScript/merge-release-master-7.2.2
SvetoslavTsenov Feb 19, 2019
bdd3250
Merge branch 'master' into fix/923-module-not-destroyed
m-abs Feb 20, 2019
f9b1d0c
Merge branch 'fix/923-module-not-destroyed' of github.com:m-abs/nativ…
m-abs Feb 20, 2019
14e787f
fix: remove rootContent on exit
m-abs Feb 21, 2019
ea66985
fix: page might be null'ed before clearHistory's navigatedToEvent
m-abs Feb 22, 2019
878f44d
Merge branch 'master' into djenkov/release-to-master
ADjenkov Feb 26, 2019
9b3a3ba
Merge pull request #1750 from NativeScript/djenkov/release-to-master
ADjenkov Feb 26, 2019
ed6954a
refactor: minor changes after review
Feb 28, 2019
16af2e8
Merge branch 'master' into fix/923-module-not-destroyed
m-abs Mar 5, 2019
5e13263
fix: on destroy remove the lastBootstrappedModule
m-abs Mar 8, 2019
30db0d2
Merge branch 'fix/923-module-not-destroyed' of github.com:m-abs/nativ…
m-abs Mar 8, 2019
9fc172c
chore(tsconfig): remove path resolution for short imports (`ui/page`)
sis0k0 Mar 11, 2019
3dffbd5
fix: the exit event is triggered on restart
m-abs Mar 11, 2019
9ba7fca
NS Angular api ref build script
tsonevn Mar 12, 2019
b1c4340
exclude files from api ref build
tsonevn Mar 12, 2019
06bbcae
Merge pull request #1760 from NativeScript/ng_apiref
tsonevn Mar 12, 2019
e1b6e20
Merge branch 'master' into sis0k0/remove-short-imports-resolution
SvetoslavTsenov Mar 12, 2019
9122c23
Merge branch 'master' into fix/923-module-not-destroyed
m-abs Mar 12, 2019
f549b94
Merge remote-tracking branch 'origin/master' into merge-release-in-ma…
SvetoslavTsenov Mar 14, 2019
9cfa127
feat(modal): add ‘ios presentationStyle’ option to ModalDialogParams
Feb 1, 2019
a4282ff
chore: remove object cast as it is not needed
Mar 25, 2019
c9dc826
chore: add example that shows "popover" mode for modal service
Mar 25, 2019
0e90cc3
chore: remove old todo comment
Mar 26, 2019
2ce8007
chore(list-view): change the import to be from the base module
Mar 27, 2019
cb7da86
chore: update "pop over modal" example with new API
Mar 27, 2019
3feada8
chore: fix tslint error
Mar 27, 2019
9dfc569
Merge pull request #1771 from NativeScript/amiorkov/modal-options
VladimirAmiorkov Mar 28, 2019
685ddca
Merge branch 'master' into sis0k0/remove-short-imports-resolution
elena-p Apr 5, 2019
8931415
Merge branch 'master' into minor-fixes
elena-p Apr 5, 2019
b57c661
Merge branch 'master' into merge-release-in-master
elena-p Apr 5, 2019
72d877b
Merge branch 'master' into fix/923-module-not-destroyed
Apr 5, 2019
a77683e
Merge pull request #1763 from NativeScript/merge-release-in-master
elena-p Apr 11, 2019
738b15d
Merge branch 'master' into minor-fixes
elena-p Apr 11, 2019
20d48ee
Merge pull request #1753 from NativeScript/minor-fixes
elena-p Apr 12, 2019
ac9a59f
Merge branch 'master' into fix/923-module-not-destroyed
elena-p Apr 12, 2019
f12000e
Merge pull request #1728 from m-abs/fix/923-module-not-destroyed
elena-p Apr 15, 2019
51a61f1
Merge branch 'master' into sis0k0/remove-short-imports-resolution
elena-p Apr 15, 2019
d4739f5
Merge pull request #1759 from NativeScript/sis0k0/remove-short-import…
elena-p Apr 19, 2019
bfb5f4a
docs: update contribution change log
SvetoslavTsenov Apr 22, 2019
1d70d51
docs: update change log
SvetoslavTsenov Apr 23, 2019
0332b8a
Merge pull request #1789 from NativeScript/svetoslavtsenov/release-cy…
elena-p Apr 23, 2019
1fc9821
chore: add new test for #1771
Apr 23, 2019
4ce38fe
chore: stabilise tests
Apr 24, 2019
652776a
Merge pull request #1791 from NativeScript/zbranzov/new-test
Apr 24, 2019
ceb1a17
release: cut the 7.2.4 release
Apr 24, 2019
2f59b0f
chore: merge changelog info
Apr 24, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ng-sample/app/**/*.js
# Webpack configuration files
webpack.config.js
tsconfig.esm.json
tsconfig.tns.json

# IDEs and editors
/.idea
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## [7.2.4](https://github.com/NativeScript/nativescript-angular/compare/7.2.3...7.2.4) (2019-04-24)


### Bug Fixes

* **router:** routing services should be provided in forRoot only ([#1729](https://github.com/NativeScript/nativescript-angular/issues/1729)) ([0f6a975](https://github.com/NativeScript/nativescript-angular/commit/0f6a975))
* ngOnDestroy not called on Android back button ([#923](https://github.com/NativeScript/nativescript-angular/issues/923))


### Features

* **modal:** add ‘ios presentationStyle’ option to ModalDialogParams ([9cfa127](https://github.com/NativeScript/nativescript-angular/commit/9cfa127))



<a name="7.2.3"></a>
## [7.2.3](https://github.com/NativeScript/nativescript-angular/compare/7.2.2...7.2.3) (2019-03-14)

Expand Down
109 changes: 89 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,36 +81,105 @@ If you want to contribute, but you are not sure where to start - look for [issue

## Publishing new versions

Instructions how to publish a new version for Maintainers.

1. Execute `npm install` to install dependencies and prepare the package for publishing:
```bash
cd nativescript-angular/nativescript-angular
npm install
## <a name="release"></a> Releasing new versions
Instructions how to release a new version for **NativeScript Core Team Members**.

![](./release-contribution-guide-schema-webpack.png?raw=true)

1. Checkout release branch
```
cd nativescript-angular/nativescript-angular && git checkout release && git pull
```
#### If we prepare major or minor release, merge master in release branch else **skip this step**.
```
git merge --ff-only origin/master
```
*** Note: If there are commits in release branch which are not merged in master branch '-ff-merge' command will fail.
In this case the commits should be merge firstly from release in master branch as explained in section 'Merge changes from release into master' and then repeat step 1.

2. Add the following to your `.npmrc`:
2. Execute `npm i` to install dependencies:
```
cd nativescript-angular && npm i
```
3. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version:
```
npm --no-git-tag-version version [patch|minor|major] -m "release: cut the %s release"
```
or
```
tag-version-prefix=""
message="release: cut the %s release"
npm --no-git-tag-version version [version] --allow-same-version -m "release: cut the %s release"
```
NOTE: Check the changelog!!!

3. Create new branch for the release:
```bash
git checkout -b username/release-version
4. Create release-branch with change log
```
git checkout -b release-[version]
```
5. Add changes
```
git add changed-files
git commit -m "release: cut the %s release"
git push
```
NOTE: Make sure the PR is based on release branch

4. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version in the `package.json` file, tag the release and update the CHANGELOG.md:
```bash
npm version [patch|minor|major]
6. Merge PR into release branch.

7. The merge will produce package with rc tag in npm. If all checks have passed, publish official package. Usually the night builds will be triggered and the package will be ready to be released on the next day.

8. Don't forget to tag the release branch
```
git tag [version]
git push --tags
```
Only if needed to Tips to remove tags:
```
git push --delete origin [version]
git tag -d [version]
```

5. Push all the changes to your branch and create a pull request:
```bash
git push --set-upstream origin username/release-version --tags
## Checkout master branch and bump version usually should be minor or major.

## Merge changes from release into master

## NOTE: Don't use git IDE/WEB

![](./merge-guidance-schema.png)

### Here are steps described in the diagram above.

1. Make sure you are in release branch:
```
git checkout release && git pull
```
2. Create PR to merge changes back in master and preserve history:
```
git checkout -b merge-release-in-master-[branch]/[sha]
git push --set-upstream origin merge-release-in-master-branch-[branch]/[sha]
git merge origin/master
```
3. Resolve conflicts. Choose to keep the version of master branch. If it is needed to revert versions of modules, see at the bottom.

6. Publish the package to `npm` after the pull request is merged:
```bash
npm publish
4. Add conflicts:
```
git add resolved files
```
5. Commit changes with default merge message:
```
git commit
git push
```

6. Create pull request which should be based on master. Replace replace env merge-release-in-master-branch with its value
```
curl -d '{"title": "chore: merge release in master","body": "chore: merge release in master","head": "merge-release-in-master","base": "master"}' -X POST https://api.github.com/repos/NativeScript/NativeScript/pulls -H "Authorization: token ${GIT_TOKEN}"
```

**If needed, to revert file and take it from master:**
```
git checkout origin/master nativescript-angular/[some-file]
git commit --amend
git push --force-with-lease
```
This could require to repeat steps from 1 to 4, since we need to keep the branches with the same history
9 changes: 9 additions & 0 deletions build-docs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set -e

ENV="${ENV:-dev}"
DIST_DIR="nativescript-angular/bin/dist"
APIREF_DIR="$DIST_DIR/ng-api-reference"
rm -rf "$APIREF_DIR"
cd "nativescript-angular"
npm install
npm run typedoc
2 changes: 1 addition & 1 deletion e2e/config/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--timeout 140000
--timeout 60000
--recursive e2e
--reporter mocha-multi
--reporter-options spec=-,mocha-junit-reporter=test-results.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, ViewContainerRef, Input } from "@angular/core";
import { Component, ViewContainerRef, Input, ViewChild, ElementRef } from "@angular/core";
import { Router, NavigationEnd } from "@angular/router";
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
import { ModalComponent } from "../modal/modal.component";
Expand All @@ -16,20 +16,22 @@ import { ModalViewComponent } from "~/modal-shared/modal-view.component";
<Button text="Show Modal Without Frame" (tap)="onModalNoFrame()" textAlignment="left"></Button>
<Button text="Show Modal Page With Frame" (tap)="onModalFrame()" textAlignment="left"></Button>
<Button text="Show Shared Modal" (tap)="onRootModalTap()" textAlignment="left"></Button>
<Button #popoverButtonComp text="Show shared 'popover' modal" (tap)="onPopoverModal()" textAlignment="left"></Button>
<Button text="Show Dialog" (tap)="onShowDialog()" textAlignment="left"></Button>
</StackLayout>`
})

export class BasicsNavigationComponent {

@ViewChild("popoverButtonComp") popoverButtonComp: ElementRef;
@Input() col: number;
constructor(
private modal: ModalDialogService,
private router: Router,
private vcf: ViewContainerRef,
private viewContainerRefService: ViewContainerRefService) {
}

onModalNoFrame() {
const options: ModalDialogOptions = {
context: {
Expand Down Expand Up @@ -74,14 +76,28 @@ export class BasicsNavigationComponent {

onRootModalTap(): void {
const options: ModalDialogOptions = {
viewContainerRef: this.viewContainerRefService.root,
context: {},
fullscreen: true
viewContainerRef: this.viewContainerRefService.root,
context: {},
fullscreen: true
};

this.modal.showModal(ModalViewComponent, options)
.then((result: string) => {
console.log(result);
});
}
.then((result: string) => {
console.log(result);
});
}

onPopoverModal() {
const options: ModalDialogOptions = {
viewContainerRef: this.viewContainerRefService.root,
context: {},
ios: {
presentationStyle: UIModalPresentationStyle.Popover
},
target: this.popoverButtonComp.nativeElement
};

this.modal.showModal(ModalViewComponent, options)
.then((result: string) => { console.log(result);});
}
}
7 changes: 6 additions & 1 deletion e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("modal-shared:", () => {
});

roots.forEach(root => {
describe("Shared modal from second and back", () => {
describe("Shared modal from home component and back", () => {

before(async () => {
await screen[root]();
Expand Down Expand Up @@ -46,6 +46,11 @@ describe("modal-shared:", () => {
await screen.closeModal();
});

it("should open/close shared modal with presentation style from home component", async () => {
await screen.loadSharedModalWithPresentationStyle(true);
await screen.closeModal();
});

it("should find home component again", async () => {
await screen.loadedHome();
});
Expand Down
17 changes: 16 additions & 1 deletion e2e/modal-navigation-ng/e2e/screens/screen.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AppiumDriver } from "nativescript-dev-appium";
import { AppiumDriver, SearchOptions } from "nativescript-dev-appium";
import { assert } from "chai";

const home = "Home Component"
Expand Down Expand Up @@ -165,6 +165,11 @@ export class Screen {
await btnTap.click();
}

private showSharedModalPresentationStyle = async () => {
const btnTap = await this._driver.findElementByText("popover", SearchOptions.contains);
await btnTap.click();
}

loadedModalPage = async () => {
const btnShowNestedModalPage = await this._driver.findElementByAutomationText(showNestedModalPage);
assert.isTrue(await btnShowNestedModalPage.isDisplayed(), `${showNestedModalPage} is not displayed`);
Expand Down Expand Up @@ -212,6 +217,7 @@ export class Screen {
}

loadedModalNoFrame = async () => {
await this._driver.wait(2000);
const btnShowDialogConfirm = await this._driver.waitForElement(showDialog);
const btnCloseModal = await this._driver.waitForElement(closeModal);
assert.isTrue(await btnShowDialogConfirm.isDisplayed());
Expand Down Expand Up @@ -309,4 +315,13 @@ export class Screen {
const lbl = await this._driver.waitForElement(sharedModalView, 5000);
assert.isTrue(await lbl.isDisplayed());
}

loadSharedModalWithPresentationStyle = async (loadShowModalPageWithFrame: boolean) => {
if (loadShowModalPageWithFrame) {
await this.showSharedModalPresentationStyle();
}

const lbl = await this._driver.waitForElement(sharedModalView, 5000);
assert.isTrue(await lbl.isDisplayed());
}
}
1 change: 1 addition & 0 deletions e2e/modal-navigation-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"nativescript-dev-appium": "next",
"nativescript-dev-typescript": "next",
"nativescript-dev-webpack": "next",
"tns-platform-declarations": "next",
"typescript": "~3.1.1"
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions e2e/modal-navigation-ng/references.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
Binary file added merge-guidance-schema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading