File tree 4 files changed +8
-33
lines changed
4 files changed +8
-33
lines changed Original file line number Diff line number Diff line change 1
1
const 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' ) ;
9
4
10
5
interface BuildOptions {
11
6
environment ?: string ;
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ import * as fs from 'fs';
7
7
import * as fse from 'fs-extra' ;
8
8
import * as path from 'path' ;
9
9
import * as BuildTask from 'ember-cli/lib/tasks/build' ;
10
- import * as win from 'ember-cli/lib/utilities/windows-admin' ;
11
10
import * as CreateGithubRepo from '../tasks/create-github-repo' ;
12
11
13
12
const fsReadFile = Promise . denodeify ( fs . readFile ) ;
@@ -117,8 +116,7 @@ module.exports = Command.extend({
117
116
118
117
function build ( ) {
119
118
if ( options . skipBuild ) return Promise . resolve ( ) ;
120
- return win . checkWindowsElevation ( ui )
121
- . then ( ( ) => buildTask . run ( buildOptions ) ) ;
119
+ return buildTask . run ( buildOptions ) ;
122
120
}
123
121
124
122
function saveStartingBranchName ( ) {
Original file line number Diff line number Diff line change @@ -3,10 +3,8 @@ const Command = require('ember-cli/lib/models/command');
3
3
const Promise = require ( 'ember-cli/lib/ext/promise' ) ;
4
4
const SilentError = require ( 'silent-error' ) ;
5
5
const PortFinder = require ( 'portfinder' ) ;
6
- const win = require ( 'ember-cli/lib/utilities/windows-admin' ) ;
7
6
const EOL = require ( 'os' ) . EOL ;
8
7
9
-
10
8
PortFinder . basePort = 49152 ;
11
9
12
10
const getPort = Promise . denodeify ( PortFinder . getPort ) ;
@@ -81,9 +79,7 @@ module.exports = Command.extend({
81
79
project : this . project ,
82
80
} ) ;
83
81
84
- return win . checkWindowsElevation ( this . ui ) . then ( function ( ) {
85
- return serve . run ( commandOptions ) ;
86
- } ) ;
82
+ return serve . run ( commandOptions ) ;
87
83
} ) ;
88
84
} ,
89
85
Original file line number Diff line number Diff line change 1
1
'use strict' ;
2
2
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' ) ;
6
4
const config = require ( '../models/config' ) ;
7
5
const TestTask = require ( '../tasks/test' ) ;
8
6
@@ -27,23 +25,11 @@ module.exports = TestCommand.extend({
27
25
project : this . project
28
26
} ) ;
29
27
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 ) {
40
29
// if not watching ensure karma is doing a single run
41
30
commandOptions . singleRun = true ;
42
- return win . checkWindowsElevation ( this . ui )
43
- . then ( ( ) => {
44
- return testTask . run ( commandOptions ) ;
45
- } ) ;
46
- }
31
+ }
32
+ return testTask . run ( commandOptions ) ;
47
33
}
48
34
} ) ;
49
35
You can’t perform that action at this time.
0 commit comments