Chore/update ember

.eslintignore

@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',

.npmignore

@@ -12,8 +12,9 @@
 /.eslintignore
 /.eslintrc.js
 /.gitignore
-/.watchmanconfig
+/.template-lintrc.js
 /.travis.yml
+/.watchmanconfig
 /bower.json
 /config/ember-try.js
 /ember-cli-build.js

.travis.yml

@@ -11,10 +11,6 @@ dist: trusty
 addons:
   chrome: stable
 
-cache:
-  directories:
-    - $HOME/.cache/bower
-
 env:
   global:
     # See https://git.io/vdao3 for details.
@@ -46,14 +42,12 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
 
 before_install:
-  - npm i -g bower
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - sleep 3 # give xvfb some time to start
 
 install:
   - yarn
-  - bower install
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- bump esri-loader to 2.10.0 to default to JSAPI 4.12
+### Breaking
+- esri-loader is now a peer dependency and must be explicitly installed
+- removed deprecated `esriLoader.load()` in favor of `esriLoader.loadScript()`
+### Changed
+- remove bower and have dummy app get bootstrap from CDN
+- no longer use jQuery (or bootstrap JS) in dummy app
+
+## 2.9.1
 ### Changed
 - added more support for engines, and ensured this runs before `broccoli-asset-rev`
 

README.md

@@ -16,6 +16,7 @@ Installation
 In your app's root folder run:
 
 ```shell
+npm install esri-loader
 ember install ember-esri-loader
 ```
 

addon/services/esri-loader.js

@@ -10,7 +10,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-import { deprecate } from '@ember/application/deprecations';
 
 import { run } from '@ember/runloop';
 import { Promise as EmberPromise } from 'rsvp';
@@ -32,6 +31,8 @@ export default Service.extend({
     }
   },
 
+  // inject a script tag pointing to the JSAPI in the page
+  // and return a promise once it's loaded
   loadScript (options) {
     return esriLoader.loadScript(options)
     .then(script => {
@@ -45,16 +46,6 @@ export default Service.extend({
     });
   },
 
-  // inject a script tag pointing to the JSAPI in the page
-  // and return a promise once it's loaded
-  load (options = {}) {
-    deprecate('esriLoader.load() will be removed at the next breaking version. Use esriLoader.loadScript() instead.', false, {
-      id: 'ember-esri-loader.load',
-      until: '10.0.0'
-    });
-    return this.loadScript(options);
-  },
-
   // require the modules and return a pomise that reolves them as an array
   loadModules (moduleNames, options) {
     return esriLoader.loadModules(moduleNames, options);

config/ember-try.js

@@ -14,7 +14,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.16',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {
@@ -26,7 +26,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.18',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {

ember-cli-build.js

@@ -13,8 +13,6 @@ module.exports = function(defaults) {
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
-  app.import(app.bowerDirectory + '/bootstrap/js/transition.js');
-  app.import(app.bowerDirectory + '/bootstrap/js/collapse.js');
 
   return app.toTree();
 };

package.json

@@ -25,43 +25,46 @@
     "test": "ember test",
     "test:all": "ember try:each --skip-cleanup"
   },
+  "peerDependencies": {
+    "esri-loader": "^2.10.0"
+  },
   "dependencies": {
     "broccoli-funnel": "^1.1.0",
     "broccoli-merge-trees": "^2.0.0",
     "broccoli-string-replace": "^0.1.2",
-    "ember-cli-babel": "^6.16.0",
-    "esri-loader": "~2.9.1"
+    "ember-cli-babel": "^6.16.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.6.3",
     "broccoli-asset-rev": "^2.7.0",
     "ember-ajax": "^3.1.0",
-    "ember-cli": "~3.4.3",
+    "ember-cli": "~3.5.1",
     "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-htmlbars-inline-precompile": "^1.0.3",
     "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-qunit": "^4.3.2",
     "ember-cli-release": "^1.0.0-beta.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-surge": "^1.2.0",
+    "ember-cli-surge": "~1.2.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-uglify": "^2.1.0",
     "ember-cli-update": "^0.27.3",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^3.4.1",
     "ember-resolver": "^5.0.1",
     "ember-sinon-qunit": "^3.1.0",
-    "ember-source": "~3.4.0",
+    "ember-source": "~3.5.1",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^1.0.0",
     "eslint-plugin-ember": "^5.2.0",
     "eslint-plugin-node": "^7.0.1",
+    "esri-loader": "^2.10.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.7.1"
+    "qunit-dom": "^0.8.0"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"

tests/dummy/app/templates/application.hbs

@@ -1,10 +1,10 @@
 <div class="container">
 
-  <!-- JSAPI load status -->
+  {{!-- JSAPI load status --}}
   <p style="text-align: right">The ArcGIS API for JavaScript
     is: <strong>{{#unless jsapiLoaded }}<span class="text-muted">Loading...</span>{{else}}<span class="text-success">Loaded</span>{{/unless}}</strong></p>
 
-  <!-- navbar -->
+  {{!-- navbar --}}
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <div class="navbar-header">
@@ -26,10 +26,10 @@
           <li><a href="https://github.com/Esri/ember-esri-loader" target="_blank">GitHub</a></li>
         </ul>
       </div>
-    </div><!--/.container-fluid -->
+    </div>{{!--/.container-fluid --}}
   </nav>
 
-  <!-- page content -->
+  {{!-- page content --}}
   {{outlet}}
 
-</div> <!-- /container -->
+</div> {{!-- /container --}}

tests/dummy/config/optional-features.json

@@ -1,3 +1,3 @@
 {
-  "jquery-integration": true
+  "jquery-integration": false
 }

tests/index.html

@@ -7,6 +7,10 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <!-- bootstrap from CDN b/c it's quick and easy -->
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+
     {{content-for "head"}}
     {{content-for "test-head"}}