Configurable shim module format - AMD or ES2015

index.js

@@ -16,8 +16,6 @@ module.exports = {
       app.import('vendor/jquery/jquery.js', { prepend: true });
     }
 
-    app.import('vendor/shims/jquery.js');
-
     let checker = new VersionChecker(this);
     let ember = checker.forEmber();
 
@@ -28,6 +26,14 @@ module.exports = {
     if (optionalFeatures && !optionalFeatures.isFeatureEnabled('jquery-integration')) {
       app.project.ui.writeDeprecateLine('You have disabled the `jquery-integration` optional feature. You now have to delete `@ember/jquery` from your package.json');
     }
+
+    const appConfig = app.project.config(app.env)['ember-jquery'] || {};
+
+    if (appConfig.moduleFormat === 'amd') {
+      app.import('vendor/shims/jquery-amd.js');
+    } else {
+      app.import('vendor/shims/jquery.js');
+    }
   },
 
   treeForVendor: function(tree) {

vendor/shims/jquery-amd.js

@@ -0,0 +1,8 @@
+(function() {
+  function vendorModule() {
+    'use strict';
+    return self['jQuery']
+  }
+
+  define('jquery', [], vendorModule);
+})();