From 9aadd85dc1866a2943fa1093442fe492dc3f3a36 Mon Sep 17 00:00:00 2001 From: Jonathan Salomon Date: Mon, 18 Sep 2017 18:34:04 +0300 Subject: [PATCH] Moving dependency on nativescript-telerik-ui(-pro) to nativescript-pro-ui --- src/images.ios.ts | 4 +-- src/images.xml | 4 +-- src/package.json | 5 ++-- .../require-nativescript-telerik-ui.js | 27 ------------------- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 src/scripts/require-nativescript-telerik-ui.js diff --git a/src/images.ios.ts b/src/images.ios.ts index 417f3d2..3e0f4a0 100644 --- a/src/images.ios.ts +++ b/src/images.ios.ts @@ -4,7 +4,7 @@ import platform = require("tns-core-modules/platform"); import ui_frame = require("tns-core-modules/ui/frame"); import { Page } from "tns-core-modules/ui/page"; import { ActionBar, NavigationButton, ActionItems, ActionItem } from "tns-core-modules/ui/action-bar"; -import { RadListView, ListViewGridLayout } from "nativescript-telerik-ui/listview"; +import { RadListView, ListViewGridLayout } from "nativescript-pro-ui/listview"; let page; let list; @@ -33,7 +33,7 @@ export function done(args) { } export function imagesPageFactory(): Page { - // + // let page = new Page(); page.on(Page.loadedEvent, pageLoaded); diff --git a/src/images.xml b/src/images.xml index 5dc76fb..b63e08d 100644 --- a/src/images.xml +++ b/src/images.xml @@ -1,5 +1,5 @@ + xmlns:lv="nativescript-pro-ui/listview"> @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/src/package.json b/src/package.json index 18663ed..47c7d15 100644 --- a/src/package.json +++ b/src/package.json @@ -28,8 +28,7 @@ "plugin.tscwatch": "npm run tsc -- -w", "demo.ios": "npm i && npm run tsc && cd ../demo && tns run ios --syncAllFiles", "demo.android": "npm i && npm run tsc && cd ../demo && tns run android --syncAllFiles", - "clean": "rm -rf node_modules && cd ../demo && rm -rf hooks node_modules platforms && cd ../src && npm run plugin.link", - "postinstall": "node scripts/require-nativescript-telerik-ui.js" + "clean": "rm -rf node_modules && cd ../demo && rm -rf hooks node_modules platforms && cd ../src && npm run plugin.link" }, "keywords": [ "NativeScript", @@ -45,13 +44,13 @@ "homepage": "https://github.com/NativeScript/nativescript-imagepicker", "readmeFilename": "README.md", "devDependencies": { - "nativescript-telerik-ui": "^3.0.0", "tns-core-modules": "^3.1.0", "tns-platform-declarations": "^3.0.0", "typescript": "~2.3.0", "tslint": "~5.4.3" }, "dependencies": { + "nativescript-pro-ui": "^3.1.2", "nativescript-permissions": "~1.2.3" }, "bootstrapper": "nativescript-plugin-seed" diff --git a/src/scripts/require-nativescript-telerik-ui.js b/src/scripts/require-nativescript-telerik-ui.js deleted file mode 100644 index b4c8fa3..0000000 --- a/src/scripts/require-nativescript-telerik-ui.js +++ /dev/null @@ -1,27 +0,0 @@ -var path = require("path"), - projectPackageJsonFilename = path.join(__dirname, "..", "..", "..", "package.json"), - projectPackageJson; - -// ignore the remainder of the script if for some reason no package.json exists -try { projectPackageJson = require(projectPackageJsonFilename); } catch (ignore) { return; }; - -if(projectPackageJson.dependencies) { - // check if either nativescript-telerik-ui or nativescript-telerik-ui-pro are installed - var telerikui = projectPackageJson.dependencies["nativescript-telerik-ui"]; - var telerikuipro = projectPackageJson.dependencies["nativescript-telerik-ui-pro"]; - - // if neither are installed, add nativescript-telerik-ui to the project package.json as a dependency, - // so the user can always later decide to upgrade to nativescript-telerik-ui-pro. - if (telerikui === undefined && telerikuipro === undefined) { - - // we want to install the same version this plugin is tested with, so grab it from the devDependencies. - var pluginPackageJson = require(path.join(__dirname, "..", "package.json")); - var telerikuiversion = pluginPackageJson.devDependencies["nativescript-telerik-ui"]; - - // give the user a bit of feedback as installing this dependency take a while to complete. - console.log("The nativescript-imagepicker plugin requires nativescript-telerik-ui. Please wait while it's being added to your project..."); - require('child_process').execSync('npm i --save nativescript-telerik-ui@' + telerikuiversion, { cwd: path.join(__dirname, "..", "..")}); - console.log("nativescript-telerik-ui@" + telerikuiversion + " has been successfully installed and was added to your app's package.json."); - } -} -