From 804a93f1e0d27b88d5277a6a192d104b9175b11f Mon Sep 17 00:00:00 2001 From: sqwk Date: Wed, 14 Sep 2016 10:35:31 +0200 Subject: [PATCH 1/2] fix(cli): Move Assets into Dist Root --- packages/angular-cli/models/webpack-build-common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts index 287dec4b9e86..e23781242ba5 100644 --- a/packages/angular-cli/models/webpack-build-common.ts +++ b/packages/angular-cli/models/webpack-build-common.ts @@ -154,7 +154,7 @@ export function getWebpackCommonConfig( context: path.resolve(appRoot, appConfig.assets), from: { glob: '**/*', dot: true }, ignore: [ '.gitkeep' ], - to: path.resolve(projectRoot, appConfig.outDir, appConfig.assets) + to: path.resolve(projectRoot, appConfig.outDir) }]) ], node: { From 741e4670bc7a62390936b7a6a047f4cc593cadb1 Mon Sep 17 00:00:00 2001 From: sqwk Date: Wed, 14 Sep 2016 11:01:33 +0200 Subject: [PATCH 2/2] test(assets): Fix Asset Tests --- tests/e2e/tests/misc/assets.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/tests/misc/assets.ts b/tests/e2e/tests/misc/assets.ts index aed01b53cf26..0d3821809f25 100644 --- a/tests/e2e/tests/misc/assets.ts +++ b/tests/e2e/tests/misc/assets.ts @@ -7,7 +7,7 @@ export default function() { return writeFile('src/assets/.file', '') .then(() => writeFile('src/assets/test.abc', 'hello world')) .then(() => ng('build')) - .then(() => expectFileToExist('dist/assets/.file')) - .then(() => expectFileToMatch('dist/assets/test.abc', 'hello world')) - .then(() => expectToFail(() => expectFileToExist('dist/assets/.gitkeep'))); + .then(() => expectFileToExist('dist/.file')) + .then(() => expectFileToMatch('dist/test.abc', 'hello world')) + .then(() => expectToFail(() => expectFileToExist('dist/.gitkeep'))); }