diff --git a/Gruntfile.js b/Gruntfile.js index 560d9f6..48a3f2a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -354,18 +354,6 @@ module.exports = function (grunt) { dest: '<%= yeoman.dist %>/client/images', src: ['generated/*'] }, - { - expand: true, - cwd: 'server-build', - dest: '<%= yeoman.dist %>/server', - src: [ - '{,**/}*.html', - '{,**/}*.template', - '{,**/}*.js', - '{,**/}*.sql', - '{,**/}*.txt' - ] - }, { expand: true, cwd: 'shared', diff --git a/package.json b/package.json index 104ecd9..0602f45 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ }, "scripts": { "test": "npm run server:test", - "build": "npm run server:build && grunt build", + "build": "npm run server:build && grunt build && rsync -avzL --exclude='*/__mocks__/' --exclude='*.test.*' server-build/ dist/server/", "clean": "rm -rf server-build/ && grunt clean", "dist": "npm run clean && npm run build && npm run test", "client:serve": "grunt serve", "server:test": "jest --config=jest.server.config.js", - "server:build": "tsc -b server && ln -sfv ../server/db/patches ./server-build/db/ && ln -sfv ../server/templates ./server-build/ && ln -sfv ../server/mailTemplates ./server-build/", + "server:build": "tsc -b server && ln -sfv ../../server/db/patches ./server-build/db/ && ln -sfv ../server/templates ./server-build/ && ln -sfv ../server/mailTemplates ./server-build/", "server:run": "npm run server:build && node server-build/main.js" }, "dependencies": { diff --git a/shell.nix b/shell.nix index a4b9002..83ed319 100644 --- a/shell.nix +++ b/shell.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { git nasm nodejs-10_x + rsync sqlite zlib ];