Skip to content

Commit

Permalink
Updates after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
maier49 committed Sep 14, 2020
1 parent 8df50a9 commit bef59ed
Show file tree
Hide file tree
Showing 3 changed files with 187 additions and 69 deletions.
251 changes: 185 additions & 66 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"tslint": "5.18.0"
},
"dependencies": {
"@dojo/webpack-contrib": "8.0.0-alpha.1",
"@dojo/webpack-contrib": "file:~/Projects/opensource/webpack-contrib/dist/release/dojo-webpack-contrib-8.0.0-pre.tgz",
"@typescript-eslint/eslint-plugin": "2.34.0",
"@typescript-eslint/parser": "2.34.0",
"caniuse-lite": "1.0.30000973",
Expand Down
3 changes: 1 addition & 2 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import unitConfigFactory from './unit.config';
import functionalConfigFactory from './functional.config';
import distConfigFactory from './dist.config';
import electronConfigFactory from './electron.config';
import logger from './logger';
import { moveBuildOptions } from './util/eject';
import logger from './logger';
import { readFileSync } from 'fs';
Expand Down Expand Up @@ -83,7 +82,7 @@ function serveStatic(
}
}

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

0 comments on commit bef59ed

Please sign in to comment.