Skip to content

Commit eca8e09

Browse files
NickIlievVasil Chimev
authored and
Vasil Chimev
committed
refactor: update Angular-5 and WebPack dependencies (#245)
* refactor: Update Angular-5 and WebPack dependencies Updated all dependencies and devDependencies to comply with the next branches of nativescript-angular and nativescript-dev-webpack * refactor: added tilde for app.css + updated vendor.ts file * chore: bump version of runtimes, rxjs and tsc * refactor: update tsconfig.json file
1 parent 8d016b1 commit eca8e09

9 files changed

+1920
-1267
lines changed

Diff for: app/app.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import 'nativescript-theme-core/css/core.light.css';
1+
@import '~nativescript-theme-core/css/core.light.css';

Diff for: app/vendor-platform.android.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ if (!global["__snapshot"]) {
44
// but will not be required/evaluated.
55
// The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
66
// This way, they will be evaluated on app start as early as possible.
7-
87
require("ui/frame");
98
require("ui/frame/activity");
109
}

Diff for: app/vendor-platform.ios.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// There is a bug in angular: https://github.com/angular/angular-cli/pull/8589/files
2+
// Legendary stuff, its webpack plugin pretty much doesn't work with empty TypeScript files in v1.8.3
3+
void 0;

Diff for: app/vendor.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
// Snapshot the ~/app.css and the theme
2+
const application = require("application");
3+
require("ui/styling/style-scope");
4+
const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
5+
global.registerWebpackModules(appCssContext);
6+
application.loadAppCss();
7+
18
require("./vendor-platform");
29

310
require("reflect-metadata");
@@ -9,6 +16,5 @@ require("@angular/http");
916
require("@angular/router");
1017

1118
require("nativescript-angular/platform-static");
12-
require("nativescript-angular/router");
1319
require("nativescript-angular/forms");
14-
20+
require("nativescript-angular/router");

0 commit comments

Comments
 (0)