From 6931d2dfb0f72bbb099af5c3c2844950962edf19 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 19 Mar 2019 23:52:37 -0500 Subject: [PATCH] Fix 3D Viewer --- package.json | 2 +- webpack.base.config.js | 7 ++----- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 6a72cd3c3..dbe0ff267 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "prettier": "^1.11.1", "prop-types": "^15.6.2", "qrcode.react": "^0.8.0", - "raw-loader": "^1.0.0", + "raw-loader": "^2.0.0", "rc-progress": "^2.0.6", "react": "^16.8.2", "react-dom": "^16.8.2", diff --git a/webpack.base.config.js b/webpack.base.config.js index 2a704b0d7..98506b907 100644 --- a/webpack.base.config.js +++ b/webpack.base.config.js @@ -53,12 +53,9 @@ let baseConfig = { }, }, { - test: /\.glsl/, + test: /\.(vert|frag|glsl)$/, use: { - loader: 'file-loader', - options: { - outputPath: 'ui/three', - }, + loader: 'raw-loader', }, }, ], diff --git a/yarn.lock b/yarn.lock index 8ae0fbba4..98a8054be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8443,10 +8443,10 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" -raw-loader@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405" - integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA== +raw-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26" + integrity sha512-kZnO5MoIyrojfrPWqrhFNLZemIAX8edMOCp++yC5RKxzFB3m92DqKNhKlU6+FvpOhWtvyh3jOaD7J6/9tpdIKg== dependencies: loader-utils "^1.1.0" schema-utils "^1.0.0"