Merge pull request #12 from spryker/develop

Version 2.1.0

Author: Alessandro Bellini

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 2.1.0
+- new dependencies (`poscss-loader` and `autoprefixer`)
+- updated dependencies (less warnings)
+- provider system updated (full support for bundle aliases)
+- allow configuration extensions
+
 ### 2.0.4
 - yves build process searches for common entry points in core, even when there is a target theme
 

lib/automation.js

@@ -55,15 +55,22 @@ function automation(target, targetPattern, theme) {
 
             try {
                 if (extensions.count.valid > 0) {
-                    if (extensions.count.valid > 1) {
-                        console.warn(`  ${String.fromCharCode(0x2517)} warning: more than one extension for the same application/theme - first will be processed, the others ignored`.yellow);
-                    }
+                    config = R.keys(extensions.valid).reduce((baseConfig, key) => {
+                        try {
+                            console.log(`  ${String.fromCharCode(0x2517)} configuration:`.gray, extensions.valid[key].magenta);
+
+                            let partial = provider.import(path.join(cwd, extensions.valid[key]), entryPoints.valid, manifests.valid);
 
-                    let extensionName = R.keys(extensions.valid)[0];
-                    console.log(`  ${String.fromCharCode(0x2517)} configuration:`.gray, extensions.valid[extensionName].magenta);
+                            if (typeof(partial) === 'function') {
+                                return partial(baseConfig);
+                            }
 
-                    let extension = provider.import(path.join(cwd, extensions.valid[extensionName]), entryPoints.valid, manifests.valid);
-                    config = R.merge(configurator.getDefault(), extension);
+                            return Object.assign(configurator.getDefault(), partial);
+                        } catch (err) {
+                            console.error('- build'.gray, 'aborted'.red);
+                            reject(errors.enrich(err, `${key} configuration contains errors`));
+                        }
+                    }, configurator.getDefault());
 
                     // LEGACY
                     if (context.has('legacy') && target === 'yves') {

lib/automation/provider.js

@@ -6,21 +6,35 @@
 
 'use strict';
 
-let path = require('path');
-let fs = require('graceful-fs');
-let R = require('ramda');
-let context = require('../context');
-let cwd = process.cwd();
-
-function contextRequire(id) {
-    try {
-        return require(`${cwd}/node_modules/${id}`);
-    } catch (err) {
-        return require(id);
+const path = require('path');
+const fs = require('graceful-fs');
+const R = require('ramda');
+const context = require('../context');
+const cwd = process.cwd();
+
+function getAlias(src) {
+    return fs.readdirSync(src)
+        .filter(dir => fs.statSync(path.join(src, dir)).isDirectory())
+        .reduce((list, dir) => {
+            list[`@${dir.toLowerCase()}`] = `${dir}/assets/Zed/src`;
+            return list;
+        }, {});
+}
+
+function createContextRequire() {
+    function contextRequire(id) {
+        try {
+            return require(`${cwd}/node_modules/${id}`);
+        } catch (err) {
+            return require(id);
+        }
     }
+
+    return Object.assign(contextRequire, require);
 }
 
-function getAntelope(entryPoints, manifests) {
+function getAntelope(file, entryPoints, manifests) {
+    let alias = getAlias(path.join(path.dirname(file), '../../../'));
     let loadersPaths = process.mainModule.paths.concat([path.join(cwd, './node_modules')]);
     let rootPaths = [
         cwd,
@@ -33,6 +47,7 @@ function getAntelope(entryPoints, manifests) {
         remote: (id) => require(id),
         options: context.options(),
         entryPoints: entryPoints,
+        alias: alias,
         paths: {
             root: rootPaths,
             loaders: loadersPaths
@@ -41,16 +56,16 @@ function getAntelope(entryPoints, manifests) {
 }
 
 module.exports = {
-    import: (id, entryPoints, manifest) => {
+    import: (file, entryPoints, manifest) => {
         let context = require('module');
-        let body = fs.readFileSync(id, 'utf8');
+        let body = fs.readFileSync(file, 'utf8');
         let fn = new Function('module', 'exports', 'require', '__dirname', 'antelope', body);
         let args = [
-            context, 
-            context.exports, 
-            contextRequire, 
-            path.dirname(id),
-            getAntelope(entryPoints, manifest)
+            context,
+            context.exports,
+            createContextRequire(),
+            path.dirname(file),
+            getAntelope(file, entryPoints, manifest)
         ];
 
         fn.apply(context, args);

lib/automation/webpack.js

@@ -6,13 +6,16 @@
 
 'use strict';
 
+const context = require('../context');
 const cwd = process.cwd();
 
 module.exports = {
     getDefault: () => {
         return {
             antelope: {},
-            context: cwd
+            context: cwd,
+            debug: context.has('debug'),
+            watch: context.has('watch')
         };
     },
     legacy: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antelope",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Spryker frontend automation tool",
   "main": "antelope.js",
   "preferGlobal": "true",
@@ -21,27 +21,33 @@
     "bin": "./bin"
   },
   "engines": {
-    "node": ">=5.0.0",
-    "npm": ">=3.3.6"
+    "node": ">=5.11.0",
+    "npm": ">=3.4.0"
   },
   "dependencies": {
+    "autoprefixer": "~6.3.6",
+    "babel-core": "~6.9.1",
+    "babel-loader": "~6.2.4",
+    "babel-polyfill": "~6.9.1",
+    "babel-preset-es2015": "~6.9.0",
     "colors": "~1.1.2",
     "commander": "~2.9.0",
     "css-loader": "~0.23.0",
     "exit": "~0.1.2",
     "extract-text-webpack-plugin": "~1.0.1",
     "file-loader": "~0.8.5",
-    "globby": "~4.0.0",
+    "globby": "~5.0.0",
     "graceful-fs": "~4.1.2",
-    "node-sass": "~3.4.2",
+    "node-sass": "~3.7.0",
     "organizer-loader": "github:ilmente/organizer-loader",
+    "postcss-loader": "~0.9.1",
     "ramda": "~0.18.0",
     "resolve-url-loader": "~1.4.3",
     "sass-loader": "~3.1.1",
     "semver": "~5.1.0",
     "shelljs": "~0.5.3",
     "style-loader": "~0.13.0",
     "url-loader": "~0.5.7",
-    "webpack": "~1.12.6"
+    "webpack": "~1.13.1"
   }
 }