feat: use scoped nativescript packages (#589)

* chore: upgrade the samples to NS 6.2 * feat: use the new NPM scoped packages of NS 6.2 * feat: more changes to NS 6.2 NPM scoped packages
nativescript-vue · Nov 29, 2019 · 121c11d · 121c11d
1 parent 14a34bc
commit 121c11d
Show file tree

Hide file tree

Showing 20 changed files with 112 additions and 100 deletions.
diff --git a/__tests__/renderer/ViewNode.test.js b/__tests__/renderer/ViewNode.test.js
@@ -8,7 +8,7 @@ jest.mock('renderer/utils', () => ({
   insertChild: jest.fn(),
   removeChild: jest.fn()
 }))
-jest.mock('tns-core-modules/platform', () => {
+jest.mock('@nativescript/core/platform', () => {
   return {
     isAndroid() {
     },

diff --git a/__tests__/renderer/utils.test.js b/__tests__/renderer/utils.test.js
@@ -1,18 +1,18 @@
 import * as utils from 'renderer/utils'
 
-jest.mock('tns-core-modules/ui/core/view', () => {
+jest.mock('@nativescript/core/ui/core/view', () => {
   return {
     View() {
     }
   }
 }, {virtual: true})
-jest.mock('tns-core-modules/ui/content-view', () => {
+jest.mock('@nativescript/core/ui/content-view', () => {
   return {
     ContentView() {
     }
   }
 }, {virtual: true})
-jest.mock('tns-core-modules/ui/layouts/layout-base', () => {
+jest.mock('@nativescript/core/ui/layouts/layout-base', () => {
   return {
     LayoutBase() {
     }
@@ -34,7 +34,7 @@ const getParentAndChild = (parentType) => {
 
 describe('utils', () => {
   test('isView', () => {
-    const View = require('tns-core-modules/ui/core/view').View;
+    const View = require('@nativescript/core/ui/core/view').View;
 
     expect(utils.isView()).toEqual(false)
     expect(utils.isView('a')).toEqual(false)
@@ -43,7 +43,7 @@ describe('utils', () => {
   })
 
   test('isLayout', () => {
-    const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
+    const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
 
     expect(utils.isLayout()).toEqual(false)
     expect(utils.isLayout('a')).toEqual(false)
@@ -52,7 +52,7 @@ describe('utils', () => {
   })
 
   test('isContentView', () => {
-    const ContentView = require('tns-core-modules/ui/content-view').ContentView;
+    const ContentView = require('@nativescript/core/ui/content-view').ContentView;
 
     expect(utils.isContentView()).toEqual(false)
     expect(utils.isContentView('a')).toEqual(false)
@@ -73,7 +73,7 @@ describe('utils', () => {
 
 
   test('insertChild adds childNode to Layout parent', () => {
-    const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
+    const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
     const {parentNode, childNode} = getParentAndChild(LayoutBase);
     parentNode.nativeView.addChild = jest.fn();
     childNode.nativeView.parent = null;
@@ -84,7 +84,7 @@ describe('utils', () => {
 
 
   test('insertChild adds childNode at index to Layout parent', () => {
-    const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
+    const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
     const {parentNode, childNode} = getParentAndChild(LayoutBase);
     parentNode.nativeView.insertChild = jest.fn();
     childNode.nativeView.parent = null;
@@ -94,7 +94,7 @@ describe('utils', () => {
   })
 
   test('insertChild removes childNode if the parent is the same Layout parent', () => {
-    const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
+    const LayoutBase = require('@nativescript/core/ui/layouts/layout-base').LayoutBase;
     const {parentNode, childNode} = getParentAndChild(LayoutBase);
     parentNode.nativeView.getChildIndex = jest.fn().mockReturnValueOnce(1).mockReturnValueOnce(-1);
     parentNode.nativeView.removeChild = jest.fn();
@@ -112,7 +112,7 @@ describe('utils', () => {
   })
 
   test('insertChild adds comment node to ContentView parent', () => {
-    const ContentView = require('tns-core-modules/ui/content-view').ContentView;
+    const ContentView = require('@nativescript/core/ui/content-view').ContentView;
     const {parentNode, childNode} = getParentAndChild(ContentView);
     childNode.nodeType = 8;
     parentNode.nativeView._addView = jest.fn();
@@ -122,7 +122,7 @@ describe('utils', () => {
   })
 
   test('insertChild sets content of ContentView parent', () => {
-    const ContentView = require('tns-core-modules/ui/content-view').ContentView;
+    const ContentView = require('@nativescript/core/ui/content-view').ContentView;
     const {parentNode, childNode} = getParentAndChild(ContentView);
 
     utils.insertChild(parentNode, childNode);

diff --git a/build/config.js b/build/config.js
@@ -47,7 +47,7 @@ const builds = {
     banner: banner('NativeScript-Vue'),
     intro,
     external(id) {
-      return id.startsWith('tns-core-modules') || id.startsWith('weex')
+      return id.startsWith('@nativescript') || id.startsWith('tns-core-modules') || id.startsWith('weex')
     },
   },
   'nativescript-vue-template-compiler': {