From 1a43fe20610eff0cd31ba3363f3d08192caa0808 Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Mon, 22 Jan 2018 22:36:57 +0000 Subject: [PATCH 1/3] Added raw-loader to make inclusion of shader source cleaner --- package.json | 1 + webpack.config.js | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/package.json b/package.json index 7dff26d3c..aff95644e 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "eslint": "^4.13.1", "fs-extra": "^5.0.0", "node-sloc": "^0.1.10", + "raw-loader": "^0.5.1", "uglifyjs-webpack-plugin": "^1.1.2", "uuid": "^3.1.0", "webpack": "^3.10.0", diff --git a/webpack.config.js b/webpack.config.js index 1ec2f9ecc..f96c8efaa 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,6 +22,15 @@ module.exports = { umdNamedDefine: true, }, + module: { + rules: [ + { + test: /\.txt$/, + use: 'raw-loader' + } + ] + }, + plugins: [ new webpack.DefinePlugin({ From f49597c97089c961bfc2940c7c4fa2738a586906 Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Mon, 22 Jan 2018 22:46:22 +0000 Subject: [PATCH 2/3] Renamed to vert --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index f96c8efaa..290a1c000 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -25,7 +25,7 @@ module.exports = { module: { rules: [ { - test: /\.txt$/, + test: /\.vert$/, use: 'raw-loader' } ] From dfe2599e5549c608974dbd3464f5d2216dabba8b Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Mon, 22 Jan 2018 22:51:49 +0000 Subject: [PATCH 3/3] Added frag test --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 290a1c000..6b7807925 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -25,7 +25,7 @@ module.exports = { module: { rules: [ { - test: /\.vert$/, + test: [ /\.vert$/, /\.frag$/ ], use: 'raw-loader' } ]