Merge remote-tracking branch 'origin/1.9'

.gitignore

@@ -28,11 +28,7 @@
 /var/encore/*
 !var/encore/.gitkeep
 
-/public/assets/app/*
-!/public/assets/app/build/
-/public/assets/build/*
-/public/assets/ezplatform/*
-!/public/assets/ezplatform/build/
+/public/assets/
 
 /web
 /public/var

deploy.php

@@ -16,6 +16,8 @@
 require __DIR__ . '/deploy/tasks/sentry.php';
 require __DIR__ . '/deploy/tasks/logs.php';
 require __DIR__ . '/deploy/tasks/overrides.php';
+require __DIR__ . '/deploy/tasks/assets.php';
+require __DIR__ . '/deploy/tasks/app.php';
 require __DIR__ . '/deploy/parameters.php';
 // optional: slack integration
 //require __DIR__ . '/deploy/tasks/slack.php';

deploy/tasks/app.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Deployer;
+
+// put your application specific tasks here

deploy/tasks/assets.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Deployer;
+
+// parameters
+set('asset_resource_paths', [
+    'src/AppBundle/Resources/es6',
+    'src/AppBundle/Resources/sass'
+]);
+set('asset_build_paths', [
+    'assets',
+]);
+set('asset_exclude_paths', [
+   'assets/app/build_dev'
+]);
+set('asset_install_command', 'yarn install');
+set('asset_build_command', 'yarn build:prod');
+set('asset_ezplatform_build_command', 'composer ezplatform-assets');
+
+task('assets:deploy', [
+    'assets:build',
+    'assets:ezplatform:build',
+    'assets:upload'
+]);
+
+task('assets:build', function() {
+    writeln('<comment>Checking for changes in asset files. If this fails, commit or stash your changes before deploying.</comment>');
+    $assetResourcePaths = get('asset_resource_paths');
+    foreach ($assetResourcePaths as $resourcePath) {
+        run("git diff --exit-code {$resourcePath}");
+    }
+
+    $installCmd = get('asset_install_command');
+    run($installCmd);
+
+    $buildCmd = get('asset_build_command');
+    run($buildCmd);
+})->local();
+
+task('assets:ezplatform:build', function() {
+    run("{{asset_ezplatform_build_command}}");
+})->local();
+
+task('assets:upload', function() {
+    $assetPaths = get('asset_build_paths');
+    $excludedPaths = get('asset_exclude_paths', []);
+
+    $config = [];
+    foreach ($excludedPaths as $excludedPath) {
+        $config['options'][] = "--exclude {$excludedPath}";
+    }
+
+    foreach ($assetPaths as $path) {
+        upload("public/{$path}", '{{release_path}}/public', $config);
+    }
+});

package.json

@@ -19,9 +19,7 @@
         ]
     },
     "scripts": {
-        "dev": "encore dev",
         "build:dev": "encore dev",
-        "prod": "encore production",
         "build:prod": "encore production",
         "watch": "encore dev --watch",
         "start": "encore dev-server",