Merge branch 'node_librairies'

Author: Swop

lib/compiler.py

@@ -251,9 +251,11 @@ def install_application(self):
  os.symlink(self._bp.build_dir+'/vendor/php', '/app/vendor/php')
 
  # This is clearly a hack but it allows Node to work during compilation time
- self.logger.log('Symlink /app/vendor/node (hacky but needed)')
+ self.logger.log('Symlink /app/vendor/node and /app/node_modules (hacky but needed)')
  if not os.path.isdir('/app/vendor/node'):
  os.symlink(self._bp.build_dir+'/vendor/node', '/app/vendor/node')
+ if not os.path.isdir('/app/node_modules'):
+ os.symlink(self._bp.build_dir+'/node_modules', '/app/node_modules')
 
 
  myenv = dict(os.environ)
@@ -291,9 +293,6 @@ def install_application(self):
 
  myenv['HEROKU_ASSETS_VERSION'] = self.deploy_date.strftime("%Y%m%d%H%M%S")
 
- #temporary hack to fix assetic deployment with less
- myenv['SDZ_NODE_LIBRARIES'] = self._bp.build_dir + '/node_modules'
-
  # Composer
  # check if we have Composer dependencies and vendors are not bundled
  if os.path.isfile('www/composer.json'):