10000 Merge branch 'master' into tests-refactor · brysem/nativescript-vue@57d048b · GitHub
[go: up one dir, main page]
Skip to content

Commit 57d048b

Browse files
msaelicesmsaelices
committed
Merge branch 'master' into tests-refactor
2 parents 448b255 + 1cc8142 commit 57d048b

File tree

68 files changed

+11089
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+11089
-1360
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ samples/package-lock.json
88
samples/platforms
99
samples/app/nativescript-vue.js
1010
samples/app/nativescript-vue.js.map
11+
samples/hooks/
12+
samples/mochawesome-report/
13+
samples/e2e/reports/
14+
test-results.xml
1115
dist/
1216
packages/nativescript-vue-template-compiler/index.js
1317
!docs/dist/

‎.travis.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
env:
2+
global:
3+
- ANDROID_PACKAGE_VUE='nativescript-vue-tests.apk'
4+
- ANDROID_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/samples/outputs
5+
- SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER"
6+
- IOS_PACKAGE_VUE='nativescript-vue-tests.zip'
7+
- IOS_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/samples/outputs
8+
9+
git:
10+
depth: 1
11+
12+
branches:
13+
only:
14+
- master
15+
16+
matrix:
17+
include:
18+
- stage: "Unit Tests"
19+
language: node_js
20+
os: linux
21+
node_js: "11"
22+
script: npm ci && npm run test
23+
- stage: "Build app"
24+
os: osx
25+
env:
26+
- WebpackiOS="12.0"
27+
- Type="VueJS"
28+
osx_image: xcode11
29+
language: node_js
30+
node_js: "11"
31+
jdk: oraclejdk8
32+
script:
33+
- npm ci && npm run dev:core && npm run dev:compiler
34+
- cd samples && npm i && tns build ios --copy-to "./outputs/nativescript-vue-tests.app"
35+
- cd $IOS_PACKAGE_FOLDER_VUE && zip -r $IOS_PACKAGE_VUE nativescript-vue-tests.app
36+
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $SAUCE_STORAGE/$IOS_PACKAGE_VUE?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_VUE/$IOS_PACKAGE_VUE"
37+
- language: android
38+
os: linux
39+
env:
40+
- WebpackAndroid="28"
41+
- Type="VueJS"
42+
jdk: oraclejdk8
43+
before_install: nvm install 11
44+
script:
45+
- npm ci && npm run dev:core && npm run dev:compiler
46+
- cd samples && npm i && tns build android --copy-to "./outputs/nativescript-vue-tests.apk"
47+
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/$ANDROID_PACKAGE_VUE"
48+
- stage: "UI Tests"
49+
env:
50+
- iOS="12.0"
51+
- Type="VueJS"
52+
language: node_js
53+
os: linux
54+
node_js: "11"
55+
script:
56+
- npm i -g appium
57+
- cd samples && npm i
58+
- travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_VUE
59+
- os: linux
60+
env:
61+
- Android="24"
62+
- Type="VueJS"
63+
language: node_js
64+
node_js: "11"
65+
script:
66+
- npm i -g appium
67+
- cd samples && npm i
68+
- travis_wait travis_retry npm run e2e -- --runType android24.sauce --sauceLab --appPath $ANDROID_PACKAGE_VUE
69+
70+
android:
71+
components:
72+
- tools
73+
- platform-tools
74+
- build-tools-28.0.3
75+
- android-28
76+
- android-23
77+
- extra-android-m2repository
78+
79+
before_cache:
80+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
81+
82+
cache:
83+
directories:
84+
- .nvm
85+
- $HOME/.gradle/caches/
86+
- $HOME/.gradle/wrapper/
87+
88+
before_install:
89+
- sudo pip install --upgrade pip
90+
- sudo pip install six
91+
92+
install:
93+
- echo no | npm install -g nativescript
94+
- tns usage-reporting disable
95+
- tns error-reporting disable

‎CHANGELOG.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,99 @@
1+
<a name="2.5.0-alpha.1"></a>
2+
# [2.5.0-alpha.1](https://github.com/nativescript-vue/nativescript-vue/compare/v2.5.0-alpha.0...v2.5.0-alpha.1) (2019-09-07)
3+
4+
5+
### Bug Fixes
6+
7+
* **frame:** $refs inside default page ([#544](https://github.com/nativescript-vue/nativescript-vue/issues/544)) ([4872304](https://github.com/nativescript-vue/nativescript-vue/commit/4872304)), closes [#543](https://github.com/nativescript-vue/nativescript-vue/issues/543)
8+
* honour the ID of the <Frame> components in the App ([#541](https://github.com/nativescript-vue/nativescript-vue/issues/541)) ([a2b0cd6](https://github.com/nativescript-vue/nativescript-vue/commit/a2b0cd6))
9+
* look for parent Frame instead of a NavigationEntry ([7147a9f](https://github.com/nativescript-vue/nativescript-vue/commit/7147a9f))
10+
11+
12+
### Features
13+
14+
* improve modals in DevTools ([8677a52](https://github.com/nativescript-vue/nativescript-vue/commit/8677a52))
15+
16+
17+
18+
<a name="2.5.0-alpha.0"></a>
19+
# [2.5.0-alpha.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.4.0...v2.5.0-alpha.0) (2019-08-24)
20+
21+
22+
### Bug Fixes
23+
24+
* **devtools:** refresh devtools when state changes ([4d28b34](https://github.com/nativescript-vue/nativescript-vue/commit/4d28b34))
25+
* crash on blank .vue template section ([0295650](https://github.com/nativescript-vue/nativescript-vue/commit/0295650))
26+
27+
28+
### Features
29+
30+
* **devtools:** show navigation entries under Frame ([e82d067](https://github.com/nativescript-vue/nativescript-vue/commit/e82d067))
31+
32+
33+
### BREAKING CHANGES
34+
35+
* **devtools:** A Frame now only accepts a single child element, that is the defaultPage for the Frame. If you have multiple pages nested under the Frame element, you will need to refactor to use `$navigateTo` instead. Additionally the default slot is only rendered once, meaning that it will not be reactive after the initial render. This is due to how the Frame element works, it renders the defaultPage, and then "navigates" to it, and it is no longer a direct child of the Frame and cannot be reactive. F438 If this affects you, plese open an issue and describe your use case, so we can discuss possible solutions.
36+
37+
For most users this will not requre any additional refactoring.
38+
39+
40+
41+
<a name="2.4.0"></a>
42+
# [2.4.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.4.0-alpha.0...v2.4.0) (2019-07-23)
43+
44+
45+
### Features
46+
47+
* add support for Tabs and BottomNavigation ([#524](https://github.com/nativescript-vue/nativescript-vue/issues/524)) ([806658b](https://github.com/nativescript-vue/nativescript-vue/commit/806658b))
48+
49+
50+
51+
<a name="2.4.0-alpha.0"></a>
52+
# [2.4.0-alpha.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.3.0...v2.4.0-alpha.0) (2019-07-10)
53+
54+
55+
### Bug Fixes
56+
57+
* livesync and HMR fixes for NativeScript 6.0 ([#508](https://github.com/nativescript-vue/nativescript-vue/issues/508)) ([be95893](https://github.com/nativescript-vue/nativescript-vue/commit/be95893)), closes [#481](https://github.com/nativescript-vue/nativescript-vue/issues/481)
58+
59+
60+
### Features
61+
62+
* **frame:** allow setting clearHistory and backstackVisible options for default pages. ([#514](https://github.com/nativescript-vue/nativescript-vue/issues/514)) ([d06a7bd](https://github.com/nativescript-vue/nativescript-vue/commit/d06a7bd))
63+
64+
65+
66+
<a name="2.3.0"></a>
67+
# [2.3.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.3.0-rc.2...v2.3.0) (2019-07-10)
68+
69+
70+
### Bug Fixes
71+
72+
* **listview:** correct items prop type check ([c770745](https://github.com/nativescript-vue/nativescript-vue/commit/c770745)), closes [#522](https://github.com/nativescript-vue/nativescript-vue/issues/522)
73+
* **listview:** fix prop type check ([5780bac](https://github.com/nativescript-vue/nativescript-vue/commit/5780bac)), closes [#522](https://github.com/nativescript-vue/nativescript-vue/issues/522)
74+
75+
76+
77+
<a name="2.3.0-rc.2"></a>
78+
# [2.3.0-rc.2](https://github.com/nativescript-vue/nativescript-vue/compare/v2.3.0-rc.1...v2.3.0-rc.2) (2019-07-03)
79+
80+
81+
### Bug Fixes
82+
83+
* import `frame` module before __onLiveSyncCore override ([#517](https://github.com/nativescript-vue/nativescript-vue/issues/517)) ([cbee066](https://github.com/nativescript-vue/nativescript-vue/commit/cbee066)), closes [NativeScript/nativescript-dev-webpack#943](https://github.com/NativeScript/nativescript-dev-webpack/issues/943)
84+
85+
86+
87+
<a name="2.3.0-rc.1"></a>
88+
# [2.3.0-rc.1](https://github.com/nativescript-vue/nativescript-vue/compare/v2.3.0-rc.0...v2.3.0-rc.1) (2019-07-01)
89+
90+
91+
### Bug Fixes
92+
93+
* import `application` module ([#512](https://github.com/nativescript-vue/nativescript-vue/issues/512)) ([3f03251](https://github.com/nativescript-vue/nativescript-vue/commit/3f03251))
94+
95+
96+
197
<a name="2.3.0-rc.0"></a>
298
# [2.3.0-rc.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.2.2...v2.3.0-rc.0) (2019-05-31)
399

‎build/config.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@ const genConfig = (name) => {
9494
pureExternalModules: id => id.startsWith('weex')
9595
},
9696
plugins: [
97+
replace({
98+
delimiters: ['', ''],
99+
// Patch devtools flush calls to use the global hook
100+
// rather than the devtools variable
101+
// which is undefined in most cases
102+
// and non-reactive
103+
'devtools && config.devtools': 'global.__VUE_DEVTOOLS_GLOBAL_HOOK__ && config.devtools',
104+
'devtools.emit(\'flush\')': 'global.__VUE_DEVTOOLS_GLOBAL_HOOK__.emit(\'flush\')',
105+
106+
// Replace empty .vue file components default element to avoid crashes
107+
'_c("div")': '_c("NativeContentView")'
108+
}),
97109
replace({
98110
__WEEX__: false,
99111
__VERSION__: VueVersion,
@@ -106,7 +118,9 @@ const genConfig = (name) => {
106118
'process.env.NS_VUE_VERSION': `process.env.NS_VUE_VERSION || '${NSVueVersion}'`
107119
}),
108120
flow(),
109-
buble(),
121+
buble({
122+
transforms: { asyncAwait: false }
123+
}),
110124
alias(aliases),
111125
resolve(),
112126
commonjs(),

‎build/sample-runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ inquirer
4141
})
4242

4343
function runPlatform(platform) {
44-
tns = spawn('tns', ['debug', platform, '--syncAllFiles', '--bundle'].concat(args), {
44+
tns = spawn('tns', ['debug', platform].concat(args), {
4545
cwd: path.resolve(__dirname, '../samples')
4646
})
4747

0 commit comments

Comments
 (0)
0