up jquery version

toddjordan · Jan 12, 2017 · 23b977e · 23b977e
1 parent 31c5ddc
commit 23b977e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/blueprints/ember-cli-dynamic-forms/index.js b/blueprints/ember-cli-dynamic-forms/index.js
@@ -5,11 +5,10 @@ module.exports = {
 
   afterInstall: function () {
     return this.addBowerPackagesToProject([
-      { name: 'jquery', target: '~2.1.0' },
-      { name: 'alpaca', target: '~1.5.22' },
-      { name: 'handlebars', target: '3.0.3' },
+      { name: 'jquery', target: '~3.1.1'  },
       { name: 'bootstrap', target: '3.3.2' },
-      { name: 'lodash', target: '~4.6.1' }
+      { name: 'lodash', target: '~4.6.1' },
+      { name: 'alpaca', target: '1.5.22' }
     ]);
   }
 };
diff --git a/bower.json b/bower.json
@@ -3,14 +3,14 @@
   "dependencies": {
     "ember": "~2.8.0",
     "ember-cli-shims": "0.1.1",
-    "jquery": ">=2.1.0",
+    "jquery": "<4.0.0",
     "alpaca": "~1.5.22",
     "bootstrap": "3.3.2",
     "lodash": "~4.6.1"
   },
   "resolutions": {
-    "jquery": ">=2.1.0",
     "bootstrap": "3.3.2",
-    "tinycolor": "1.3.0"
+    "tinycolor": "1.3.0",
+    "jquery": "~3.1.1"
   }
 }
diff --git a/index.js b/index.js
@@ -38,6 +38,7 @@ module.exports = {
     }
 
     app.import(app.bowerDirectory + '/alpaca/dist/alpaca/bootstrap/alpaca.js');
+
     // include alpaca styles unless explicitly told otherwise
     if(!('includeAlpacaStyles' in options) || options.includeAlpacaStyles) {
       app.import(app.bowerDirectory + '/alpaca/dist/alpaca/bootstrap/alpaca.css');