more fixes

Author: hansl

packages/angular-cli/models/webpack-build-typescript.ts

@@ -42,13 +42,15 @@ export const getWebpackNonAotConfigPartial = function(projectRoot: string, appCo
 
 export const getWebpackAotConfigPartial = function(projectRoot: string, appConfig: any) {
   return {
-    loaders: [
-      {
-        test: /\.ts$/,
-        loader: webpackLoader,
-        exclude: [/\.(spec|e2e)\.ts$/]
-      }
-    ],
+    module: {
+      loaders: [
+        {
+          test: /\.ts$/,
+          loader: webpackLoader,
+          exclude: [/\.(spec|e2e)\.ts$/]
+        }
+      ]
+    },
     plugins: [
       new NgcWebpackPlugin({
         project: path.resolve(projectRoot, appConfig.root, appConfig.tsconfig),

packages/webpack/package.json

@@ -4,10 +4,12 @@
   "description": "",
   "main": "./src/index.js",
   "license": "MIT",
+  "dependencies": {
+    "@angular-cli/ast-tools": "^1.0.0"
+  },
   "peerDependencies": {
     "typescript": "2.0.2",
     "@angular/compiler-cli": "^0.6.0",
-    "@angular/core": "^2.0.0",
-    "@angular-cli/ast-tools": "^1.0.0"
+    "@angular/core": "^2.0.0"
   }
 }

tests/e2e/setup/100-npm-link.ts

@@ -17,22 +17,21 @@ export default function (argv: any) {
       process.chdir(distAngularCli);
 
       // Update the package.json of each packages.
-      return Promise.resolve()
-        .then(() => Promise.all(Object.keys(packages).map(pkgName => {
-          const p = packages[pkgName];
+      return Promise.all(Object.keys(packages).map(pkgName => {
+        const p = packages[pkgName];
 
-          return updateJsonFile(join(p.dist, 'package.json'), json => {
-            for (const pkgName of Object.keys(packages)) {
-              if (json['dependencies'] && json['dependencies'][pkgName]) {
-                json['dependencies'][pkgName] = packages[pkgName].dist;
-              } else if (json['devDependencies'] && json['devDependencies'][pkgName]) {
-                json['devDependencies'][pkgName] = packages[pkgName].dist;
-              }
+        return updateJsonFile(join(p.dist, 'package.json'), json => {
+          for (const pkgName of Object.keys(packages)) {
+            if (json['dependencies'] && json['dependencies'][pkgName]) {
+              json['dependencies'][pkgName] = packages[pkgName].dist;
             }
-          });
-        }))
-        .then(() => npm('link'))
-        .then(() => process.chdir(oldCwd));
-    })
+            if (json['devDependencies'] && json['devDependencies'][pkgName]) {
+              json['devDependencies'][pkgName] = packages[pkgName].dist;
+            }
+          }
+        });
+      }))
+      .then(() => npm('link'))
+      .then(() => process.chdir(oldCwd))
     .then(() => exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng'));
 }