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

fix(deploy): Fix base href for user pages #965

Merged
merged 2 commits into from
Jun 1, 2016
Merged

fix(deploy): Fix base href for user pages #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cedcc3e
fix(deploy): Fix base href for user pages
rockwotj May 31, 2016
77a72b8
style(lint): use single quotes for string
rockwotj May 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions addon/ng2/commands/github-pages-deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,13 @@ module.exports = Command.extend({
if (file === '.gitignore'){
// don't overwrite the .gitignore file
return Promise.resolve();
}
}
return fsCopy(path.join('dist', file), path.join('.', file))
})));
}

function updateBaseHref() {
if (options.userPage) return Promise.resolve();
let indexHtml = path.join(root, 'index.html');
return fsReadFile(indexHtml, 'utf8')
.then((data) => data.replace(/<base href="\/">/g, `<base href="/${projectName}/">`))
Expand All @@ -192,7 +193,8 @@ module.exports = Command.extend({
return execPromise('git remote -v')
.then((stdout) => {
let userName = stdout.match(/origin\s+(?:https:\/\/|git@)github\.com(?:\:|\/)([^\/]+)/m)[1].toLowerCase();
ui.writeLine(chalk.green(`Deployed! Visit https://${userName}.github.io/${projectName}/`));
let url = `https://${userName}.github.io/${options.userPage ? '' : (projectName + '/')}`;
ui.writeLine(chalk.green(`Deployed! Visit ${url}`));
ui.writeLine('Github pages might take a few minutes to show the deployed site.');
});
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/github-pages-deploy.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('Acceptance: ng github-pages:deploy', function() {
let indexHtml = path.join(process.cwd(), 'index.html');
return fsReadFile(indexHtml, 'utf8');
})
.then((data) => expect(data.search(`<base href="/${project}/">`)).to.not.equal(-1));
.then((data) => expect(data.search('<base href="/">')).to.not.equal(-1));
});

it('should create branch if needed', function() {
Expand Down