Skip to content

Commit 3edb179

Browse files
rwjbluerwjblue
authored
Merge pull request #3 from loganrosen/master
Update to Ember 3.21 blueprint
2 parents 312a774 + 7f88227 commit 3edb179

28 files changed

+2569
-1947
lines changed

‎.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

‎.eslintignore

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

‎.eslintrc.js

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
612
},
713
plugins: [
814
'ember'
@@ -14,15 +20,17 @@ module.exports = {
1420
env: {
1521
browser: true
1622
},
17-
rules: {
18-
},
23+
rules: {},
1924
overrides: [
2025
// node files
2126
{
2227
files: [
28+
'.eslintrc.js',
29+
'.template-lintrc.js',
2330
'ember-cli-build.js',
2431
'index.js',
2532
'testem.js',
33+
'blueprints/*/index.js',
2634
'config/**/*.js',
2735
'tests/dummy/config/**/*.js'
2836
],
@@ -33,17 +41,14 @@ module.exports = {
3341
'tests/dummy/app/**'
3442
],
3543
parserOptions: {
36-
sourceType: 'script',
37-
ecmaVersion: 2015
44+
sourceType: 'script'
3845
},
3946
env: {
4047
browser: false,
4148
node: true
4249
},
4350
plugins: ['node'],
44-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
45-
// add your custom rules and overrides for node files here
46-
})
51+
extends: ['plugin:node/recommended']
4752
}
4853
]
4954
};

‎.gitignore

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
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
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
14-
/coverage/*
16+
/coverage/
1517
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
18+
/npm-debug.log*
19+
/testem.log
20+
/yarn-error.log
1921

2022
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

‎.npmignore

+30-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
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+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.git/
16+
/.gitignore
17+
/.template-lintrc.js
18+
/.travis.yml
19+
/.watchmanconfig
20+
/bower.json
21+
/config/addon-docs.js
222
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.eslintrc.js
11-
.gitignore
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
23+
/CONTRIBUTING.md
24+
/ember-cli-build.js
25+
/testem.js
26+
/tests/
27+
/yarn.lock
28+
.gitkeep
1729

1830
# ember-try
19-
.node_modules.ember-try/
20-
bower.json.ember-try
21-
package.json.ember-try
22-
/config/addon-docs.js
31+
/.node_modules.ember-try/
32+
/bower.json.ember-try
33+
/package.json.ember-try

‎.template-lintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'octane'
5+
};

‎.travis.yml

+36-25
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,55 @@ 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-
- 10
6+
- "10"
77

8-
sudo: false
9-
dist: trusty
8+
dist: xenial
109

1110
addons:
1211
chrome: stable
1312

14-
cache:
15-
directories:
16-
- $HOME/.npm
13+
cache: yarn
1714

1815
env:
1916
global:
2017
# See https://git.io/vdao3 for details.
2118
- JOBS=1
22-
matrix:
23-
# we recommend new addons test the current and previous LTS
24-
# as well as latest stable release (bonus points to beta/canary)
25-
- EMBER_TRY_SCENARIO=ember-lts-3.12
26-
- EMBER_TRY_SCENARIO=ember-lts-3.16
27-
- EMBER_TRY_SCENARIO=ember-lts-3.20
28-
- EMBER_TRY_SCENARIO=ember-release
29-
- EMBER_TRY_SCENARIO=ember-beta
30-
- EMBER_TRY_SCENARIO=ember-canary
31-
32-
matrix:
19+
20+
branches:
21+
only:
22+
- master
23+
# npm version tags
24+
- /^v\d+\.\d+\.\d+/
25+
26+
jobs:
3327
fast_finish: true
3428
allow_failures:
3529
- env: EMBER_TRY_SCENARIO=ember-canary
3630

37-
before_install:
38-
- npm config set spin false
39-
- npm install -g npm@4
40-
- npm --version
31+
include:
32+
# runs linting and tests with current locked deps
33+
- stage: "Tests"
34+
name: "Tests"
35+
script:
36+
- yarn lint
37+
- yarn test:ember
38+
39+
- stage: "Additional Tests"
40+
name: "Floating Dependencies"
41+
install:
42+
- yarn install --no-lockfile
43+
script:
44+
- yarn test:ember
45+
46+
# we recommend new addons test the current and previous LTS
47+
# as well as latest stable release (bonus points to beta/canary)
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
50+
- env: EMBER_TRY_SCENARIO=ember-release
51+
- env: EMBER_TRY_SCENARIO=ember-beta
52+
- env: EMBER_TRY_SCENARIO=ember-canary
53+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
54+
- env: EMBER_TRY_SCENARIO=ember-classic
4155

4256
script:
43-
- npm run lint:js
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
57+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone https://github.com/emberjs/ember-copy`
6+
* `cd ember-copy`
7+
* `yarn`
8+
9+
## Linting
10+
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn lint:js --fix`
14+
15+
## Running tests
16+
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
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018
3+
Copyright (c) 2018-2020
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

+10-22
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ ember-copy
33

44
This addon supplies a copy() function and Copyable mixin to replace the function and mixin now being [deprecated](https://github.com/emberjs/rfcs/pull/322) in Ember.js.
55

6+
7+
Compatibility
8+
------------------------------------------------------------------------------
9+
10+
* Ember.js v3.16 or above
11+
* Ember CLI v2.13 or above
12+
* Node.js v10 or above
13+
14+
615
Installation
716
------------------------------------------------------------------------------
817

@@ -27,29 +36,8 @@ instead use:
2736
Contributing
2837
------------------------------------------------------------------------------
2938

30-
### Installation
31-
32-
* `git clone https://github.com/emberjs/ember-copy`
33-
* `cd ember-copy`
34-
* `npm install`
35-
36-
### Linting
37-
38-
* `npm run lint:js`
39-
* `npm run lint:js -- --fix`
40-
41-
### Running tests
42-
43-
* `ember test` – Runs the test suite on the current Ember version
44-
* `ember test --server` – Runs the test suite in "watch mode"
45-
* `ember try:each` – Runs the test suite against multiple Ember versions
46-
47-
### Running the dummy application
48-
49-
* `ember serve`
50-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
39+
See the [Contributing](CONTRIBUTING.md) guide for details.
5140

52-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
5341

5442
License
5543
------------------------------------------------------------------------------

‎addon/copyable.js

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import Mixin from '@ember/object/mixin';
1111
1212
@class Copyable
1313
*/
14+
// eslint-disable-next-line ember/no-new-mixins
1415
export default Mixin.create({
1516
/**
1617
__Required.__ You must implement this method to apply this mixin.

0 commit comments

Comments
 (0)