Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 06:41:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(@angular/cli): add trailing slash to deployUrl when missing

Browse Source 
Closes #7295
This commit is contained in:
tomastrajan 2017-12-05 17:27:39 +11:00 committed by Filipe Silva
parent b1558f2512
commit d53f45896b
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/@angular/cli/commands/build.ts
View File

@ -239,6 +239,11 @@ const BuildCommand = Command.extend({
commandOptions.forceTsCommonjs = true; commandOptions.forceTsCommonjs = true;
} }
// Add trailing slash if missing to prevent https://github.com/angular/angular-cli/issues/7295
if (commandOptions.deployUrl && commandOptions.deployUrl.substr(-1) !== '/') {
commandOptions.deployUrl += '/';
}
const BuildTask = require('../tasks/build').default; const BuildTask = require('../tasks/build').default;
const buildTask = new BuildTask({ const buildTask = new BuildTask({

11
tests/e2e/tests/build/deploy-url.ts
View File

@ -2,6 +2,7 @@ import { ng } from '../../utils/process';
import { copyProjectAsset } from '../../utils/assets'; import { copyProjectAsset } from '../../utils/assets';
import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs'; import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
import { updateJsonFile } from '../../utils/project'; import { updateJsonFile } from '../../utils/project';
import { getGlobalVariable } from '../../utils/env';
export default function () { export default function () {
@ -27,5 +28,13 @@ export default function () {
// verify --deploy-url is applied to non-extracted css urls // verify --deploy-url is applied to non-extracted css urls
.then(() => ng('build', '--deploy-url=deployUrl/', '--extract-css=false')) .then(() => ng('build', '--deploy-url=deployUrl/', '--extract-css=false'))
.then(() => expectFileToMatch('dist/styles.bundle.js', .then(() => expectFileToMatch('dist/styles.bundle.js',
/__webpack_require__.p \+ \"more\.[0-9a-f]{20}\.png\"/)); /__webpack_require__.p \+ \"more\.[0-9a-f]{20}\.png\"/))
.then(() => expectFileToMatch('dist/inline.bundle.js',
/__webpack_require__\.p = "deployUrl\/";/))
// verify slash is appended to the end of --deploy-url if missing
.then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
// skip this in ejected tests
.then(() => getGlobalVariable('argv').eject
? Promise.resolve()
: expectFileToMatch('dist/inline.bundle.js', /__webpack_require__\.p = "deployUrl\/";/));
} }