Merge branch 'master' into master

suau · web-flow · commit efd5b9036c2e · 2016-10-17T17:43:08.000+08:00
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
-    "compression-webpack-plugin": "github:webpack/compression-webpack-plugin#7e55907cd54a2e91b96d25a660acc6a2a6453f54",
+    "compression-webpack-plugin": "^0.3.2",
     "core-js": "^2.4.0",
     "css-loader": "^0.23.1",
     "denodeify": "^1.2.1",
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/app/shared/index.ts b/packages/angular-cli/blueprints/ng2/files/__path__/app/shared/index.ts
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
@@ -38,7 +38,7 @@
     "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
-    "compression-webpack-plugin": "github:webpack/compression-webpack-plugin#7e55907cd54a2e91b96d25a660acc6a2a6453f54",
+    "compression-webpack-plugin": "^0.3.2",
     "core-js": "^2.4.0",
     "css-loader": "^0.23.1",
     "denodeify": "^1.2.1",
diff --git a/tests/acceptance/generate-class.spec.js b/tests/acceptance/generate-class.spec.js
@@ -48,16 +48,4 @@ describe('Acceptance: ng generate class', function () {
       expect(existsSync(path.join(testPath, 'my-class.model.ts'))).to.equal(true);
     });
   });
-
-  it(`ng generate class shared${path.sep}my-class`, function () {
-    return ng(['generate', 'class', 'shared/my-class']).then(() => {
-      expect(existsSync(path.join(testPath, 'shared', 'my-class.ts'))).to.equal(true);
-    });
-  });
-
-  it(`ng generate class shared${path.sep}my-class.model`, function () {
-    return ng(['generate', 'class', 'shared/my-class.model']).then(() => {
-      expect(existsSync(path.join(testPath, 'shared', 'my-class.model.ts'))).to.equal(true);
-    });
-  });
 });
diff --git a/tests/acceptance/generate-module.spec.js b/tests/acceptance/generate-module.spec.js
@@ -43,18 +43,4 @@ describe('Acceptance: ng generate module', function () {
       expect(existsSync(path.join(testPath, 'my-module', 'my-module.module.spec.ts'))).to.equal(true);
     });
   });
-
-  it(`ng generate module shared${path.sep}my-module`, function () {
-    return ng(['generate', 'module', 'shared/my-module']).then(() => {
-      expect(existsSync(path.join(testPath, 'shared', 'my-module', 'my-module.module.ts'))).to.equal(true);
-      expect(existsSync(path.join(testPath, 'shared', 'my-module', 'my-module.module.spec.ts'))).to.equal(false);
-    });
-  });
-
-  it(`ng generate module shared${path.sep}my-module --spec`, function () {
-    return ng(['generate', 'module', 'shared/my-module', '--spec']).then(() => {
-      expect(existsSync(path.join(testPath, 'shared', 'my-module', 'my-module.module.ts'))).to.equal(true);
-      expect(existsSync(path.join(testPath, 'shared', 'my-module', 'my-module.module.spec.ts'))).to.equal(true);
-    });
-  });
 });
diff --git a/tests/e2e/tests/build/ts-paths.ts b/tests/e2e/tests/build/ts-paths.ts
@@ -1,5 +1,5 @@
 import {updateTsConfig} from '../../utils/project';
-import {writeMultipleFiles, appendToFile} from '../../utils/fs';
+import {writeMultipleFiles, appendToFile, createDir} from '../../utils/fs';
 import {ng} from '../../utils/process';
 import {stripIndents} from 'common-tags';
 
@@ -16,6 +16,7 @@ export default function() {
       ]
     };
   })
+  .then(() => createDir('src/app/shared'))
   .then(() => writeMultipleFiles({
     'src/app/shared/meaning.ts': 'export var meaning = 42;',
     'src/app/shared/index.ts': `export * from './meaning'`
diff --git a/tests/e2e/utils/fs.ts b/tests/e2e/utils/fs.ts
@@ -53,6 +53,10 @@ export function moveFile(from: string, to: string) {
   });
 }
 
+export function createDir(path: string) {
+  _recursiveMkDir(path);
+}
+
 
 function _recursiveMkDir(path: string) {
   if (fs.existsSync(path)) {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ export function moveFile(from: string, to: string) {`
`53`	`53`	`});`
`54`	`54`	`}`
`55`	`55`
	`56`	`+export function createDir(path: string) {`
	`57`	`+ _recursiveMkDir(path);`
	`58`	`+}`
	`59`	`+`
`56`	`60`
`57`	`61`	`function _recursiveMkDir(path: string) {`
`58`	`62`	`if (fs.existsSync(path)) {`