diff --git a/package.json b/package.json
index 6baa2184f23490ea39078f377e30222e9c07acc0..0e2ed1f2b6ee12c695415341ea64ce9061599db7 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"license": "MIT",
"devDependencies": {
"@angular/compiler-cli": "^0.6.1",
- "@angular/platform-server": "^2.0.0-rc.7",
+ "@angular/platform-server": "^2.0.0",
"@angular/tsc-wrapped": "^0.3.0",
"async": "^2.0.0",
"autoprefixer": "^6.3.7",
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index ee4e05cfb1e436bd1fc5bd865702c387f33ee314..cf4d7613864aec442eaaf290fdcbbdb8c98b26a1 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -16,8 +16,5 @@
"noImplicitUseStrict": false,
"noFallthroughCasesInSwitch": true
},
- "compileOnSave": false,
- "files": [
- "typings.d.ts"
- ]
+ "compileOnSave": false
}
diff --git a/tools/config/seed-advanced.config.ts b/tools/config/seed-advanced.config.ts
index 8f8bddba1acb1fab4ef2db10157b609f09cb9081..5a288306b289a303dc3ef9bd5a8c370caf1684e0 100644
--- a/tools/config/seed-advanced.config.ts
+++ b/tools/config/seed-advanced.config.ts
@@ -41,13 +41,14 @@ export class SeedAdvancedConfig extends SeedConfig {
`${this.APP_BASE}node_modules/*/package.json`,
`${this.APP_BASE}node_modules/@ngrx/*/package.json`
];
+
if (!this.SYSTEM_CONFIG['packages']) this.SYSTEM_CONFIG['packages'] = {};
this.SYSTEM_CONFIG['packages']['@ngrx/core'] = {
- main: 'index.js',
+ main: 'bundles/core.umd.js',
defaultExtension: 'js'
};
this.SYSTEM_CONFIG['packages']['@ngrx/store'] = {
- main: 'index.js',
+ main: 'bundles/store.umd.js',
defaultExtension: 'js'
};
diff --git a/tools/config/seed.config.ts b/tools/config/seed.config.ts
index 686a75aeb0a4dddd8ede8cd5f45874c23cb69600..9f8b23b505b1111cac3a6dda48ff87398ade8975 100644
--- a/tools/config/seed.config.ts
+++ b/tools/config/seed.config.ts
@@ -1,4 +1,5 @@
import { join } from 'path';
+import * as slash from 'slash';
import { argv } from 'yargs';
import { Environments, InjectableDependency } from './seed.config.interfaces';
@@ -83,7 +84,7 @@ export class SeedConfig {
* The base path of node modules.
* @type {string}
*/
- NPM_BASE = join(this.APP_BASE, 'node_modules/');
+ NPM_BASE = slash(join(this.APP_BASE, 'node_modules/'));
/**
* The flag for the hot-loader option of the application.
@@ -490,26 +491,30 @@ export class SeedConfig {
*/
'browser-sync': {
middleware: [require('connect-history-api-fallback')({
- index: `${this.APP_BASE}index.html`,
-// rewrites: [
-// {
-// from: /^\/node_modules\/.*$/,
-// to: (context:any) => context.parsedUrl.pathname
-// },
-// {
-// from: new RegExp(`^${this.APP_BASE}${this.APP_SRC}$`),
-// to: (context:any) => context.parsedUrl.pathname
-// },
-// {
-// from: /^\/assets\/.*$/,
-// to: (context:any) => context.parsedUrl.pathname
-// },
-// {
-// from: /^\/css\/.*$/,
-// to: (context:any) => context.parsedUrl.pathname
-// }
-// ],
-// disableDotRule: true
+ index: `${this.APP_BASE}index.html`
+ // rewrites: [
+ // {
+ // from: new RegExp(`^${this.NPM_BASE}.*$`),
+ // to: (context:any) => context.parsedUrl.pathname
+ // },
+ // {
+ // from: new RegExp(`^\/${this.BOOTSTRAP_DIR}\/.*$`),
+ // to: (context:any) => context.parsedUrl.pathname
+ // },
+ // {
+ // from: new RegExp(`^${this.APP_BASE}${this.APP_SRC}\/.*$`),
+ // to: (context:any) => context.parsedUrl.pathname
+ // },
+ // {
+ // from: new RegExp(`^${this.ASSETS_SRC.replace(this.APP_SRC, '')}\/.*$`),
+ // to: (context:any) => context.parsedUrl.pathname
+ // },
+ // {
+ // from: new RegExp(`^${this.CSS_DEST.replace(this.APP_DEST, '')}\/.*$`),
+ // to: (context:any) => `/${slash(join(this.APP_DEST, context.parsedUrl.pathname))}`
+ // }
+ // ],
+ // disableDotRule: true
})],
port: this.PORT,
startPath: this.APP_BASE,
diff --git a/tools/tasks/seed/build.assets.prod.ts b/tools/tasks/seed/build.assets.prod.ts
index 2c35f25d0e8fd2327136ee5bfa85bcc7dd72a7fc..b08c07f078c13fd7471236fd204ae9fa7db8252a 100644
--- a/tools/tasks/seed/build.assets.prod.ts
+++ b/tools/tasks/seed/build.assets.prod.ts
@@ -22,6 +22,7 @@ var onlyDirs = function (es: any) {
export = () => {
return gulp.src([
join(Config.APP_SRC, '**'),
+ '!' + join(Config.APP_SRC, 'tsconfig.json'),
'!' + join(Config.APP_SRC, '**', '*.ts'),
'!' + join(Config.APP_SRC, '**', '*.css'),
'!' + join(Config.APP_SRC, '**', '*.html'),
diff --git a/tools/tasks/seed/build.index.dev.ts b/tools/tasks/seed/build.index.dev.ts
index 4c762509eed374e9f5eef0e16c1dbefa39c9d2ea..9bbc39802250b8d8c70c458ce3966cfcf6c319db 100644
--- a/tools/tasks/seed/build.index.dev.ts
+++ b/tools/tasks/seed/build.index.dev.ts
@@ -62,6 +62,9 @@ function mapPath(dep: any) {
*/
function transformPath() {
return function (filepath: string) {
+ if (filepath.startsWith(`/${Config.APP_DEST}`)) {
+ filepath = filepath.replace(`/${Config.APP_DEST}`, '');
+ }
if (Config.TARGET_DESKTOP) {
let path = join(Config.APP_BASE, filepath);
if (path.indexOf('dist/dev') > -1 || path.indexOf('dist\\dev') > -1) {
diff --git a/tools/tasks/seed/compile.ahead.prod.ts b/tools/tasks/seed/compile.ahead.prod.ts
index fc7e38ec9d05a97da4e48e484b6d617bf718ceab..0f1f75b236525991c7a1006cdea1e480bfba8d54 100644
--- a/tools/tasks/seed/compile.ahead.prod.ts
+++ b/tools/tasks/seed/compile.ahead.prod.ts
@@ -23,6 +23,8 @@ export = (done: any) => {
// Note: dirty hack until we're able to set config easier
copyFile('tsconfig.json', Config.TMP_DIR, join(Config.TMP_DIR, Config.BOOTSTRAP_DIR), (content: string) => {
const parsed = JSON.parse(content);
+ parsed.files = parsed.files || [];
+ parsed.files.push('typings.d.ts');
parsed.files.push('main.web.ts');
return JSON.stringify(parsed, null, 2);
});