Skip to content

Commit b406864

Browse files
committed
⬆️ v3.9.0...v3.10.1
1 parent 84d568e commit b406864

10 files changed

Lines changed: 391 additions & 464 deletions

File tree

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
4+
ecmaVersion: 2018,
55
sourceType: 'module',
66
},
77
plugins: ['ember'],

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set Node.js
1515
uses: actions/setup-node@master
1616
with:
17-
node-version: 10.24.1
17+
node-version: 12.22.8
1818

1919
- name: Get yarn cache
2020
id: yarn-cache

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs 10.24.1
1+
nodejs 12.22.8

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- '6'
6+
- '8'
77

88
sudo: false
99
dist: trusty

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"yaml.schemas": {
3+
"https://json.schemastore.org/github-workflow.json": "file:///Users/dnelson/Code/ember-addons/ember-data-bootstrap3-forms/.github/workflows/build.yml"
4+
}
5+
}

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ This addon helps present your Ember-Data model errors in a consistent fashion us
1010

1111
- Ember.js v2.18 or above
1212
- Ember CLI v2.13 or above
13-
- Ember Data - the `twbs-errors-alert` & `twbs-form-group` components depend on Ember Data's
13+
- Node.js v8 or above
14+
15+
* Ember Data - the `twbs-errors-alert` & `twbs-form-group` components depend on Ember Data's
1416
modeling of errors.
15-
- You should have Bootstrap 3.x
17+
* You should have Bootstrap 3.x
1618

1719
## Installation
1820

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,42 +40,42 @@
4040
"update-browserslist": "npx browserslist@latest --update-db"
4141
},
4242
"dependencies": {
43-
"ember-cli-babel": "^7.1.2",
44-
"ember-cli-htmlbars": "^3.0.0"
43+
"ember-cli-babel": "^7.7.3",
44+
"ember-cli-htmlbars": "^3.0.1"
4545
},
4646
"devDependencies": {
4747
"@ember/jquery": "^1.1",
48-
"@ember/optional-features": "^0.6.3",
48+
"@ember/optional-features": "^0.7.0",
4949
"bootstrap": "3.4.1",
5050
"bootstrap-sass": "3.4.1",
5151
"bootswatch": "^3.3.7",
52-
"broccoli-asset-rev": "^2.7.0",
53-
"ember-cli": "~3.9.0",
52+
"broccoli-asset-rev": "^3.0.0",
53+
"ember-cli": "~3.10.1",
5454
"ember-cli-dependency-checker": "^3.1.0",
5555
"ember-cli-deploy": "^1.0.1",
5656
"ember-cli-deploy-build": "^1.1.0",
5757
"ember-cli-deploy-gzip": "^2.0.1",
5858
"ember-cli-deploy-s3": "^1.1.0",
59-
"ember-cli-eslint": "^4.2.3",
60-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
59+
"ember-cli-eslint": "^5.1.0",
60+
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
6161
"ember-cli-inject-live-reload": "^2.1.0",
6262
"ember-cli-sass": "^8.0.1",
6363
"ember-cli-sri": "^2.1.1",
6464
"ember-cli-template-lint": "^1.0.0-beta.1",
6565
"ember-cli-uglify": "^3.0.0",
6666
"ember-cli-update": "^0.56",
67-
"ember-data": "~3.8.0",
67+
"ember-data": "~3.10.0",
6868
"ember-disable-prototype-extensions": "^1.1.3",
6969
"ember-export-application-global": "^2.0.0",
70-
"ember-load-initializers": "^1.1.0",
70+
"ember-load-initializers": "^2.0.0",
7171
"ember-maybe-import-regenerator": "^0.1.6",
72-
"ember-qunit": "^3.4.1",
72+
"ember-qunit": "^4.4.1",
7373
"ember-resolver": "^5.0.1",
7474
"ember-route-action-helper": "^2.0.6",
75-
"ember-source": "~3.9.0",
75+
"ember-source": "~3.10.0",
7676
"ember-source-channel-url": "^3.0.0",
7777
"ember-try": "^1.0.0",
78-
"eslint-plugin-ember": "^5.2.0",
78+
"eslint-plugin-ember": "^6.2.0",
7979
"eslint-plugin-node": "^11.1.0",
8080
"font-awesome": "4.7",
8181
"loader.js": "^4.7.0",
@@ -84,7 +84,7 @@
8484
"sass": "~1.14.3"
8585
},
8686
"engines": {
87-
"node": "6.* || 8.* || >= 10.*"
87+
"node": "8.* || >= 10.*"
8888
},
8989
"ember-addon": {
9090
"configPath": "tests/dummy/config"

tests/dummy/app/models/demo-model.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
import Model, { attr } from '@ember-data/model';
12
import { observer } from '@ember/object';
2-
import DS from 'ember-data';
33

4-
export default DS.Model.extend({
5-
anotherString: DS.attr('string'),
6-
someBoolean: DS.attr('boolean'),
7-
someNumber: DS.attr('number'),
8-
someString: DS.attr('string'),
4+
export default Model.extend({
5+
anotherString: attr('string'),
6+
7+
someBoolean: attr('boolean'),
8+
9+
someNumber: attr('number'),
10+
11+
someString: attr('string'),
12+
13+
// eslint-disable-next-line ember/no-observers
914
_addErrorToAnotherString: observer('anotherString', function () {
1015
if (this.anotherString === 'error') {
1116
this.errors._add('anotherString', 'Now change the text to error2 to add a second');

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.9.0",
6+
"version": "3.10.1",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)