Skip to content

fix: remove ember references in console output #4026

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

Merged
merged 3 commits into from Jan 15, 2017
Merged

fix: remove ember references in console output #4026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb35ba
fix: remove ember references in console output
Jan 15, 2017
71a9a11
remove windows elevation check
Jan 15, 2017
955c77e
Merge branch 'master' into clean-ember-refs
hansl Jan 15, 2017
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
4 changes: 2 additions & 2 deletions packages/angular-cli/ember-cli/lib/cli/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ CLI.prototype.run = function(environment) {
if (!platform.isValid && !this.testing) {
if (platform.isDeprecated) {
this.ui.writeDeprecateLine('Node ' + process.version +
' is no longer supported by Ember CLI. Please update to a more recent version of Node');
' is no longer supported by Angular CLI. Please update to a more recent version of Node');
}

if (platform.isUntested) {
this.ui.writeWarnLine('WARNING: Node ' + process.version +
' has currently not been tested against Ember CLI and may result in unexpected behaviour.');
' has currently not been tested against Angular CLI and may result in unexpected behaviour.');
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/angular-cli/ember-cli/lib/commands/generate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ module.exports = Command.extend({
var blueprintName = rawArgs[0];

if (!blueprintName) {
return Promise.reject(new SilentError('The `ember generate` command requires a ' +
return Promise.reject(new SilentError('The `ng generate` command requires a ' +
'blueprint name to be specified. ' +
'For more details, use `ember help`.'));
'For more details, use `ng help`.'));
}
var Task = this.tasks.GenerateFromBlueprint;
var task = new Task({
Expand Down
3 changes: 1 addition & 2 deletions packages/angular-cli/ember-cli/lib/utilities/windows-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ module.exports = {

if (!elevated && ui && ui.writeLine) {
ui.writeLine(chalk.yellow('\nRunning without elevated rights. ' +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think this is false now, since we don't use Broccoli. But I don't have a windows computer to test this. Could you try running it in non-admin, and admin, and say run a ng build/ng version/ng test and see if that makes a difference? If so then we should keep it, otherwise just remove the warning. It's noise :)

'Running Ember CLI "as Administrator" increases performance significantly.'));
ui.writeLine('See ember-cli.com/user-guide/#windows for details.\n');
'Running Angular CLI "as Administrator" increases performance significantly.'));
}

resolve({
Expand Down