Merge af13119 into b78bc74

.travis.yml

@@ -24,6 +24,7 @@ env:
   - REQUIREMENTS=devel
 
 python:
+  - "2.7"
   - "3.6"
   - "3.7"
   - "3.8"

pywebpack/bundle.py

@@ -16,7 +16,8 @@ class WebpackBundle(object):
     """Webpack bundle."""
 
     def __init__(self, path, entry=None, dependencies=None,
-                 devDependencies=None, peerDependencies=None):
+                 devDependencies=None, peerDependencies=None,
+                 aliases=None):
         """Initialize webpack bundle.
 
         :param path: Absolute path to the folder where the assets are
@@ -26,6 +27,7 @@ def __init__(self, path, entry=None, dependencies=None,
         :param dependencies: npm dependencies.
         :param devDependencies: npm dev dependencies.
         :param peerDependencies: npm peer dependencies.
+        :param aliases: Webpack resolver aliases.
         """
         self.path = path
         self.entry = entry or {}
@@ -34,3 +36,4 @@ def __init__(self, path, entry=None, dependencies=None,
             'devDependencies': devDependencies or {},
             'peerDependencies': peerDependencies or {},
         }
+        self.aliases = aliases or {}

pywebpack/project.py

@@ -200,9 +200,29 @@ def entry(self):
     def config(self):
         """Inject webpack entry points from bundles."""
         config = super(WebpackBundleProject, self).config
-        config.update({'entry': self.entry})
+        config.update({'entry': self.entry, 'aliases': self.aliases})
         return config
 
+    @property
+    def aliases(self):
+        """Get webpack resolver aliases from bundles."""
+        aliases = dict(aliases=dict(), paths=dict())
+        error = 'Duplicated alias for `{0}:{1}` in bundle `{2}` and ' \
+            '`{3}:{4}` in bundle `{5}`. Please choose another alias name.'
+
+        for bundle in self.bundles:
+            for alias, path in bundle.aliases.items():
+                # Check that there are no duplicated aliases
+                if alias in aliases['aliases']:
+                    prev_path, prev_bundle_path = aliases['paths'][alias]
+                    raise RuntimeError(error.format(
+                        alias, prev_path, prev_bundle_path,
+                        alias, path, bundle.path))
+                aliases['paths'][alias] = (path, bundle.path)
+
+            aliases['aliases'].update(bundle.aliases)
+        return aliases['aliases']
+
     @property
     @cached
     def dependencies(self):

pywebpack/storage.py

@@ -11,8 +11,9 @@
 
 from __future__ import absolute_import, print_function
 
-from os import makedirs, remove, scandir, symlink, walk
-from os.path import dirname, exists, getmtime, islink, join, realpath, relpath
+from os import listdir, makedirs, remove, symlink, walk
+from os.path import dirname, exists, getmtime, isfile, islink, join, \
+    realpath, relpath
 from shutil import copy
 
 
@@ -30,19 +31,21 @@ def iter_paths(folder, root=None, depth=None):
     root = root or folder  # needed to compute the relative name
 
     if depth is None:  # yield all paths
-        yield from iter_files(folder)
+        for result in iter_files(folder):
+            yield result
     elif depth == 0:
         yield folder, relpath(folder, root)
     else:
-        for entry in scandir(folder):
-            if entry.is_file():  # always yield files no matter the depth
-                f = join(folder, entry.name)
+        for entry in listdir(folder):
+            if isfile(join(folder, entry)):
+                # Always yield files no matter the depth
+                f = join(folder, entry)
                 yield f, relpath(f, root)
             else:
-                yield from iter_paths(
-                    join(folder, entry.name),
-                    root=root, depth=(depth - 1)
-                )
+                for result in iter_paths(
+                    join(folder, entry), root=root, depth=(depth - 1)
+                ):
+                    yield result
 
 
 class FileStorage(object):
@@ -81,9 +84,9 @@ def run(self, force=None):
 class LinkStorage(FileStorage):
     """Storage class that link files."""
 
-    def __init__(self, *args, depth=None, **kwargs):
+    def __init__(self, *args, **kwargs):
         """Initialize storage."""
-        self.depth = depth
+        self.depth = kwargs.pop('depth', None)
         super(LinkStorage, self).__init__(*args, **kwargs)
 
     def __iter__(self):

tests/test_pywebpack.py

@@ -136,12 +136,14 @@ def test_templateproject_buildall(templatedir, destdir):
 def test_bundleproject(builddir, bundledir, destdir):
     """Test bundle project."""
     entry = {'app': './index.js'}
+    aliases = {'@app': 'index.js'}
     bundle = WebpackBundle(
         bundledir,
         entry=entry,
         dependencies={
             'lodash': '~4',
-        }
+        },
+        aliases=aliases,
     )
     project = WebpackBundleProject(
         working_dir=destdir,
@@ -152,7 +154,7 @@ def test_bundleproject(builddir, bundledir, destdir):
 
     assert project.bundles == [bundle]
     assert project.entry == entry
-    assert project.config == {'entry': entry, 'test': True}
+    assert project.config == {'entry': entry, 'test': True, 'aliases': aliases}
     assert project.dependencies == {
         'dependencies': {
             'lodash': '~4',