Skip to content

chore: update dependencies #1923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 31, 2019
Merged

chore: update dependencies #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f03224
chore: update @angular/compiler-cli dev dependency
Jul 30, 2019
8203b94
chore: update plugin to be only {N} 6.0 compatible
Jul 30, 2019
6ded112
chore: update @ngtools/webpack dev dep
Jul 30, 2019
9ebc1fe
chore: update test image for routable-animations
Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...outable-animations/e2e/resources/images/nsroanimations/iPhone 7 110/support.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 19 additions & 6 deletions nativescript-angular/bin/update-app-ng-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const path = require("path");
const fs = require("fs");

const browserDynamicDependency = "@angular/platform-browser-dynamic";
const binPath = __dirname;
const pluginPath = path.dirname(binPath);
const pluginPackageJsonPath = path.join(pluginPath, "package.json");
Expand All @@ -28,17 +27,31 @@ function updateDeps(deps, devDeps, newDeps) {
deps[dependencyName] = version;
}

console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
logUpdatedDependency(dependencyName, version);
});

const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular"));
const version = newDeps[ngDep];
if (deps["@angular/animations"]) {
deps["@angular/animations"] = version;
const animationsDependency = "@angular/animations";
if (deps[animationsDependency]) {
deps[animationsDependency] = version;
logUpdatedDependency(animationsDependency, version);
}

if (deps["@angular/compiler-cli"]) {
deps["@angular/compiler-cli"] = version;
const compilerCliDependency = "@angular/compiler-cli";
if (devDeps[compilerCliDependency]) {
devDeps[compilerCliDependency] = version;
logUpdatedDependency(compilerCliDependency, version);
}

const ngToolsWebpackDependency = "@ngtools/webpack";
if (devDeps[ngToolsWebpackDependency]) {
devDeps[ngToolsWebpackDependency] = version;
logUpdatedDependency(ngToolsWebpackDependency, version);
}

function logUpdatedDependency(dependencyName, version) {
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
}
}

Expand Down
20 changes: 6 additions & 14 deletions nativescript-angular/element-registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const frameMeta: ViewClassMeta = {
registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
registerElement("ActivityIndicator", () => require("tns-core-modules/ui/activity-indicator").ActivityIndicator);
registerElement("Border", () => require("tns-core-modules/ui/border").Border);
registerElement("BottomNavigation", () => require("tns-core-modules/ui/bottom-navigation").BottomNavigation);
registerElement("Button", () => require("tns-core-modules/ui/button").Button);
registerElement("ContentView", () => require("tns-core-modules/ui/content-view").ContentView);
registerElement("DatePicker", () => require("tns-core-modules/ui/date-picker").DatePicker);
Expand Down Expand Up @@ -202,7 +203,11 @@ registerElement("StackLayout", () => require("tns-core-modules/ui/layouts/stack-
registerElement("FlexboxLayout", () => require("tns-core-modules/ui/layouts/flexbox-layout").FlexboxLayout);
registerElement("Switch", () => require("tns-core-modules/ui/switch").Switch);
registerElement("TabView", () => require("tns-core-modules/ui/tab-view").TabView);

registerElement("TabStrip", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip);
registerElement("TabStripItem", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem);
registerElement("TabContentItem",
() => require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem);
registerElement("Tabs", () => require("tns-core-modules/ui/tabs").Tabs);
registerElement("TextField", () => require("tns-core-modules/ui/text-field").TextField);
registerElement("TextView", () => require("tns-core-modules/ui/text-view").TextView);
registerElement("TimePicker", () => require("tns-core-modules/ui/time-picker").TimePicker);
Expand All @@ -215,16 +220,3 @@ registerElement("DetachedContainer", () => require("tns-core-modules/ui/proxy-vi
{ skipAddToDom: true });

registerElement("page-router-outlet", () => require("tns-core-modules/ui/frame").Frame);

try {
let BottomNavigation = require("tns-core-modules/ui/bottom-navigation").BottomNavigation;
registerElement("BottomNavigation", function () { return BottomNavigation; });
let TabStrip = require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip;
registerElement("TabStrip", function () { return TabStrip; });
let TabStripItem = require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem;
registerElement("TabStripItem", function () { return TabStripItem; });
let TabContentItem = require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem;
registerElement("TabContentItem", function () { return TabContentItem; });
let Tabs = require("tns-core-modules/ui/tabs").Tabs;
registerElement("Tabs", function () { return Tabs; });
} catch (e) { }
6 changes: 3 additions & 3 deletions nativescript-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
],
"nativescript": {
"platforms": {
"android": "5.0.0",
"ios": "5.0.0"
"android": "6.0.0",
"ios": "6.0.0"
}
},
"keywords": [
Expand Down Expand Up @@ -54,7 +54,7 @@
"@angular/platform-browser": "~8.1.0",
"@angular/router": "~8.1.0",
"rxjs": "^6.3.3",
"tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0- || ^6.0.0 || >6.1.0-",
"tns-core-modules": "^6.0.0 || >6.1.0-",
"typescript": "~3.4.5",
"zone.js": "^0.9.1"
},
Expand Down