From 16df74fd978763f987ffac78b5c4a095f095cf8c Mon Sep 17 00:00:00 2001 From: Werner Trunk Date: Tue, 3 Oct 2017 08:15:43 +0200 Subject: [PATCH 1/4] ignore IDE files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 34a54eb..ab7da0e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ src/config src/data/videos src/client/videos build/build-for-prod.sh +.history +.vscode From 57950bf061c06e987d721b19f1a77ea5ff8eade8 Mon Sep 17 00:00:00 2001 From: Werner Trunk Date: Tue, 3 Oct 2017 08:58:56 +0200 Subject: [PATCH 2/4] fix windows build error on copy-all/copy-client --- build/copy-client.js | 16 ++++++++++++++++ package.json | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 build/copy-client.js diff --git a/build/copy-client.js b/build/copy-client.js new file mode 100644 index 0000000..96f8123 --- /dev/null +++ b/build/copy-client.js @@ -0,0 +1,16 @@ +var copy = require('copy'); + +copy( + 'src/client/**/*.*', + 'dist/client', + {"ignore":[ "src/client/scripts/**/*.*","src/client/styles/**/*.*","src/client/videos/**/*.*"]}, + function(err, files) { + if (err) return console.error(err); + // files.forEach(function(file) { + // console.log(file.relative); + // }); + } +); + + + diff --git a/package.json b/package.json index 0fb505b..20cb635 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,12 @@ "clean-dist": "rm -rf dist", "make-dist": "mkdirp dist", "make-client": "mkdirp dist/client", - "copy-all": "npm run copy-server && npm run copy-config && npm run copy-views && npm run copy-client", + "copy-all": "npm run copy-server && npm run copy-config && npm run copy-views && npm run cp-client", "copy-server": "cp -R src/server dist", "copy-config": "cp -R src/config dist", "copy-views": "cp -R src/views dist", "copy-client": "copy \"src/client/**/*.*\" \"!src/client/scripts/**/*.*\" \"!src/client/styles/**/*.*\" \"!src/client/videos/**/*.*\" dist/client", + "cp-client": "node build/copy-client.js", "serve": "nodemon -e dust,js,css,json dist/server/index.js", "dev": "npm run build && parallelshell \"npm run watch\" \"npm run serve\"", "watch": "npm-watch", From f320376f7f709ab441e5ae1f6d2c6bd6068cf0db Mon Sep 17 00:00:00 2001 From: Werner Trunk Date: Tue, 3 Oct 2017 09:47:45 +0200 Subject: [PATCH 3/4] Revert "ignore IDE files" This reverts commit 16df74fd978763f987ffac78b5c4a095f095cf8c. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index ab7da0e..34a54eb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ src/config src/data/videos src/client/videos build/build-for-prod.sh -.history -.vscode From 9b2b334b1e1384482d032d4458dfc095046b958d Mon Sep 17 00:00:00 2001 From: Werner Trunk Date: Tue, 3 Oct 2017 10:02:50 +0200 Subject: [PATCH 4/4] fix windows build error on copy-client --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 20cb635..5938491 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,11 @@ "clean-dist": "rm -rf dist", "make-dist": "mkdirp dist", "make-client": "mkdirp dist/client", - "copy-all": "npm run copy-server && npm run copy-config && npm run copy-views && npm run cp-client", + "copy-all": "npm run copy-server && npm run copy-config && npm run copy-views && npm run copy-client", "copy-server": "cp -R src/server dist", "copy-config": "cp -R src/config dist", "copy-views": "cp -R src/views dist", - "copy-client": "copy \"src/client/**/*.*\" \"!src/client/scripts/**/*.*\" \"!src/client/styles/**/*.*\" \"!src/client/videos/**/*.*\" dist/client", - "cp-client": "node build/copy-client.js", + "copy-client": "node build/copy-client.js", "serve": "nodemon -e dust,js,css,json dist/server/index.js", "dev": "npm run build && parallelshell \"npm run watch\" \"npm run serve\"", "watch": "npm-watch",