Skip to content

Commit 49b4508

Browse files
committed
⬆️ v3.5.1...v3.6.1
1 parent 907b76e commit 49b4508

8 files changed

Lines changed: 80 additions & 131 deletions

File tree

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/.watchmanconfig
1818
/bower.json
1919
/config/ember-try.js
20+
/CONTRIBUTING.md
2021
/ember-cli-build.js
2122
/testem.js
2223
/tests/

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ env:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
2121

22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
2228
jobs:
2329
fail_fast: true
2430
allow_failures:
@@ -45,6 +51,7 @@ jobs:
4551
- stage: 'Additional Tests'
4652
env: EMBER_TRY_SCENARIO=ember-lts-2.16
4753
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
54+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4855
- env: EMBER_TRY_SCENARIO=ember-release
4956
- env: EMBER_TRY_SCENARIO=ember-beta
5057
- env: EMBER_TRY_SCENARIO=ember-canary

CONTRIBUTING.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22

33
## Installation
44

5-
- `git clone <repository-url>`
6-
- `cd ember-cli-text-support-mixins`
7-
- `yarn install`
5+
```
6+
* `git clone <repository-url>`
7+
* `cd ember-data-bootstrap3-forms`
8+
* `yarn install`
89
910
## Linting
1011
11-
- `yarn lint:hbs`
12-
- `yarn lint:js`
13-
- `yarn lint:js --fix`
12+
* `yarn lint:hbs`
13+
* `yarn lint:js`
14+
* `yarn lint:js --fix`
1415
1516
## Running tests
1617
17-
- `ember test` – Runs the test suite on the current Ember version
18-
- `ember test --server` – Runs the test suite in "watch mode"
19-
- `ember try:each` – Runs the test suite against multiple Ember versions
18+
* `ember test` – Runs the test suite on the current Ember version
19+
* `ember test --server` – Runs the test suite in "watch mode"
20+
* `ember try:each` – Runs the test suite against multiple Ember versions
2021
2122
## Running the dummy application
2223
23-
- `ember serve`
24-
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
24+
* `ember serve`
25+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2526
2627
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
2728
@@ -57,9 +58,11 @@ Make sure your `~/.aws/credentials` file has a profile named _cybertooth_
5758
with a valid key and secret,
5859
5960
```
61+
6062
[cybertooth]
6163
aws_access_key_id = <KEY>
6264
aws_secret_access_key = <SECRET>
65+
6366
```
6467
6568
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
6972
# Releasing & Publishing To NPM
7073
7174
```
75+
7276
npm version x.y.z-sub.#
7377
git push
7478
git push --tags
7579
npm publish
76-
```

README.md

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -122,37 +122,6 @@ component is watching that particular view of the errors.
122122
1. Do you have Ember Data in your application and are using it for your data modeling?
123123
1. Is Bootstrap 3 installed? As the addon's name states, this isn't Bootstrap 4 ready.
124124

125-
```
126-
ember install my-addon
127-
```
128-
129-
## Contributing
130-
131-
### Installation
132-
133-
- `git clone <repository-url>`
134-
- `cd my-addon`
135-
- `npm install`
136-
137-
### Linting
138-
139-
- `yarn lint:hbs`
140-
- `yarn lint:js`
141-
- `yarn lint:js --fix`
142-
143-
### Running tests
144-
145-
- `ember test` – Runs the test suite on the current Ember version
146-
- `ember test --server` – Runs the test suite in "watch mode"
147-
- `ember try:each` – Runs the test suite against multiple Ember versions
148-
149-
### Running the dummy application
150-
151-
- `ember serve`
152-
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
153-
154-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
155-
156125
## License
157126

158127
This project is licensed under the [MIT License](LICENSE.md).

config/ember-try.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ module.exports = function () {
3030
},
3131
},
3232
},
33+
{
34+
name: 'ember-lts-3.4',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': '~3.4.0'
38+
}
39+
}
40+
},
3341
{
3442
name: 'ember-release',
3543
npm: {
@@ -54,6 +62,10 @@ module.exports = function () {
5462
},
5563
},
5664
},
65+
// The default `.travis.yml` runs this scenario via `yarn test`,
66+
// not via `ember try`. It's still included here so that running
67+
// `ember try:each` manually or from a customized CI config will run it
68+
// along with all the other scenarios.
5769
{
5870
name: 'ember-default',
5971
npm: {

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"update-browserslist": "npx browserslist@latest --update-db"
4141
},
4242
"dependencies": {
43-
"ember-cli-babel": "^6.16.0",
43+
"ember-cli-babel": "^7.1.2",
4444
"ember-cli-htmlbars": "^3.0.0"
4545
},
4646
"devDependencies": {
@@ -50,8 +50,7 @@
5050
"bootstrap-sass": "3.4.1",
5151
"bootswatch": "^3.3.7",
5252
"broccoli-asset-rev": "^2.7.0",
53-
"ember-ajax": "^5.1.1",
54-
"ember-cli": "~3.5.1",
53+
"ember-cli": "~3.6.1",
5554
"ember-cli-dependency-checker": "^3.0.0",
5655
"ember-cli-deploy": "^1.0.1",
5756
"ember-cli-deploy-build": "^1.1.0",
@@ -65,15 +64,15 @@
6564
"ember-cli-template-lint": "^1.0.0-beta.1",
6665
"ember-cli-uglify": "^3.0.0",
6766
"ember-cli-update": "^0.56",
68-
"ember-data": "~3.5",
67+
"ember-data": "~3.6.0",
6968
"ember-disable-prototype-extensions": "^1.1.3",
7069
"ember-export-application-global": "^2.0.0",
7170
"ember-load-initializers": "^1.1.0",
7271
"ember-maybe-import-regenerator": "^0.1.6",
7372
"ember-qunit": "^3.4.1",
7473
"ember-resolver": "^5.0.1",
7574
"ember-route-action-helper": "^2.0.6",
76-
"ember-source": "~3.5.1",
75+
"ember-source": "~3.6.0",
7776
"ember-source-channel-url": "^3.0.0",
7877
"ember-try": "^1.0.0",
7978
"eslint-plugin-ember": "^5.2.0",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.5.1",
6+
"version": "3.6.1",
77
"blueprints": [
88
{
99
"name": "addon",
1010
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": ["--yarn", "--no-welcome"]
13+
"options": [
14+
"--yarn",
15+
"--no-welcome"
16+
]
1417
}
1518
]
1619
}

0 commit comments

Comments
 (0)