8000 fix: use preferred imports for ns7 · ashrafali46/nativescript-vue@4c38dfa · GitHub
[go: up one dir, main page]
Skip to content

Commit 4c38dfa

Browse files
rigor789rigor789
committed
fix: use preferred imports for ns7
1 parent 5c87653 commit 4c38dfa

File tree

11 files changed

+28
-50
lines changed

11 files changed

+28
-50
lines changed

‎__tests__/renderer/ViewNode.test.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ jest.mock('renderer/utils', () => ({
1414
insertChild: jest.fn(),
1515
removeChild: jest.fn()
1616
}))
17-
jest.mock('@nativescript/core/platform', () => {
18-
return {
19-
isAndroid() {
20-
},
21-
isIOS() {
22-
}
23-
}
24-
}, {virtual: true})
2517

2618
describe('ViewNode', () => {
2719
test('firstChild returns null initially', () => {

‎__tests__/renderer/utils.test.js

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
import * as utils from 'renderer/utils'
22

3-
jest.mock('@nativescript/core/ui/core/view', () => {
3+
jest.mock('@nativescript/core', () => {
44
return {
55
View() {
6-
}
7-
}
8-
}, {virtual: true})
9-
jest.mock('@nativescript/core/ui/content-view', () => {
10-
return {
6+
},
117
ContentView() {
12-
}
13-
}
14-
}, {virtual: true})
15-
jest.mock('@nativescript/core/ui/layouts/layout-base', () => {
16-
return {
8+
},
179
LayoutBase() {
1810
}
1911
}
@@ -34,7 +26,7 @@ const getParentAndChild = (parentType) => {
3426

3527
describe('utils', () => {
3628
test('isView', () => {
37-
const View = require('@nativescript/core/ui/core/view').View;
29+
const View = require('@nativescript/core').View;
3830

3931
expect(utils.isView()).toEqual(false)
4032
expect(utils.isView('a')).toEqual(false)
@@ -43,7 +35,7 @@ describe('utils', () => {
4335
})
4436

4537
test('isLayout', () => {
46-
const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
38+
const LayoutBase = require('@nativescript/core').LayoutBase;
4739

4840
expect(utils.isLayout()).toEqual(false)
4941
expect(utils.isLayout('a')).toEqual(false)
@@ -52,7 +44,7 @@ describe('utils', () => {
5244
})
5345

5446
test('isContentView', () => {
55-
const ContentView = require('@nativescript/core/ui/content-view').ContentView;
47+
const ContentView = require('@nativescript/core').ContentView;
5648

5749
expect(utils.isContentView()).toEqual(false)
5850
expect(utils.isContentView('a')).toEqual(false)
@@ -73,7 +65,7 @@ describe('utils', () => {
7365

7466

7567
test('insertChild adds childNode to Layout parent', () => {
76-
const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
68+
const LayoutBase = require('@nativescript/core').LayoutBase;
7769
const {parentNode, childNode} = getParentAndChild(LayoutBase);
7870
parentNode.nativeView.addChild = jest.fn();
7971
childNode.nativeView.parent = null;
@@ -84,7 +76,7 @@ describe('utils', () => {
8476

8577

8678
test('insertChild adds childNode at index to Layout parent', () => {
87-
const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
79+
const LayoutBase = require('@nativescript/core').LayoutBase;
8880
const {parentNode, childNode} = getParentAndChild(LayoutBase);
8981
parentNode.nativeView.insertChild = jest.fn();
9082
childNode.nativeView.parent = null;
@@ -94,7 +86,7 @@ describe('utils', () => {
9486
})
9587

9688
test('insertChild removes childNode if the parent is the same Layout parent', () => {
97-
const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
89+
const LayoutBase = require('@nativescript/core').LayoutBase;
9890
const {parentNode, childNode} = getParentAndChild(LayoutBase);
9991
parentNode.nativeView.getChildIndex = jest.fn().mockReturnValueOnce(1).mockReturnValueOnce(-1);
10092
parentNode.nativeView.removeChild = jest.fn();
@@ -112,7 +104,7 @@ describe('utils', () => {
112104
})
113105

114106
test('insertChild adds comment node to ContentView parent', () => {
115-
const ContentView = require('@nativescript/core/ui/content-view').ContentView;
107+
const ContentView = require('@nativescript/core').ContentView;
116108
const {parentNode, childNode} = getParentAndChild(ContentView);
117109
childNode.nodeType = 8;
118110
parentNode.nativeView._addView = jest.fn();
@@ -122,7 +114,7 @@ describe('utils', () => {
122114
})
123115

124116
test('insertChild sets content of ContentView parent', () => {
125-
const ContentView = require('@nativescript/core/ui/content-view').ContentView;
117+
const ContentView = require('@nativescript/core').ContentView;
126118
const {parentNode, childNode} = getParentAndChild(ContentView);
127119

128120
utils.insertChild(parentNode, childNode);
@@ -140,4 +132,4 @@ describe('utils', () => {
140132
expect(parentNode.nativeView._addChildFromBuilder.mock.calls.length).toBe(1);
141133
expect(parentNode.nativeView._addChildFromBuilder.mock.calls[0][0]).toEqual('test')
142134
})
143-
})
135+
})

‎platform/nativescript/framework.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ Vue.use(ModalPlugin)
1313
Vue.use(NavigatorPlugin)
1414

1515
global.__onLiveSyncCore = () => {
16-
const frame = require('@nativescript/core/ui/frame').Frame.topmost()
16+
const frame = require('@nativescript/core').Frame.topmost()
1717
if (frame) {
1818
if (frame.currentPage && frame.currentPage.modal) {
1919
frame.currentPage.modal.closeModal()
2020
}
2121

2222
if (frame.currentPage) {
2323
frame.currentPage.addCssFile(
24-
require('@nativescript/core/application').getCssFileName()
24+
require('@nativescript/core').getCssFileName()
2525
)
2626
}
2727
}
@@ -31,6 +31,6 @@ global.__onLiveSyncCore = () => {
3131
// module.export.default = Vue
3232
// so a `import Vue from 'nativescript-vue'` will
3333
// fail from a Typescript file
34-
Vue.default = Vue
34+
// Vue.default = Vue
3535

3636
export default Vue

‎platform/nativescript/plugins/navigator-plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function getFrameInstance(frame) {
2929
if (isObject(frame) && isDef(frame.$el)) {
3030
frame = frame.$el.nativeView
3131
} else if (isPrimitive(frame)) {
32-
frame = require('@nativescript/core/ui/frame').Frame.getFrameById(frame)
32+
frame = require('@nativescript/core').Frame.getFrameById(frame)
3333
} else if (isDef(frame.nativeView)) {
3434
frame = frame.nativeView
3535
}

‎platform/nativescript/renderer/ViewNode.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ export default class ViewNode {
9292

9393
/* istanbul ignore next */
9494
setAttribute(key, value) {
95-
const { isAndroid, isIOS } = require('@nativescript/core/platform')
95+
const isAndroid = global.isAndroid
96+
const isIOS = global.isIOS
9697
const nv = this.nativeView
9798

9899
try {
@@ -102,7 +103,7 @@ export default class ViewNode {
102103
// detect expandable attrs for boolean values
103104
// See https://vuejs.org/v2/guide/components-props.html#Passing-a-Boolean
104105
if (
105-
require('@nativescript/core/utils/types').isBoolean(nv[key]) &&
106+
require('@nativescript/core').Utils.isBoolean(nv[key]) &&
106107
value === ''
107108
) {
108109
value = true
@@ -116,9 +117,7 @@ export default class ViewNode {
116117
set(
117118
nv,
118119
key.slice(0, -7),
119-
require('@nativescript/core/xml').XmlParser._dereferenceEntities(
120-
value
121-
)
120+
require('@nativescript/core').XmlParser._dereferenceEntities(value)
122121
)
123122
} else {
124123
set(nv, key, value)

‎platform/nativescript/renderer/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
let View
22
export function isView(view) {
33
if (!View) {
4-
View = require('@nativescript/core/ui/core/view').View
4+
View = require('@nativescript/core').View
55
}
66
return view instanceof View
77
}
88

99
let LayoutBase
1010
export function isLayout(view) {
1111
if (!LayoutBase) {
12-
LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase
12+
LayoutBase = require('@nativescript/core').LayoutBase
1313
}
1414
return view instanceof LayoutBase
1515
}
1616

1717
let ContentView
1818
export function isContentView(view) {
1919
if (!ContentView) {
20-
ContentView = require('@nativescript/core/ui/content-view').ContentView
20+
ContentView = require('@nativescript/core').ContentView
2121
}
2222
return view instanceof ContentView
2323
}

‎platform/nativescript/runtime/components/android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
functional: true,
33
render(h, { children }) {
4-
if (require('@nativescript/core/platform').isAndroid) {
4+
if (global.isAndroid) {
55
return children
66
}
77
}

‎platform/nativescript/runtime/components/frame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default {
8888
},
8989

9090
_composeTransition(entry) {
91-
const isAndroid = require('@nativescript/core/platform').isAndroid
91+
const isAndroid = global.isAndroid
9292
const platformEntryProp = `transition${isAndroid ? 'Android' : 'iOS'}`
9393
const entryProp = entry[platformEntryProp]
9494
? platformEntryProp

‎platform/nativescript/runtime/components/ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
functional: true,
33
render(h, { children }) {
4-
if (require('@nativescript/core/platform').isIOS) {
4+
if (global.isIOS) {
55
return children
66
}
77
}

‎platform/nativescript/runtime/components/list-view.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ export default {
66
items: {
77
type: [Array, Object],
88
validator: val => {
9-
const ObservableArray = require('@nativescript/core/data/observable-array')
10-
.ObservableArray
9+
const ObservableArray = require('@nativescript/core').ObservableArray
1110
return Array.isArray(val) || val instanceof ObservableArray
1211
},
1312
required: true

0 commit comments

Comments
 (0)
0