Auto Bundles were not working in AMD Environment

Author: azizhk

Brocfile.js

@@ -33,20 +33,26 @@ var es5 = new Babel(lib, {
   blacklist: ['es6.modules']
 });
 
+function rollupConfig(entry) {
+  return new Rollup(es5, {
+    rollup: {
+      entry: 'lib/' + entry,
+      cache: 'BUILD:es6-promise',
+      targets: [
+        {
+          format: 'umd',
+          moduleName: 'ES6Promise',
+          dest: entry,
+          sourceMap: 'inline'
+        }
+      ]
+    }
+  });
+}
+
 // build RSVP itself
-var es6Promise = new Rollup(es5, {
-  rollup: {
-    entry: 'lib/es6-promise.js',
-    targets: [
-      {
-        format: 'umd',
-        moduleName: 'ES6Promise',
-        dest: 'es6-promise.js',
-        sourceMap: 'inline'
-      }
-    ]
-  }
-});
+var es6Promise = rollupConfig('es6-promise.js')
+var es6PromiseAuto = rollupConfig('es6-promise.auto.js')
 
 var testBundle = watchify(merge([
   mv(es6Promise, 'test'),
@@ -59,45 +65,42 @@ var header = stew.map(find('config/versionTemplate.txt'), function(content) {
   return content.replace(/VERSION_PLACEHOLDER_STRING/, version());
 });
 
-var dist = es6Promise;
-
-function concatAs(tree, outputFile) {
+function concatAs(outputFile) {
   return merge([
-    concat(merge([tree, header]), {
+    concat(merge([es6Promise, header]), {
       headerFiles: ['config/versionTemplate.txt'],
       inputFiles:  ['es6-promise.js'],
       outputFile: outputFile
     }),
 
-    concat(merge([tree, header]), {
+    concat(merge([es6PromiseAuto, header]), {
       headerFiles: ['config/versionTemplate.txt'],
-      inputFiles:  ['es6-promise.js'],
+      inputFiles:  ['es6-promise.auto.js'],
       outputFile: outputFile.replace('es6-promise', 'es6-promise.auto'),
-      footer:    'ES6Promise.polyfill();',
     }),
 
   ]);
 }
 
-function production(dist, header) {
+function production() {
   var result;
   env('production', function(){
-    result = uglify(concatAs(dist, 'es6-promise.min.js'), {
+    result = uglify(concatAs('es6-promise.min.js'), {
       compress: true,
       mangle: true,
     });
   })
   return result;
 }
 
-function development(dist, header) {
-  return concatAs(dist, 'es6-promise.js');
+function development() {
+  return concatAs('es6-promise.js');
 }
 
 module.exports = merge([
   merge([
-    production(es6Promise, header),
-    development(es6Promise, header),
+    production(),
+    development(),
   ].filter(Boolean)),
   // test stuff
   testFiles,

dist/es6-promise.auto.js

@@ -0,0 +1,3 @@
+import Promise from './es6-promise';
+Promise.polyfill();
+export default Promise;

dist/es6-promise.auto.map

@@ -512,7 +512,7 @@ broccoli-clean-css@^1.1.0:
     inline-source-map-comment "^1.0.5"
     json-stable-stringify "^1.0.0"
 
-broccoli-concat@^3.0.2, broccoli-concat@^3.0.4:
+broccoli-concat@^3.0.4:
   version "3.0.5"
   resolved "https://registry.npmjs.org/broccoli-concat/-/broccoli-concat-3.0.5.tgz#306fb47e7caa23ec726391fe8b584765946eb52e"
   dependencies:
@@ -526,6 +526,23 @@ broccoli-concat@^3.0.2, broccoli-concat@^3.0.4:
     lodash.uniq "^4.2.0"
     mkdirp "^0.5.1"
 
+broccoli-concat@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9"
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.3.0"
+    broccoli-stew "^1.3.3"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^1.0.1"
+    find-index "^1.1.0"
+    fs-extra "^1.0.0"
+    fs-tree-diff "^0.5.6"
+    lodash.merge "^4.3.0"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+    walk-sync "^0.3.1"
+
 broccoli-config-loader@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/broccoli-config-loader/-/broccoli-config-loader-1.0.0.tgz#c3cf5ecfaffc04338c6f1d5d38dc36baeaa131ba"
@@ -1998,6 +2015,10 @@ [email protected]:
     statuses "~1.3.0"
     unpipe "~1.0.0"
 
+find-index@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
+
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -2189,7 +2210,7 @@ [email protected]:
     inherits "2"
     minimatch "~0.2.11"
 
-[email protected], glob@^7.0.5:
+[email protected]:
   version "7.0.5"
   resolved "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
   dependencies:
@@ -2200,7 +2221,7 @@ [email protected], glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-[email protected], glob@^7.0.0, glob@^7.0.4, glob@^7.1.0:
+[email protected], glob@^7.0.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0:
   version "7.1.1"
   resolved "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -3819,9 +3840,9 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
-[email protected].3:
-  version "2.5.3"
-  resolved "https://registry.npmjs.org/release-it/-/release-it-2.5.3.tgz#653da644c83cf9eebab8cbdc5384222e37b303e0"
+[email protected].4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/release-it/-/release-it-2.5.4.tgz#b85fc43d424aa19ee4cc7265936385f2095a5e50"
   dependencies:
     chalk "1.1.3"
     github "7.2.0"