Skip to content

Commit d4921dd

Browse files
committed
Update to latest release
1 parent 777368e commit d4921dd

28 files changed

+4125
-1432
lines changed

.eslintignore

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
16+
# ember-try
17+
/.node_modules.ember-try/
18+
/bower.json.ember-try
19+
/package.json.ember-try

.eslintrc.js

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,48 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'.template-lintrc.js',
24+
'ember-cli-build.js',
25+
'index.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
28+
'config/**/*.js',
29+
'tests/dummy/config/**/*.js'
30+
],
31+
excludedFiles: [
32+
'addon/**',
33+
'addon-test-support/**',
34+
'app/**',
35+
'tests/dummy/app/**'
36+
],
37+
parserOptions: {
38+
sourceType: 'script',
39+
ecmaVersion: 2015
40+
},
41+
env: {
42+
browser: false,
43+
node: true
44+
},
45+
plugins: ['node'],
46+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
47+
// add your custom rules and overrides for node files here
48+
})
49+
}
50+
]
1351
};

.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: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.eslintignore
13+
/.eslintrc.js
14+
/.gitignore
15+
/.template-lintrc.js
16+
/.travis.yml
17+
/.watchmanconfig
18+
/bower.json
219
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.eslintrc.js
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
20+
/ember-cli-build.js
21+
/testem.js
22+
/tests/
23+
/yarn.lock
24+
.gitkeep
25+
26+
# ember-try
27+
/.node_modules.ember-try/
28+
/bower.json.ember-try
29+
/package.json.ember-try

.template-lintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended'
5+
};

.travis.yml

Lines changed: 24 additions & 15 deletions
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
@@ -18,20 +18,31 @@ env:
1818
global:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
21-
matrix:
21+
22+
jobs:
23+
fail_fast: true
24+
allow_failures:
25+
- env: EMBER_TRY_SCENARIO=ember-canary
26+
27+
include:
28+
# runs linting and tests with current locked deps
29+
30+
- stage: "Tests"
31+
name: "Tests"
32+
script:
33+
- npm run lint:hbs
34+
- npm run lint:js
35+
- npm test
36+
2237
# we recommend new addons test the current and previous LTS
2338
# as well as latest stable release (bonus points to beta/canary)
24-
- EMBER_TRY_SCENARIO=ember-lts-2.8
25-
- EMBER_TRY_SCENARIO=ember-lts-2.12
26-
- EMBER_TRY_SCENARIO=ember-release
27-
- EMBER_TRY_SCENARIO=ember-beta
28-
- EMBER_TRY_SCENARIO=ember-canary
29-
- EMBER_TRY_SCENARIO=ember-default
30-
31-
matrix:
32-
fast_finish: true
33-
allow_failures:
39+
- stage: "Additional Tests"
40+
env: EMBER_TRY_SCENARIO=ember-lts-2.16
41+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
42+
- env: EMBER_TRY_SCENARIO=ember-release
43+
- env: EMBER_TRY_SCENARIO=ember-beta
3444
- env: EMBER_TRY_SCENARIO=ember-canary
45+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3546

3647
before_install:
3748
- curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -41,6 +52,4 @@ install:
4152
- yarn install --no-lockfile --non-interactive
4253

4354
script:
44-
# Usually, it's ok to finish the test scenario without reverting
45-
# to the addon's original dependency state, skipping "cleanup".
46-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
55+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017
3+
Copyright (c) 2018
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
1-
# @ember/string
1+
@ember/string
2+
==============================================================================
23

3-
This Ember addon contains utility functions to deal with `String`s.
4+
[Short description of the addon.]
45

5-
## Installation
6+
Installation
7+
------------------------------------------------------------------------------
68

7-
* `ember install @ember/string`
9+
```
10+
ember install my-addon
11+
```
812

9-
## Usage
1013

11-
The following exports are available:
14+
Usage
15+
------------------------------------------------------------------------------
1216

13-
```javascript
14-
import {
15-
camelize,
16-
capitalize,
17-
classify,
18-
dasherize,
19-
decamelize,
20-
underscore,
21-
w,
22-
fmt,
23-
loc
24-
} from '@ember/string';
25-
```
17+
[Longer description of how to use the addon in apps.]
2618

27-
### `camelize`, `capitalize`, `classify`, `dasherize`, `decamelize`, `underscore`
2819

29-
These methods transform a string, for example:
20+
Contributing
21+
------------------------------------------------------------------------------
3022

31-
```javascript
32-
import { camelize } from '@ember/string';
23+
### Installation
3324

34-
camelize("my class") // MyClass
35-
```
25+
* `git clone <repository-url>`
26+
* `cd my-addon`
27+
* `npm install`
3628

37-
Consult the tests of the respective function to see the behaviour in more detail.
29+
### Linting
3830

39-
### `w`
31+
* `npm run lint:hbs`
32+
* `npm run lint:js`
33+
* `npm run lint:js -- --fix`
4034

41-
This utility function takes a string, splits it on spaces, and returns an array with the elements.
35+
### Running tests
4236

43-
```javascript
44-
import { w } from '@ember/string';
37+
* `ember test` – Runs the test suite on the current Ember version
38+
* `ember test --server` – Runs the test suite in "watch mode"
39+
* `ember try:each` – Runs the test suite against multiple Ember versions
4540

46-
w("my array of strings") // ["my", "array", "of", "strings"]
47-
```
41+
### Running the dummy application
42+
43+
* `ember serve`
44+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
45+
46+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
4847

49-
### `fmt`, `loc`
48+
License
49+
------------------------------------------------------------------------------
5050

51-
These methods are deprecated and only included to ease the transition from the `Ember.String` namespace.
52-
See [DEPRECATIONS.md](DEPRECATIONS.md) for more details on how to resolve the deprecations.
51+
This project is licensed under the [MIT License](LICENSE.md).

0 commit comments

Comments
 (0)