Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(build) use custom index value when copying to 404.html during github deploy #3201

Merged
merged 2 commits into from
Nov 23, 2016
Merged

fix(build) use custom index value when copying to 404.html during github deploy #3201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc256d8
Update github-pages-deploy.ts
AnalogJ Nov 18, 2016
5786003
Update github-pages-deploy.ts
AnalogJ Nov 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/angular-cli/commands/github-pages-deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ const githubPagesDeployCommand = Command.extend({
const projectName = this.project.pkg.name;

const outDir = CliConfig.fromProject().config.apps[0].outDir;
const indexFilename = CliConfig.fromProject().config.apps[0].index;

let ghPagesBranch = 'gh-pages';
let destinationBranch = options.userPage ? 'master' : ghPagesBranch;
Expand Down Expand Up @@ -216,7 +217,7 @@ const githubPagesDeployCommand = Command.extend({
}

function createNotFoundPage() {
const indexHtml = path.join(root, 'index.html');
const indexHtml = path.join(root, indexFilename);
const notFoundPage = path.join(root, '404.html');
return fsCopy(indexHtml, notFoundPage);
}
Expand Down