Skip to content
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

Jump to bottom

Webpack4 #7387

Merged
merged 13 commits into from
Sep 27, 2018
Merged

Webpack4 #7387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
02a185f
Update Webpack to version 4
MTRNord Apr 27, 2018
d69084f
Fix builld:dev build by using raw-loader instead css-raw-loader
MTRNord Apr 27, 2018
d6a226e
Put webpack-dev-server in development mode
dbkr May 4, 2018
8f4953c
Merge branch 'develop' into webpack4
dbkr May 11, 2018
f94abb5
Fix naming inside the comment
MTRNord May 11, 2018
6e92216
Fix css paths that got changed from matrix-react-sdk to riot-web
MTRNord May 11, 2018
9063a96
Specify the path to the postcss config and remove the include arrays …
MTRNord May 11, 2018
c57c653
Merge branch 'develop' into matthew/webpack4
ara4n Sep 25, 2018
41e0333
Merge branch 'develop' into matthew/webpack4
ara4n Sep 25, 2018
b7843a5
find versions of webpack, webpack-cli, and karma-webpack which work t…
ara4n Sep 26, 2018
9e916cd
make sure karma runs tests in dev mode to speed up build
ara4n Sep 26, 2018
7e33ea3
upgrade karma & babel to latest
ara4n Sep 26, 2018
c4f6158
pin karma-webpack to 4.0.0-beta.0 to fix perf regression
ara4n Sep 26, 2018
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
10 changes: 7 additions & 3 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ const olm_entry = webpack_config.entry['olm'];
// 'preprocessors' config below)
delete webpack_config['entry'];

// make sure we're flagged as development to avoid wasting time optimising
webpack_config.mode = 'development';

// add ./test as a search path for js
webpack_config.module.loaders.unshift({
test: /\.js$/, loader: "babel",
webpack_config.module.rules.unshift({
test: /\.js$/, use: "babel-loader",
include: [path.resolve('./src'), path.resolve('./test')],
});

Expand All @@ -46,8 +49,9 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
// ?
webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';

webpack_config.resolve.root = [
webpack_config.resolve.modules = [
path.resolve('./test'),
"node_modules"
];

webpack_config.devtool = 'inline-source-map';
Expand Down
Loading