LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge pull request #2365 from lbryio/fix-3d-viewer

Browse source 
Fix 3D Viewer
This commit is contained in:
Shawn K 2019-03-19 23:54:05 -05:00 committed by GitHub
commit 5effef8acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -124,7 +124,7 @@
"prettier": "^1.11.1", "prettier": "^1.11.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"qrcode.react": "^0.8.0", "qrcode.react": "^0.8.0",
"raw-loader": "^1.0.0", "raw-loader": "^2.0.0",
"rc-progress": "^2.0.6", "rc-progress": "^2.0.6",
"react": "^16.8.2", "react": "^16.8.2",
"react-dom": "^16.8.2", "react-dom": "^16.8.2",

7
webpack.base.config.js
View file

@ -53,12 +53,9 @@ let baseConfig = {
}, },
}, },
{ {
test: /\.glsl/, test: /\.(vert|frag|glsl)$/,
use: { use: {
loader: 'file-loader', loader: 'raw-loader',
options: {
outputPath: 'ui/three',
},
}, },
}, },
], ],

8
yarn.lock
View file

@ -8443,10 +8443,10 @@ raw-body@2.3.3:
iconv-lite "0.4.23" iconv-lite "0.4.23"
unpipe "1.0.0" unpipe "1.0.0"
raw-loader@^1.0.0: raw-loader@^2.0.0:
version "1.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26"
integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA== integrity sha512-kZnO5MoIyrojfrPWqrhFNLZemIAX8edMOCp++yC5RKxzFB3m92DqKNhKlU6+FvpOhWtvyh3jOaD7J6/9tpdIKg==
dependencies: dependencies:
loader-utils "^1.1.0" loader-utils "^1.1.0"
schema-utils "^1.0.0" schema-utils "^1.0.0"