diff --git a/app/html/package.json b/app/html/package.json index aa2c3655df9f..5ba09f7c5f27 100644 --- a/app/html/package.json +++ b/app/html/package.json @@ -37,16 +37,14 @@ "core-js": "^2.5.5", "dotenv-webpack": "^1.5.5", "global": "^4.3.2", + "html-loader": "^0.5.5", "html-webpack-plugin": "^3.2.0", + "raw-loader": "^0.5.1", "webpack": "^4.6.0", "webpack-hot-middleware": "^2.22.1" }, "peerDependencies": { "babel-core": "^6.26.0 || ^7.0.0-0", "babel-runtime": ">=6.0.0" - }, - "devDependencies": { - "html-loader": "^0.5.5", - "markdown-loader": "^2.0.2" } } diff --git a/app/html/src/server/config/webpack.config.js b/app/html/src/server/config/webpack.config.js index f3fe316c0476..c572bcba82d1 100644 --- a/app/html/src/server/config/webpack.config.js +++ b/app/html/src/server/config/webpack.config.js @@ -83,10 +83,7 @@ export default function(configDir, quiet) { test: /\.md$/, use: [ { - loader: require.resolve('html-loader'), - }, - { - loader: require.resolve('markdown-loader'), + loader: require.resolve('raw-loader'), }, ], }, diff --git a/app/html/src/server/config/webpack.config.prod.js b/app/html/src/server/config/webpack.config.prod.js index 8fa2ec355ec5..8ae4ce9421d8 100644 --- a/app/html/src/server/config/webpack.config.prod.js +++ b/app/html/src/server/config/webpack.config.prod.js @@ -78,10 +78,7 @@ export default function(configDir) { test: /\.md$/, use: [ { - loader: require.resolve('html-loader'), - }, - { - loader: require.resolve('markdown-loader'), + loader: require.resolve('raw-loader'), }, ], }, diff --git a/yarn.lock b/yarn.lock index 31a614614bda..9a9903c369be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7338,6 +7338,16 @@ html-loader@^0.5.1: loader-utils "^1.1.0" object-assign "^4.1.1" +html-loader@^0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea" + dependencies: + es6-templates "^0.2.3" + fastparse "^1.1.1" + html-minifier "^3.5.8" + loader-utils "^1.1.0" + object-assign "^4.1.1" + html-minifier@^3.2.3, html-minifier@^3.5.8: version "3.5.8" resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.8.tgz#5ccdb1f73a0d654e6090147511f6e6b2ee312700" @@ -16570,7 +16580,7 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -"vm2@github:patriksimek/vm2#custom_files": +vm2@patriksimek/vm2#custom_files: version "3.5.0" resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57"