angular
diff --git a/‎package.json‎
Lines changed: 1 addition & 1 deletion b/‎package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/angular-cli/blueprints/rt-component/index.js‎
Lines changed: 16 additions & 1 deletion b/‎packages/angular-cli/blueprints/rt-component/index.js‎
Lines changed: 16 additions & 1 deletion
diff --git a/‎packages/angular-cli/models/webpack-build-production.ts‎
Lines changed: 7 additions & 5 deletions b/‎packages/angular-cli/models/webpack-build-production.ts‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎packages/angular-cli/models/webpack-build-typescript.ts‎
Lines changed: 6 additions & 6 deletions b/‎packages/angular-cli/models/webpack-build-typescript.ts‎
Lines changed: 6 additions & 6 deletions
@@ -127,7 +127,7 @@
     "svg-sprite-loader": "0.0.31",
     "temp": "0.8.3",
     "through": "^2.3.6",
-    "ts-loader": "^0.8.2",
+    "ts-loader": "1.2.2",
     "tslint": "^3.15.1",
     "tslint-loader": "^2.1.4",
     "typescript": "~2.0.3",
 
@@ -108,7 +108,22 @@ module.exports = {
     // Return custom template variables here.
     return {
       __path__: () => {
-        return `src/app/ui/components/${options.locals.rtKind.toLowerCase().replace(' ','-')}/${options.dasherizedModuleName}`;
+        var dir = this.dynamicPath.dir;
+        if (!options.locals.flat) {
+          dir += path.sep + options.dasherizedModuleName;
+        }
+        var srcDir = this.project.ngConfig.apps[0].root;
+        var kindDirname = options.locals.rtKind.toLowerCase().replace(' ','-');
+        var kindMatch = dir.match(/.*\/components\/ui\/(.*)\/.*$/);
+
+        this.appDir = dir.substr(dir.indexOf(srcDir) + srcDir.length);
+        this.generatePath = dir;
+
+        if(kindMatch) {
+          return dir;
+        }
+
+        return `src/app/ui/components/${kindDirname}/${options.dasherizedModuleName}`
       },
       __styleext__: () => {
         return this.styleExt;
 
@@ -24,9 +24,9 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf
     devtool: 'source-map',
     output: {
       path: path.resolve(projectRoot, appConfig.outDir),
-      filename: '[name].[chunkhash].bundle.js',
-      sourceMapFilename: '[name].[chunkhash].bundle.map',
-      chunkFilename: '[id].[chunkhash].chunk.js'
+      filename: '[name].[hash].bundle.js',
+      sourceMapFilename: '[name].[hash].bundle.map',
+      chunkFilename: '[id].[hash].chunk.js'
     },
     module: {
       rules: [
@@ -57,6 +57,7 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf
         'process.env.NODE_ENV': JSON.stringify('production')
       }),
       new webpack.optimize.UglifyJsPlugin(<any>{
+        warnings: false,
         mangle: { screw_ie8 : true },
         compress: { screw_ie8: true },
         sourceMap: true
@@ -72,8 +73,9 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf
         options: {
           postcss: [
             require('postcss-discard-comments')
-          ]
-        }
+          ],
+          resolve: {}
+        },
       })
     ]
   };
 
@@ -19,7 +19,7 @@ export const getWebpackNonAotConfigPartial = function(projectRoot: string, appCo
     resolve: {
       plugins: [
         new atl.TsConfigPathsPlugin({
-          tsconfig: path.resolve(appRoot, appConfig.tsconfig)
+          configFileName: path.resolve(appRoot, appConfig.tsconfig)
         })
       ]
     },
@@ -30,21 +30,21 @@ export const getWebpackNonAotConfigPartial = function(projectRoot: string, appCo
           loaders: [{
             loader: '@angularclass/hmr-loader'
           },{
-            loader: 'awesome-typescript-loader',
+            loader: 'ts-loader',
             query: {
-              forkChecker: true,
-              tsconfig: path.resolve(appRoot, appConfig.tsconfig)
+              configFileName: path.resolve(appRoot, appConfig.tsconfig),
+              // transpileOnly: true
             }
           }, {
             loader: 'angular2-template-loader'
           }],
-          exclude: [/\.(spec|e2e)\.ts$/]
+          exclude: [/node_modules/, /\.(spec)\.ts$/]
         }
       ],
     },
     plugins: [
       new webpack.ContextReplacementPlugin(/.*/, appRoot, lazyModules),
-      new atl.ForkCheckerPlugin(),
+      // new atl.ForkCheckerPlugin(),
     ]
   };
 };