diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index cd7b64df..37f7de73 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,5 +1,9 @@ - \ No newline at end of file + + + +--> diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 566955a0..918888b3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,8 +7,12 @@ assignees: '' --- - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 2b490179..da6bae66 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,8 +7,12 @@ assignees: '' --- - diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index 3dbe72d1..00000000 --- a/.github/main.workflow +++ /dev/null @@ -1,9 +0,0 @@ -workflow "Run issue bot" { - on = "issues" - resolves = ["nativescript-vue/issue-bot-action"] -} - -action "nativescript-vue/issue-bot-action" { - uses = "nativescript-vue/issue-bot-action@master" - secrets = ["BOT_TOKEN", "GH_TOKEN"] -} diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml new file mode 100644 index 00000000..424da9f6 --- /dev/null +++ b/.github/workflows/issues.yml @@ -0,0 +1,13 @@ +on: issues +name: Run issue bot +jobs: + build: + name: nativescript-vue/issue-bot-action + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: nativescript-vue/issue-bot-action + uses: nativescript-vue/issue-bot-action@master + env: + BOT_TOKEN: ${{ secrets.BOT_TOKEN }} + GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.travis.yml b/.travis.yml index 7a796c96..4484df0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: env: - WebpackiOS="12.0" - Type="VueJS" - osx_image: xcode10.0 + osx_image: xcode11 language: node_js node_js: "11" jdk: oraclejdk8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 41ff5e2b..0b05c621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ + +# [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) + + +### Bug Fixes + +* **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) +* honour the ID of the components in the App ([#541](https://github.com/nativescript-vue/nativescript-vue/issues/541)) ([a2b0cd6](https://github.com/nativescript-vue/nativescript-vue/commit/a2b0cd6)) +* look for parent Frame instead of a NavigationEntry ([7147a9f](https://github.com/nativescript-vue/nativescript-vue/commit/7147a9f)) + + +### Features + +* improve modals in DevTools ([8677a52](https://github.com/nativescript-vue/nativescript-vue/commit/8677a52)) + + + # [2.5.0-alpha.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.4.0...v2.5.0-alpha.0) (2019-08-24) diff --git a/README.md b/README.md index 800a3f37..24870017 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ and these awesome backers: - Teon Ooi - Thomas Kuhlmann - Abdullah Al Mashmoum +- Stian Γ…rsnes If you'd like to join them, please consider [becoming a backer / sponsor on Patreon](https://www.patreon.com/rigor789). diff --git a/package-lock.json b/package-lock.json index 33cd780d..4b26e3ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nativescript-vue", - "version": "2.5.0-alpha.1", + "version": "2.5.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0212c831..5ffa15fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-vue", - "version": "2.5.0-alpha.1", + "version": "2.5.0-alpha.2", "description": "NativeScript and Vue integration", "main": "dist/index.js", "files": [ diff --git a/packages/nativescript-vue-template-compiler/package.json b/packages/nativescript-vue-template-compiler/package.json index 70d90f0a..2f08072f 100644 --- a/packages/nativescript-vue-template-compiler/package.json +++ b/packages/nativescript-vue-template-compiler/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-vue-template-compiler", - "version": "2.5.0-alpha.1", + "version": "2.5.0-alpha.2", "description": "template compiler for nativescript-vue", "main": "index.js", "repository": { diff --git a/platform/nativescript/compiler/modules/router.js b/platform/nativescript/compiler/modules/router.js index fcf9f414..d6d801d1 100644 --- a/platform/nativescript/compiler/modules/router.js +++ b/platform/nativescript/compiler/modules/router.js @@ -3,7 +3,11 @@ import { addAttr } from 'compiler/helpers' function preTransformNode(el) { if (el.tag !== 'router-view') return - if (normalizeElementName(el.parent.tag) === 'nativeframe') { + if ( + el.parent && + el.parent.tag && + normalizeElementName(el.parent.tag) === 'nativeframe' + ) { addAttr(el.parent, 'hasRouterView', 'true') } } diff --git a/platform/nativescript/runtime/components/list-view.js b/platform/nativescript/runtime/components/list-view.js index 1460198d..c11a1abb 100644 --- a/platform/nativescript/runtime/components/list-view.js +++ b/platform/nativescript/runtime/components/list-view.js @@ -60,10 +60,10 @@ export default { } this.$refs.listView.setAttribute( - '_itemTemplatesInternal', + 'itemTemplates', this.$templates.getKeyedTemplates() ) - this.$refs.listView.setAttribute('_itemTemplateSelector', (item, index) => { + this.$refs.listView.setAttribute('itemTemplateSelector', (item, index) => { return this.$templates.selectorFn(this.getItemContext(item, index)) }) }, diff --git a/platform/nativescript/util/index.js b/platform/nativescript/util/index.js index 332fbaf5..b9eb1289 100644 --- a/platform/nativescript/util/index.js +++ b/platform/nativescript/util/index.js @@ -93,25 +93,6 @@ export function after(original, thisArg, wrap) { } } -export function deepProxy(object, depth = 0) { - return new Proxy(object, { - get(target, key) { - if (key === 'toString' || key === 'valueOf') { - return () => '' - } - - if (key === Symbol.toPrimitive) { - return hint => hint - } - - if (depth > 10) { - throw new Error('deepProxy over 10 deep.') - } - return deepProxy({}, depth + 1) - } - }) -} - export function updateDevtools() { if (global.__VUE_DEVTOOLS_GLOBAL_HOOK__) { try { diff --git a/samples/app/220.js b/samples/app/220.js index 1d7bb09b..8f41be34 100644 --- a/samples/app/220.js +++ b/samples/app/220.js @@ -21,7 +21,7 @@ new Vue({ template: ` - + diff --git a/samples/app/339.js b/samples/app/339.js index 5efddc74..76500ae5 100644 --- a/samples/app/339.js +++ b/samples/app/339.js @@ -7,7 +7,7 @@ let step1_id = 0 const Step1 = { template: ` - + - - - ` -} -const Bar = { - template: ` - - - - - -