Skip to content

Commit 0903fd1

Browse files
committed
⬆️ 3.1...3.2
1 parent 91628d7 commit 0903fd1

13 files changed

Lines changed: 1517 additions & 648 deletions

File tree

.eslintignore

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
/blueprints/*/files/**/*.js
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
15+
# ember-try
16+
/.node_modules.ember-try/

.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: 8.17.0
17+
node-version: 10.24.1
1818

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

.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
1919

2020
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
yarn.lock
1718

1819
# ember-try
1920
.node_modules.ember-try/

.tool-versions

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

.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-
- "4"
6+
- "6"
77

88
sudo: false
99
dist: trusty

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
"keywords": [
66
"ember-addon"
77
],
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/cybertoothca/ember-data-bootstrap3-forms.git"
11+
},
812
"license": "MIT",
913
"author": {
1014
"name": "cybertooth.io",
@@ -22,15 +26,11 @@
2226
"doc": "doc",
2327
"test": "tests"
2428
},
25-
"repository": {
26-
"type": "git",
27-
"url": "https://github.com/cybertoothca/ember-data-bootstrap3-forms.git"
28-
},
2929
"scripts": {
3030
"build": "ember build",
3131
"ember-cli-update": "ember-cli-update",
3232
"ember-cli-update:codemods": "ember-cli-update --run-codemods",
33-
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
33+
"lint:js": "eslint .",
3434
"prettier:check": "prettier --check .",
3535
"prettier:write": "prettier --write .",
3636
"start": "ember serve",
@@ -46,9 +46,9 @@
4646
"bootstrap": "3.4.1",
4747
"bootstrap-sass": "3.4.1",
4848
"bootswatch": "^3.3.7",
49-
"broccoli-asset-rev": "^2.4.5",
49+
"broccoli-asset-rev": "^2.7.0",
5050
"ember-ajax": "^3.0.0",
51-
"ember-cli": "~3.1.4",
51+
"ember-cli": "~3.2.0",
5252
"ember-cli-dependency-checker": "^2.0.0",
5353
"ember-cli-deploy": "^1.0.1",
5454
"ember-cli-deploy-build": "^1.1.0",
@@ -57,30 +57,31 @@
5757
"ember-cli-eslint": "^4.2.1",
5858
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
5959
"ember-cli-inject-live-reload": "^1.4.1",
60-
"ember-cli-qunit": "^4.1.1",
60+
"ember-cli-qunit": "^4.3.2",
6161
"ember-cli-sass": "^8.0.1",
6262
"ember-cli-shims": "^1.2.0",
6363
"ember-cli-sri": "^2.1.0",
6464
"ember-cli-uglify": "^2.0.0",
65-
"ember-cli-update": "^0.40",
65+
"ember-cli-update": "^0.56",
6666
"ember-data": "2.14",
6767
"ember-disable-prototype-extensions": "^1.1.2",
6868
"ember-export-application-global": "^2.0.0",
69-
"ember-load-initializers": "^1.0.0",
69+
"ember-load-initializers": "^1.1.0",
7070
"ember-maybe-import-regenerator": "^0.1.6",
7171
"ember-resolver": "^4.0.0",
7272
"ember-route-action-helper": "^2.0.6",
73-
"ember-source": "~3.1.0",
73+
"ember-source": "~3.2.0",
7474
"ember-source-channel-url": "^1.0.1",
7575
"ember-try": "^0.2.23",
7676
"eslint-plugin-ember": "^5.0.0",
7777
"eslint-plugin-node": "^6.0.1",
7878
"font-awesome": "4.7",
7979
"loader.js": "^4.2.3",
80+
"qunit-dom": "0.9",
8081
"sass": "~1.14.3"
8182
},
8283
"engines": {
83-
"node": "^4.5 || 6.* || >= 7.*"
84+
"node": "6.* || 8.* || >= 10.*"
8485
},
8586
"ember-addon": {
8687
"configPath": "tests/dummy/config"

testem.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
launch_in_dev: ["Chrome"],
66
browser_args: {
77
Chrome: {
8-
mode: "ci",
9-
args: [
8+
ci: [
109
// --no-sandbox is needed when running Chrome inside a container
11-
process.env.TRAVIS ? "--no-sandbox" : null,
12-
13-
"--disable-gpu",
10+
process.env.CI ? "--no-sandbox" : null,
1411
"--headless",
12+
"--disable-gpu",
13+
"--disable-dev-shm-usage",
14+
"--disable-software-rasterizer",
15+
"--mute-audio",
1516
"--remote-debugging-port=0",
1617
"--window-size=1440,900",
1718
].filter(Boolean),

tests/integration/components/hidden-submit-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module('Integration | Component | hidden submit', function(hooks) {
88

99
test("button is classed with `hidden-submit` and bootstrap's `sr-only`", async function(assert) {
1010
await render(hbs`{{hidden-submit}}`);
11-
assert.ok(find('button').classList.contains('hidden-submit'));
12-
assert.ok(find('button').classList.contains('sr-only'));
11+
assert.dom('button').hasClass('hidden-submit');
12+
assert.dom('button').hasClass('sr-only');
1313
});
1414

1515
test('button contains html comment concerning its purpose', async function(assert) {

0 commit comments

Comments
 (0)