Skip to content

Commit c6c6f3e

Browse files
committed
fix: webpack4 compatibility
1 parent 66ec071 commit c6c6f3e

File tree

6 files changed

+447
-138
lines changed

6 files changed

+447
-138
lines changed

apikeys.js.default

Lines changed: 0 additions & 3 deletions
This file was deleted.

exercises/autocomplete-sfc/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
<head>
55
<title>Tasks via Generator Function</title>
6-
<link rel="stylesheet" href="./assets/styles.css">
6+
<link rel="stylesheet" href="/assets/styles.css">
77
</head>
88

99
<body>
1010
<div id='root'>
11-
11+
1212
</div>
13-
<script src="./assets/main.js"></script>
13+
<script src="/assets/main.js"></script>
1414
</body>
1515

1616
</html>

exercises/autocomplete-sfc/tests/task.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ReactElement } from 'react';
77
let hasStudentSolution: boolean = true;
88

99
hasStudentSolution =
10-
JSON.stringify(renderer.create(<PlaceSearchResult />).toTree()) !==
10+
JSON.stringify(renderer.create(<PlaceSearchResult />).toJSON()) !==
1111
JSON.stringify({
1212
nodeType: 'component',
1313
props: {},

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
"semantic-release": "semantic-release"
1616
},
1717
"devDependencies": {
18+
"@babel/core": "^7.1.6",
1819
"@mike-works/js-lib-renovate-config": "2.0.0",
1920
"@mike-works/workshop-semantic-release-config": "1.0.0",
2021
"@types/chalk": "2.2.0",
2122
"@types/html-webpack-plugin": "3.2.0",
2223
"@types/jest": "23.3.9",
23-
"@types/react": "16.7.3",
24-
"@types/react-dom": "16.0.9",
24+
"@types/react": "^15.0.0",
25+
"@types/react-dom": "^15.0.0",
2526
"@types/react-hot-loader": "4.1.0",
26-
"@types/react-test-renderer": "16.0.3",
27+
"@types/react-test-renderer": "^15.0.0",
2728
"@types/webpack-env": "1.13.6",
2829
"awesome-typescript-loader": "5.2.1",
2930
"babel-core": "6.26.3",
@@ -33,14 +34,14 @@
3334
"babel-preset-env": "1.7.0",
3435
"css-loader": "1.0.1",
3536
"express": "4.16.4",
36-
"extract-text-webpack-plugin": "3.0.2",
37+
"extract-text-webpack-plugin": "4.0.0-beta.0",
3738
"http-proxy-middleware": "0.19.0",
3839
"jest": "23.6.0",
3940
"node-sass": "4.10.0",
40-
"react": "16.6.1",
41-
"react-dom": "16.6.1",
41+
"react": "15.0.0",
42+
"react-dom": "15.0.0",
4243
"react-test-render": "1.1.1",
43-
"react-test-renderer": "16.6.1",
44+
"react-test-renderer": "^15.0.0",
4445
"react-transform-catch-errors": "1.0.2",
4546
"react-transform-hmr": "1.0.4",
4647
"rimraf": "2.6.2",

webpack.config.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
const path = require("path");
2-
const webpack = require("webpack");
1+
const path = require('path');
2+
const webpack = require('webpack');
33

4-
const plugins = require("./webpack/plugins");
5-
const entries = require("./webpack/entries");
6-
const resolve = require("./webpack/resolve");
7-
const mod = require("./webpack/module");
8-
const exercises = require("./webpack/exercises");
4+
const plugins = require('./webpack/plugins');
5+
const entries = require('./webpack/entries');
6+
const resolve = require('./webpack/resolve');
7+
const mod = require('./webpack/module');
8+
const exercises = require('./webpack/exercises');
99

1010
module.exports = function(env) {
1111
return {
12-
devtool: "cheap-source-maps",
12+
devtool: 'cheap-source-maps',
1313
context: exercises.exercisePath(env),
1414
entry: entries(env),
15+
mode: 'development',
1516
output: {
16-
path: path.join(__dirname, "dist"),
17-
filename: "[name].js",
18-
publicPath: "/assets/"
17+
path: path.join(__dirname, 'dist'),
18+
publicPath: '/assets/'
1919
},
2020
plugins: plugins(env),
2121
module: mod(env),

0 commit comments

Comments
 (0)