File tree Expand file tree Collapse file tree 4 files changed +8
-33
lines changed Expand file tree Collapse file tree 4 files changed +8
-33
lines changed Original file line number Diff line number Diff line change 11const Command = require ( 'ember-cli/lib/models/command' ) ;
2- const win = require ( 'ember-cli/lib/utilities/windows-admin' ) ;
3-
4- // const Build = require('../tasks/build');
5- // const BuildWatch = require('../tasks/build-watch');
6-
7- var WebpackBuild = require ( '../tasks/build-webpack' ) ;
8- var WebpackBuildWatch = require ( '../tasks/build-webpack-watch' ) ;
2+ const WebpackBuild = require ( '../tasks/build-webpack' ) ;
3+ const WebpackBuildWatch = require ( '../tasks/build-webpack-watch' ) ;
94
105interface BuildOptions {
116 environment ?: string ;
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ import * as fs from 'fs';
77import * as fse from 'fs-extra' ;
88import * as path from 'path' ;
99import * as BuildTask from 'ember-cli/lib/tasks/build' ;
10- import * as win from 'ember-cli/lib/utilities/windows-admin' ;
1110import * as CreateGithubRepo from '../tasks/create-github-repo' ;
1211
1312const fsReadFile = Promise . denodeify ( fs . readFile ) ;
@@ -117,8 +116,7 @@ module.exports = Command.extend({
117116
118117 function build ( ) {
119118 if ( options . skipBuild ) return Promise . resolve ( ) ;
120- return win . checkWindowsElevation ( ui )
121- . then ( ( ) => buildTask . run ( buildOptions ) ) ;
119+ return buildTask . run ( buildOptions ) ;
122120 }
123121
124122 function saveStartingBranchName ( ) {
Original file line number Diff line number Diff line change @@ -3,10 +3,8 @@ const Command = require('ember-cli/lib/models/command');
33const Promise = require ( 'ember-cli/lib/ext/promise' ) ;
44const SilentError = require ( 'silent-error' ) ;
55const PortFinder = require ( 'portfinder' ) ;
6- const win = require ( 'ember-cli/lib/utilities/windows-admin' ) ;
76const EOL = require ( 'os' ) . EOL ;
87
9-
108PortFinder . basePort = 49152 ;
119
1210const getPort = Promise . denodeify ( PortFinder . getPort ) ;
@@ -81,9 +79,7 @@ module.exports = Command.extend({
8179 project : this . project ,
8280 } ) ;
8381
84- return win . checkWindowsElevation ( this . ui ) . then ( function ( ) {
85- return serve . run ( commandOptions ) ;
86- } ) ;
82+ return serve . run ( commandOptions ) ;
8783 } ) ;
8884 } ,
8985
Original file line number Diff line number Diff line change 11'use strict' ;
22
3- var TestCommand = require ( 'ember-cli/lib/commands/test' ) ;
4- var win = require ( 'ember-cli/lib/utilities/windows-admin' ) ;
5-
3+ const TestCommand = require ( 'ember-cli/lib/commands/test' ) ;
64const config = require ( '../models/config' ) ;
75const TestTask = require ( '../tasks/test' ) ;
86
@@ -27,23 +25,11 @@ module.exports = TestCommand.extend({
2725 project : this . project
2826 } ) ;
2927
30- if ( commandOptions . watch ) {
31- return win . checkWindowsElevation ( this . ui )
32- . then (
33- ( ) => {
34- } ,
35- ( ) => {
36- /* handle build error to allow watch mode to start */
37- } )
38- . then ( ( ) => testTask . run ( commandOptions ) ) ;
39- } else {
28+ if ( ! commandOptions . watch ) {
4029 // if not watching ensure karma is doing a single run
4130 commandOptions . singleRun = true ;
42- return win . checkWindowsElevation ( this . ui )
43- . then ( ( ) => {
44- return testTask . run ( commandOptions ) ;
45- } ) ;
46- }
31+ }
32+ return testTask . run ( commandOptions ) ;
4733 }
4834} ) ;
4935
You can’t perform that action at this time.
0 commit comments