Skip to content

Commit bef59ed

Browse files
committed
Updates after rebase
1 parent 8df50a9 commit bef59ed

File tree

3 files changed

+187
-69
lines changed

3 files changed

+187
-69
lines changed

package-lock.json

Lines changed: 185 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"tslint": "5.18.0"
105105
},
106106
"dependencies": {
107-
"@dojo/webpack-contrib": "8.0.0-alpha.1",
107+
"@dojo/webpack-contrib": "file:~/Projects/opensource/webpack-contrib/dist/release/dojo-webpack-contrib-8.0.0-pre.tgz",
108108
"@typescript-eslint/eslint-plugin": "2.34.0",
109109
"@typescript-eslint/parser": "2.34.0",
110110
"caniuse-lite": "1.0.30000973",

src/main.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import unitConfigFactory from './unit.config';
2020
import functionalConfigFactory from './functional.config';
2121
import distConfigFactory from './dist.config';
2222
import electronConfigFactory from './electron.config';
23-
import logger from './logger';
2423
import { moveBuildOptions } from './util/eject';
2524
import logger from './logger';
2625
import { readFileSync } from 'fs';
@@ -83,7 +82,7 @@ function serveStatic(
8382
}
8483
}
8584

86-
function build(configs: webpack.Configuration[], args: any, spinner?: ora.Ora) {
85+
function build(configs: webpack.Configuration[], args: any) {
8786
const compiler = webpack(configs);
8887
const liveLogger = createLiveLogger('building').start();
8988
return new Promise<webpack.MultiCompiler>((resolve, reject) => {

0 commit comments

Comments
 (0)