From 4a5d7c0942fef4e9a460ec645bda14a35a6da5c2 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Wed, 4 Apr 2018 09:18:10 -0700
Subject: [PATCH] added watching for shader files
---
package-lock.json | Bin 418423 -> 419660 bytes
package.json | 6 ++++--
webpack.config.js | 8 +++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6c4f12199baa2df134069e76ed5d5989b2d20e99..cb97d9875993ea17d0b4fbcff908919e6f950985 100644
GIT binary patch
delta 354
zcmex<MDolz$%ZYAf%`a$5_QWHOOi9D&#Ge8n64niXkwmPQ34ayEl*7<NKDSwEyyWN
z&&<=;)yFM4T`-SXBeW{RIWjLOJkhAqFeBO6IM>HGqdeTrz$qv%!X+~)%*Wd&$<M`6
zKQq-JG%rlsG$qBL#LwTr&nKv$#4pL$H9OF`qA1J5r^>*^GQG?vHOC;!ts-kOqompN
z4O>|FrmsH5$UWWKhJ}0joZYMfljD!F^XQf4Wfm$~DJYrfnNH`aVO5#_IF(6vy4(dO
z?(NxES${B2Ur@v(+U~cHal79>rrKwmDT&1yU`>-Bno3Te_=?#?HYXo0sIRM!#M3p=
zGo2i$t0ZmU>=lx1W@Z#xXzWzx>64w~=4)E$>SY*Y>^ptp0%n!=(@U7!PcLEFetHS(
Gn!Nz43Vxyh
delta 35
scmX?ePV)N^$%ZYAf&1En4l!;II>c1<tbM^s=Jo|ES+*}&$+~7Q06|<4ssI20
diff --git a/package.json b/package.json
index 0eac8431a..464e53988 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,9 @@
},
"scripts": {
"lint": "tslint src/**/*.ts",
- "build": "tsc",
- "postbuild": "copyfiles --up 1 src/mol-gl/shader/*.vert src/mol-gl/shader/*.frag src/mol-gl/shader/*.glsl build/node_modules/",
+ "build": "cpx \"src/**/*.{vert,frag,glsl}\" build/node_modules/ && tsc",
"watch": "tsc -watch",
+ "watch-shader": "cpx \"src/**/*.{vert,frag,glsl}\" build/node_modules/ --watch",
"test": "jest",
"script": "node build/node_modules/script.js",
"app-render-test": "webpack build/node_modules/apps/render-test/index.js --mode development -o web/render-test/index.js",
@@ -62,6 +62,8 @@
"@types/react-dom": "^16.0.4",
"benchmark": "^2.1.4",
"copyfiles": "^2.0.0",
+ "cpx": "^1.5.0",
+ "extra-watch-webpack-plugin": "^1.0.1",
"glslify-import": "^3.1.0",
"glslify-loader": "^1.0.2",
"jest": "^22.4.2",
diff --git a/webpack.config.js b/webpack.config.js
index a3fe2faee..50bbc097e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,5 @@
const path = require('path');
+const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin');
module.exports = {
module: {
rules: [
@@ -13,5 +14,10 @@ module.exports = {
include: [ path.resolve(__dirname, "build/node_modules/") ]
}
]
- }
+ },
+ plugins: [
+ new ExtraWatchWebpackPlugin({
+ files: [ './**/*.vert', './**/*.frag', './**/*.glsl' ],
+ }),
+ ],
}
\ No newline at end of file
--
GitLab