Skip to content

Commit 5d4e22c

Browse files
author
Zdravko
authored
Merge pull request #1923 from NativeScript/hristova/update-dependencies
chore: update dependencies
2 parents 1ca60a0 + 9ebc1fe commit 5d4e22c

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed
Loading

Diff for: nativescript-angular/bin/update-app-ng-deps

+19-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const path = require("path");
44
const fs = require("fs");
55

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

31-
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
30+
logUpdatedDependency(dependencyName, version);
3231
});
3332

3433
const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular"));
3534
const version = newDeps[ngDep];
36-
if (deps["@angular/animations"]) {
37-
deps["@angular/animations"] = version;
35+
const animationsDependency = "@angular/animations";
36+
if (deps[animationsDependency]) {
37+
deps[animationsDependency] = version;
38+
logUpdatedDependency(animationsDependency, version);
3839
}
3940

40-
if (deps["@angular/compiler-cli"]) {
41-
deps["@angular/compiler-cli"] = version;
41+
const compilerCliDependency = "@angular/compiler-cli";
42+
if (devDeps[compilerCliDependency]) {
43+
devDeps[compilerCliDependency] = version;
44+
logUpdatedDependency(compilerCliDependency, version);
45+
}
46+
47+
const ngToolsWebpackDependency = "@ngtools/webpack";
48+
if (devDeps[ngToolsWebpackDependency]) {
49+
devDeps[ngToolsWebpackDependency] = version;
50+
logUpdatedDependency(ngToolsWebpackDependency, version);
51+
}
52+
53+
function logUpdatedDependency(dependencyName, version) {
54+
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
4255
}
4356
}
4457

Diff for: nativescript-angular/element-registry.ts

+6-14
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ const frameMeta: ViewClassMeta = {
175175
registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
176176
registerElement("ActivityIndicator", () => require("tns-core-modules/ui/activity-indicator").ActivityIndicator);
177177
registerElement("Border", () => require("tns-core-modules/ui/border").Border);
178+
registerElement("BottomNavigation", () => require("tns-core-modules/ui/bottom-navigation").BottomNavigation);
178179
registerElement("Button", () => require("tns-core-modules/ui/button").Button);
179180
registerElement("ContentView", () => require("tns-core-modules/ui/content-view").ContentView);
180181
registerElement("DatePicker", () => require("tns-core-modules/ui/date-picker").DatePicker);
@@ -202,7 +203,11 @@ registerElement("StackLayout", () => require("tns-core-modules/ui/layouts/stack-
202203
registerElement("FlexboxLayout", () => require("tns-core-modules/ui/layouts/flexbox-layout").FlexboxLayout);
203204
registerElement("Switch", () => require("tns-core-modules/ui/switch").Switch);
204205
registerElement("TabView", () => require("tns-core-modules/ui/tab-view").TabView);
205-
206+
registerElement("TabStrip", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip);
207+
registerElement("TabStripItem", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem);
208+
registerElement("TabContentItem",
209+
() => require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem);
210+
registerElement("Tabs", () => require("tns-core-modules/ui/tabs").Tabs);
206211
registerElement("TextField", () => require("tns-core-modules/ui/text-field").TextField);
207212
registerElement("TextView", () => require("tns-core-modules/ui/text-view").TextView);
208213
registerElement("TimePicker", () => require("tns-core-modules/ui/time-picker").TimePicker);
@@ -215,16 +220,3 @@ registerElement("DetachedContainer", () => require("tns-core-modules/ui/proxy-vi
215220
{ skipAddToDom: true });
216221

217222
registerElement("page-router-outlet", () => require("tns-core-modules/ui/frame").Frame);
218-
219-
try {
220-
let BottomNavigation = require("tns-core-modules/ui/bottom-navigation").BottomNavigation;
221-
registerElement("BottomNavigation", function () { return BottomNavigation; });
222-
let TabStrip = require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip;
223-
registerElement("TabStrip", function () { return TabStrip; });
224-
let TabStripItem = require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem;
225-
registerElement("TabStripItem", function () { return TabStripItem; });
226-
let TabContentItem = require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem;
227-
registerElement("TabContentItem", function () { return TabContentItem; });
228-
let Tabs = require("tns-core-modules/ui/tabs").Tabs;
229-
registerElement("Tabs", function () { return Tabs; });
230-
} catch (e) { }

Diff for: nativescript-angular/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
],
1515
"nativescript": {
1616
"platforms": {
17-
"android": "5.0.0",
18-
"ios": "5.0.0"
17+
"android": "6.0.0",
18+
"ios": "6.0.0"
1919
}
2020
},
2121
"keywords": [
@@ -54,7 +54,7 @@
5454
"@angular/platform-browser": "~8.1.0",
5555
"@angular/router": "~8.1.0",
5656
"rxjs": "^6.3.3",
57-
"tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0- || ^6.0.0 || >6.1.0-",
57+
"tns-core-modules": "^6.0.0 || >6.1.0-",
5858
"typescript": "~3.4.5",
5959
"zone.js": "^0.9.1"
6060
},

0 commit comments

Comments
 (0)