Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit e0d0c32

Browse files
committed
Merge branch 'master' into sis0k0/webpack4
2 parents 1dd2000 + 0b0fe4e commit e0d0c32

28 files changed

+342
-68
lines changed

CHANGELOG.md

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
<a name="0.10.1"></a>
2+
## [0.10.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.10.0...0.10.1) (2018-04-11)
3+
4+
5+
### Bug Fixes
6+
7+
* **configs/angular:** use path relative to the appDir for the root ([8e7aa0c](https://github.com/NativeScript/nativescript-dev-webpack/commit/8e7aa0c))
8+
9+
<a name="0.10.0"></a>
10+
# [0.10.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.9.1...0.10.0) (2018-04-05)
11+
12+
> You need NativeScript 4.0 for using the new features from this version.
13+
14+
### Bug Fixes
15+
16+
* **hooks:** `after-watch` hook is not executed ([#483](https://github.com/NativeScript/nativescript-dev-webpack/issues/483)) ([a61cff4](https://github.com/NativeScript/nativescript-dev-webpack/commit/a61cff4))
17+
* allow snapshot only in release ([#448](https://github.com/NativeScript/nativescript-dev-webpack/issues/448)) ([2dd9adc](https://github.com/NativeScript/nativescript-dev-webpack/commit/2dd9adc))
18+
* clean snapshot artifacts on cleanApp hook ([#423](https://github.com/NativeScript/nativescript-dev-webpack/issues/423)) ([50c3ab9](https://github.com/NativeScript/nativescript-dev-webpack/commit/50c3ab9))
19+
* remove progress indication ([#468](https://github.com/NativeScript/nativescript-dev-webpack/issues/468)) ([8961a93](https://github.com/NativeScript/nativescript-dev-webpack/commit/8961a93)), closes [/github.com/webpack/webpack/blob/4428efe48e1c5ff4cadb79e13f0fa48c12bdac35/lib/ProgressPlugin.js#L50](https://github.com//github.com/webpack/webpack/blob/4428efe48e1c5ff4cadb79e13f0fa48c12bdac35/lib/ProgressPlugin.js/issues/L50)
20+
* remove unnecessary comma ([#472](https://github.com/NativeScript/nativescript-dev-webpack/issues/472)) ([ce60606](https://github.com/NativeScript/nativescript-dev-webpack/commit/ce60606))
21+
* send arguments in watchPatterns hook ([#449](https://github.com/NativeScript/nativescript-dev-webpack/issues/449)) ([aa255bb](https://github.com/NativeScript/nativescript-dev-webpack/commit/aa255bb))
22+
* Set INIT_CWD env in all before-* hooks ([#480](https://github.com/NativeScript/nativescript-dev-webpack/issues/480)) ([b7ef84f](https://github.com/NativeScript/nativescript-dev-webpack/commit/b7ef84f))
23+
* **hooks:** Hooks not executed correctly when CLI is used as a library ([#479](https://github.com/NativeScript/nativescript-dev-webpack/issues/479)) ([87dd53d](https://github.com/NativeScript/nativescript-dev-webpack/commit/87dd53d))
24+
* **prepare:** clean platforms/.../app/ when running webpack ([#465](https://github.com/NativeScript/nativescript-dev-webpack/issues/465)) ([cb2f51b](https://github.com/NativeScript/nativescript-dev-webpack/commit/cb2f51b))
25+
* **snapshot:** use request module for http requests ([#428](https://github.com/NativeScript/nativescript-dev-webpack/issues/428)) ([01933e0](https://github.com/NativeScript/nativescript-dev-webpack/commit/01933e0)), closes [#389](https://github.com/NativeScript/nativescript-dev-webpack/issues/389)
26+
* **uglify:** prevent SideDrawer transition class names from being renamed ([#426](https://github.com/NativeScript/nativescript-dev-webpack/issues/426)) ([0120329](https://github.com/NativeScript/nativescript-dev-webpack/commit/0120329)), closes [/github.com/telerik/nativescript-ui-feedback/issues/477#issuecomment-360772046](https://github.com//github.com/telerik/nativescript-ui-feedback/issues/477/issues/issuecomment-360772046) [#258](https://github.com/NativeScript/nativescript-dev-webpack/issues/258)
27+
28+
29+
### Features
30+
31+
* **livesync:** enable webpack with watch ([#433](https://github.com/NativeScript/nativescript-dev-webpack/issues/433)) ([847a56f](https://github.com/NativeScript/nativescript-dev-webpack/commit/847a56f))
32+
* consume shouldprepare hook ([#447](https://github.com/NativeScript/nativescript-dev-webpack/issues/447)) ([adb896c](https://github.com/NativeScript/nativescript-dev-webpack/commit/adb896c))
33+
34+
35+
### BREAKING CHANGES
36+
37+
* The snapshot plugin is applied only when building for release.
38+
39+
Before:
40+
```
41+
tns run android --bundle --env.snapshot
42+
```
43+
44+
After:
45+
```
46+
tns run android --bundle --env.snapshot --release --keyStorePath ~/path/to/keystore/my.keystore --keyStorePassword password --keyStoreAlias alias --keyStoreAliasPassword aliasPassword
47+
```
48+
149
<a name="0.9.2"></a>
250
## [0.9.2](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.9.1...0.9.2) (2018-02-15)
351

@@ -335,4 +383,3 @@ the project: `webpack.common.js`, `webpack.android.js`,
335383
* use the nativescript fork of css-loader ([3b6a1c8](https://github.com/NativeScript/nativescript-dev-webpack/commit/3b6a1c8))
336384

337385

338-

CONTRIBUTING.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- [Reporting Bugs](#reporting-bugs)
1111
- [Requesting Features](#requesting-features)
1212
- [Submitting PR](#submitting-pr)
13+
- [Publishing new versions](#publishing-new-versions)
1314

1415
<!-- /TOC -->
1516

@@ -144,3 +145,42 @@ NOTE: There are three test apps in the repository, located in the `/demo` direct
144145
```
145146
146147
Thank you for your contribution!
148+
149+
## Publishing new versions
150+
151+
1. Run `npm install` to install the dependencies and prepare the package for publishing.
152+
```bash
153+
npm install
154+
```
155+
156+
2. Remove the `package-lock.json` file if it was generated.
157+
```bash
158+
rm package-lock.json
159+
```
160+
161+
3. Add the following to your `.npmrc`.
162+
```
163+
tag-version-prefix=""
164+
message="release: cut the %s release"
165+
```
166+
167+
4. Create new branch for the release:
168+
```
169+
git checkout -b username/release-version
170+
```
171+
172+
5. Run `npm version` to bump the version in the `package.json`, tag the release and update the CHANGELOG.md:
173+
```
174+
npm version [patch|minor|major]
175+
```
176+
177+
6. Push all changes to your branch and create a PR.
178+
```bash
179+
git push --set-upstream origin username/release-version --tags
180+
```
181+
182+
7. Publish the package to npm after the PR is merged.
183+
```bash
184+
npm publish
185+
```
186+

demo/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
node_modules
22
platforms
3+
testapp
4+
*-report.*
5+
36
hooks
47
report
58

demo/AngularApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
7171
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
7272
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
73-
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
73+
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
7474
"compile-tests": "tsc -p e2e --watch"
7575
}
7676
}

demo/JavaScriptApp/e2e/config/appium.capabilities.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@
8181
},
8282
"sim.iPhone8.iOS110": {
8383
"platformName": "iOS",
84-
"platformVersion": "11.0",
84+
"platformVersion": "11.2",
8585
"deviceName": "iPhone 8 110",
8686
"noReset": true,
8787
"fullReset": false,
8888
"app": ""
8989
},
9090
"sim.iPhoneX.iOS110": {
9191
"platformName": "iOS",
92-
"platformVersion": "11.0",
92+
"platformVersion": "11.2",
9393
"deviceName": "iPhone X",
9494
"noReset": true,
9595
"fullReset": false,

demo/JavaScriptApp/e2e/config/mocha.opts

Lines changed: 0 additions & 4 deletions
This file was deleted.

demo/JavaScriptApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
5454
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
5555
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
56-
"e2e": "mocha --opts ./e2e/config/mocha.opts"
56+
"e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
5757
}
5858
}

demo/TypeScriptApp/e2e/config/appium.capabilities.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@
8181
},
8282
"sim.iPhone8.iOS110": {
8383
"platformName": "iOS",
84-
"platformVersion": "11.0",
84+
"platformVersion": "11.2",
8585
"deviceName": "iPhone 8 110",
8686
"noReset": true,
8787
"fullReset": false,
8888
"app": ""
8989
},
9090
"sim.iPhoneX.iOS110": {
9191
"platformName": "iOS",
92-
"platformVersion": "11.0",
92+
"platformVersion": "11.2",
9393
"deviceName": "iPhone X",
9494
"noReset": true,
9595
"fullReset": false,

demo/TypeScriptApp/e2e/config/mocha.opts

Lines changed: 0 additions & 4 deletions
This file was deleted.

demo/TypeScriptApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
5656
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
5757
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
58-
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
58+
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
5959
"compile-tests": "tsc -p e2e --watch"
6060
}
6161
}

0 commit comments

Comments
 (0)