⬆️ Upgrade To Ember-Cli 3.10 (#49)

nadnoslen · web-flow · commit 09aa5c52756c · 2022-04-15T23:11:33.000-06:00
* ⬆️ v3.4.4...v3.5.1

* v3.5.0

* ⬆️ v3.5.1...v3.6.1

* v3.6.0

* ⬆️ v3.6.1...v3.7.1

* v3.7.0

* ⬆️ v3.7.1...v3.8.3

* v3.8.0

* ⬆️ v3.8.3...v3.9.0

* v3.9.0

* ⬆️ v3.9.0...v3.10.1

* v3.10.0
diff --git a/.eslintignore b/.eslintignore
@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module',
   },
   plugins: ['ember'],
@@ -14,6 +14,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
@@ -23,7 +24,6 @@ module.exports = {
         'tests/dummy/config/**/*.js',
       ],
       excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
-      excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
       parserOptions: {
         sourceType: 'script',
         ecmaVersion: 2015,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set Node.js
         uses: actions/setup-node@master
         with:
-          node-version: 10.24.1
+          node-version: 12.22.8
 
       - name: Get yarn cache
         id: yarn-cache
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/
diff --git a/.npmignore b/.npmignore
@@ -9,13 +9,16 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
 /.eslintignore
 /.eslintrc.js
 /.gitignore
-/.watchmanconfig
+/.template-lintrc.js
 /.travis.yml
+/.watchmanconfig
 /bower.json
 /config/ember-try.js
+/CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-nodejs 10.24.1
+nodejs 12.22.8
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - '6'
+  - '8'
 
 sudo: false
 dist: trusty
@@ -19,6 +19,12 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
+branches:
+  only:
+    - master
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
+
 jobs:
   fail_fast: true
   allow_failures:
@@ -43,8 +49,8 @@ jobs:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - stage: 'Additional Tests'
-      env: EMBER_TRY_SCENARIO=ember-lts-2.16
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+      env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "yaml.schemas": {
+    "https://json.schemastore.org/github-workflow.json": "file:///Users/dnelson/Code/ember-addons/ember-data-bootstrap3-forms/.github/workflows/build.yml"
+  }
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,26 +2,27 @@
 
 ## Installation
 
-- `git clone <repository-url>`
-- `cd ember-cli-text-support-mixins`
-- `yarn install`
+```
+* `git clone <repository-url>`
+* `cd ember-data-bootstrap3-forms`
+* `yarn install`
 
 ## Linting
 
-- `yarn lint:hbs`
-- `yarn lint:js`
-- `yarn lint:js --fix`
+* `yarn lint:hbs`
+* `yarn lint:js`
+* `yarn lint:js --fix`
 
 ## Running tests
 
-- `ember test` – Runs the test suite on the current Ember version
-- `ember test --server` – Runs the test suite in "watch mode"
-- `ember try:each` – Runs the test suite against multiple Ember versions
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-- `ember serve`
-- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+* `ember serve`
+* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
 
@@ -57,9 +58,11 @@ Make sure your `~/.aws/credentials` file has a profile named _cybertooth_
 with a valid key and secret,
 
 ```
+
 [cybertooth]
 aws_access_key_id = <KEY>
 aws_secret_access_key = <SECRET>
+
 ```
 
 Deploy by invoking the following command: `ember deploy production`
@@ -69,8 +72,8 @@ Confirm your changes are showing up in our S3 container: http://ember-data-boots
 # Releasing & Publishing To NPM
 
 ```
+
 npm version x.y.z-sub.#
 git push
 git push --tags
 npm publish
-```
diff --git a/README.md b/README.md
@@ -6,20 +6,18 @@
 
 This addon helps present your Ember-Data model errors in a consistent fashion using Bootstrap3 alerts and help-blocks.
 
-## Requirements
+## Compatibility
 
-- Ember >= 1.13.0
-- Ember CLI
-- Ember Data - the `twbs-errors-alert` & `twbs-form-group` components depend on Ember Data's
+- Ember.js v2.18 or above
+- Ember CLI v2.13 or above
+- Node.js v8 or above
+
+* Ember Data - the `twbs-errors-alert` & `twbs-form-group` components depend on Ember Data's
   modeling of errors.
-- You should have Bootstrap 3.x installed in your Ember application. Feel free to use the
-  [ember-cli-bootstrap3-sass](http://emberobserver.com/addons/ember-cli-bootstrap3-sass)
-  addon to setup Bootstrap if you haven't already done so.
+* You should have Bootstrap 3.x
 
 ## Installation
 
-The following will install this addon:
-
 ```
 ember install ember-data-bootstrap3-forms
 ```
@@ -122,36 +120,9 @@ component is watching that particular view of the errors.
 1. Do you have Ember Data in your application and are using it for your data modeling?
 1. Is Bootstrap 3 installed? As the addon's name states, this isn't Bootstrap 4 ready.
 
-```
-ember install my-addon
-```
-
 ## Contributing
 
-### Installation
-
-- `git clone <repository-url>`
-- `cd my-addon`
-- `npm install`
-
-### Linting
-
-- `yarn lint:hbs`
-- `yarn lint:js`
-- `yarn lint:js --fix`
-
-### Running tests
-
-- `ember test` – Runs the test suite on the current Ember version
-- `ember test --server` – Runs the test suite in "watch mode"
-- `ember try:each` – Runs the test suite against multiple Ember versions
-
-### Running the dummy application
-
-- `ember serve`
-- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
-
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+See the [Contributing](CONTRIBUTING.md) guide for details.
 
 ## License
 
diff --git a/addon/components/twbs-form.js b/addon/components/twbs-form.js
@@ -14,16 +14,13 @@ export default Component.extend({
   layout,
   tagName: 'form',
   didInsertElement() {
-    const resetAction = this.reset;
-    if (isPresent(resetAction)) {
-      this.$()
-        .off('reset.twbs-form')
-        .on('reset.twbs-form', function () {
-          resetAction();
-        });
+    if (isPresent(this.reset)) {
+      this.element.addEventListener('reset', this.reset);
     }
   },
   willDestroyElement() {
-    this.$().off('reset.twbs-form');
+    if (isPresent(this.reset)) {
+      this.element.removeEventListener('reset', this.reset);
+    }
   },
 });
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -7,26 +7,22 @@ module.exports = function () {
     return {
       scenarios: [
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-2.18',
           env: {
             EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
           },
           npm: {
             devDependencies: {
               '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0',
+              'ember-source': '~2.18.0',
             },
           },
         },
         {
-          name: 'ember-lts-2.18',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
-          },
+          name: 'ember-lts-3.4',
           npm: {
             devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0',
+              'ember-source': '~3.4.0',
             },
           },
         },
@@ -54,6 +50,10 @@ module.exports = function () {
             },
           },
         },
+        // The default `.travis.yml` runs this scenario via `yarn test`,
+        // not via `ember try`. It's still included here so that running
+        // `ember try:each` manually or from a customized CI config will run it
+        // along with all the other scenarios.
         {
           name: 'ember-default',
           npm: {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-data-bootstrap3-forms",
-  "version": "3.4.0",
+  "version": "3.10.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -40,43 +40,42 @@
     "update-browserslist": "npx browserslist@latest --update-db"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.16.0",
-    "ember-cli-htmlbars": "^3.0.0"
+    "ember-cli-babel": "^7.7.3",
+    "ember-cli-htmlbars": "^3.0.1"
   },
   "devDependencies": {
     "@ember/jquery": "^1.1",
-    "@ember/optional-features": "^0.6.3",
+    "@ember/optional-features": "^0.7.0",
     "bootstrap": "3.4.1",
     "bootstrap-sass": "3.4.1",
     "bootswatch": "^3.3.7",
-    "broccoli-asset-rev": "^2.7.0",
-    "ember-ajax": "^5.1.1",
-    "ember-cli": "~3.4.4",
-    "ember-cli-dependency-checker": "^3.0.0",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-cli": "~3.10.1",
+    "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-deploy": "^1.0.1",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-gzip": "^2.0.1",
     "ember-cli-deploy-s3": "^1.1.0",
-    "ember-cli-eslint": "^4.2.3",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-qunit": "^4.3.2",
     "ember-cli-sass": "^8.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-uglify": "^3.0.0",
     "ember-cli-update": "^0.56",
-    "ember-data": "2.14",
+    "ember-data": "~3.10.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
     "ember-route-action-helper": "^2.0.6",
-    "ember-source": "~3.4.0",
+    "ember-source": "~3.10.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.0.0",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-ember": "^6.2.0",
     "eslint-plugin-node": "^11.1.0",
     "font-awesome": "4.7",
     "loader.js": "^4.7.0",
@@ -85,7 +84,7 @@
     "sass": "~1.14.3"
   },
   "engines": {
-    "node": "6.* || 8.* || >= 10.*"
+    "node": "8.* || >= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
diff --git a/tests/dummy/app/models/demo-model.js b/tests/dummy/app/models/demo-model.js
diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
diff --git a/tests/index.html b/tests/index.html
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "yaml.schemas": {
 +    "https://json.schemastore.org/github-workflow.json": "file:///Users/dnelson/Code/ember-addons/ember-data-bootstrap3-forms/.github/workflows/build.yml"
 +  }
 +}