Skip to content
This repository was archived by the owner on Sep 11, 2018. It is now read-only.

Commit 23c9c18

Browse files
author
Sean Perkins
authored
Merge pull request #86 from TeamMaestro/angular-5-release
Upgrade NativeScript to Angular 5 Release
2 parents 37b4dcd + 28019b0 commit 23c9c18

16 files changed

+20762
-259
lines changed
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
require('application');
2-
require('ui/frame');
3-
require('ui/frame/activity');
2+
if (!global['__snapshot']) {
3+
// In case snapshot generation is enabled these modules will get into the bundle
4+
// but will not be required/evaluated.
5+
// The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
6+
// This way, they will be evaluated on app start as early as possible.
7+
require('ui/frame');
8+
require('ui/frame/activity');
9+
}
Lines changed: 3 additions & 0 deletions
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;

nativescript/app/vendor.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
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');
411
require('@angular/platform-browser');
512
require('@angular/core');
613
require('@angular/common');
714
require('@angular/forms');
8-
require('@angular/http');
915
require('@angular/router');
1016

1117
require('nativescript-angular/platform-static');

0 commit comments

Comments
 (0)