Skip to content

Commit 6d1f02b

Browse files
rigor789rigor789
authored
feat: upgrade to NS7 (nativescript-vue#709)
* feat: upgrade to NS7 * chore: clean up
1 parent 5a43705 commit 6d1f02b

Some content is hidden

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

81 files changed

+1765
-3394
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ matrix:
3131
jdk: oraclejdk8
3232
script:
3333
- 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"
34+
- cd samples && npm i && ns build ios --copy-to "./outputs/nativescript-vue-tests.app"
3535
- cd $IOS_PACKAGE_FOLDER_VUE && zip -r $IOS_PACKAGE_VUE nativescript-vue-tests.app
3636
- "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"
3737
- language: android
@@ -43,7 +43,7 @@ matrix:
4343
before_install: nvm install 11
4444
script:
4545
- 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"
46+
- cd samples && npm i && ns build android --copy-to "./outputs/nativescript-vue-tests.apk"
4747
- "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"
4848
- stage: "UI Tests"
4949
env:
@@ -91,5 +91,5 @@ before_install:
9191

9292
install:
9393
- echo no | npm install -g nativescript
94-
- tns usage-reporting disable
95-
- tns error-reporting disable
94+
- ns usage-reporting disable
95+
- ns error-reporting disable

‎build/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const builds = {
4747
banner: banner('NativeScript-Vue'),
4848
intro,
4949
external(id) {
50-
return id.startsWith('@nativescript') || id.startsWith('tns-core-modules') || id.startsWith('weex')
50+
return id.startsWith('@nativescript') || id.startsWith('weex')
5151
},
5252
},
5353
'nativescript-vue-template-compiler': {
@@ -57,7 +57,7 @@ const builds = {
5757
banner: banner('NativeScript-Vue-Template-Compiler'),
5858
external(id) {
5959
const deps = Object.keys(require('../packages/nativescript-vue-template-compiler/package.json').dependencies)
60-
return deps.includes(id) || id.startsWith('@nativescript') || id.startsWith('tns-core-modules') || id.startsWith('weex')
60+
return deps.includes(id) || id.startsWith('@nativescript') || id.startsWith('weex')
6161
}
6262
}
6363
}

‎build/sample-runner.js

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

‎package.json

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -67,37 +67,37 @@
6767
]
6868
},
6969
"dependencies": {
70-
"nativescript-hook": "0.2.5"
70+
"@nativescript/hook": "1.0.0"
7171
},
7272
"devDependencies": {
73-
"@babel/core": "^7.9.6",
73+
"@babel/core": "^7.11.4",
7474
"@babel/plugin-transform-flow-strip-types": "7.10.4",
75-
"@babel/preset-env": "7.10.4",
76-
"@commitlint/cli": "9.1.1",
77-
"@commitlint/config-conventional": "9.1.1",
78-
"@nativescript/core": "6.5.10",
75+
"@babel/preset-env": "7.11.0",
76+
"@commitlint/cli": "9.1.2",
77+
"@commitlint/config-conventional": "9.1.2",
78+
"@nativescript/core": "7.0.0-rc.54",
7979
"@rollup/plugin-alias": "3.1.1",
8080
"@rollup/plugin-buble": "0.21.3",
81-
"@rollup/plugin-commonjs": "14.0.0",
82-
"@rollup/plugin-node-resolve": "8.4.0",
81+
"@rollup/plugin-commonjs": "15.0.0",
82+
"@rollup/plugin-node-resolve": "9.0.0",
8383
"@rollup/plugin-replace": "2.3.3",
84-
"babel-jest": "26.1.0",
84+
"babel-jest": "26.3.0",
8585
"chalk": "4.1.0",
86-
"commitizen": "4.1.2",
87-
"conventional-changelog-cli": "2.0.34",
88-
"cz-conventional-changelog": "3.2.0",
86+
"commitizen": "4.2.1",
87+
"conventional-changelog-cli": "2.1.0",
88+
"cz-conventional-changelog": "3.3.0",
8989
"husky": "4.2.5",
90-
"inquirer": "7.3.2",
91-
"jest": "26.1.0",
92-
"jest-junit": "11.0.1",
93-
"lint-staged": "10.2.11",
94-
"prettier": "2.0.5",
95-
"rollup": "^2.10.5",
90+
"inquirer": "7.3.3",
91+
"jest": "26.4.2",
92+
"jest-junit": "11.1.0",
93+
"lint-staged": "10.2.13",
94+
"prettier": "2.1.1",
95+
"rollup": "^2.26.6",
9696
"rollup-plugin-flow-no-whitespace": "1.0.0",
9797
"rollup-plugin-resolve-aliases": "0.3.0",
9898
"semver": "7.3.2",
9999
"set-value": "3.0.2",
100-
"vue": "2.6.11"
100+
"vue": "2.6.12"
101101
},
102102
"jest": {
103103
"verbose": true,
@@ -126,17 +126,12 @@
126126
"husky": {
127127
"hooks": {
128128
"pre-commit": "lint-staged",
129-
"commit-msg": "commitlint -e $GIT_PARAMS"
129+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
130130
}
131131
},
132132
"lint-staged": {
133133
"{{platform,__test__}/**/*.js,samples/app/*.js}": [
134-
"prettier --write",
135-
"git add"
136-
],
137-
"docs/src/**/*.js": [
138-
"npm run build:docs",
139-
"git add"
134+
"prettier --write"
140135
]
141136
},
142137
"config": {

0 commit comments

Comments
 (0)