From 61158d5540de3ff0564d1ffbe16fb3b566c0b82f Mon Sep 17 00:00:00 2001 From: Katharina Irrgang Date: Thu, 3 Aug 2017 12:05:35 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20Fixed=20`grunt=20release`=20f?= =?UTF-8?q?or=20development=20(#8831)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #8829 - `grunt release` build the admin assets in the folder you execute the command - the admin build generates the admin views - we copy the production view for development to avoid another ember build - the copy command has to happen before we prepare the build zip, otherwise the release tree is incomplete - this will prevent missing the development view for npm --- Gruntfile.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5092764f01..4fd3d3e45a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -752,12 +752,13 @@ var overrides = require('./core/server/overrides'), grunt.config.set('copy.admin_html', { files: [{ - src: '<%= paths.releaseBuild %>/core/server/admin/views/default-prod.html', - dest: '<%= paths.releaseBuild %>/core/server/admin/views/default.html' + cwd: '.', + src: 'core/server/admin/views/default-prod.html', + dest: 'core/server/admin/views/default.html' }] }); - grunt.task.run(['update_submodules:pinned', 'subgrunt:init', 'clean:tmp', 'prod', 'clean:release', 'copy:release', 'copy:admin_html', 'compress:release']); + grunt.task.run(['update_submodules:pinned', 'subgrunt:init', 'clean:tmp', 'prod', 'clean:release', 'copy:admin_html', 'copy:release', 'compress:release']); } ); };