Skip to content

Commit 5c07cf5

Browse files
author
Jacob Jewell
committed
update dependencies
1 parent 8477ccf commit 5c07cf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2881
-1964
lines changed

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

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

‎.eslintrc.js

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,51 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
20+
browser: true,
2521
},
22+
rules: {},
2623
overrides: [
2724
// node files
2825
{
2926
files: [
3027
'.eslintrc.js',
28+
'.prettierrc.js',
3129
'.template-lintrc.js',
3230
'ember-cli-build.js',
3331
'index.js',
3432
'testem.js',
3533
'blueprints/*/index.js',
3634
'config/**/*.js',
3735
'tests/dummy/config/**/*.js',
36+
'lib/**/*.js',
3837
'node-tests/**/*.js',
39-
'lib/**/*.js'
4038
],
4139
excludedFiles: [
4240
'addon/**',
4341
'addon-test-support/**',
4442
'app/**',
45-
'tests/dummy/app/**'
43+
'tests/dummy/app/**',
4644
],
4745
parserOptions: {
48-
sourceType: 'script'
46+
sourceType: 'script',
4947
},
5048
env: {
5149
browser: false,
5250
node: true,
53-
mocha: true
51+
mocha: true,
5452
},
5553
plugins: ['node'],
56-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
57-
'node/no-unpublished-require': 'off',
58-
'no-console': 'off'
59-
})
60-
}
61-
]
54+
extends: ['plugin:node/recommended'],
55+
},
56+
],
6257
};

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

‎.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig

‎.prettierignore

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

‎.prettierrc.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+
singleQuote: true,
5+
};

‎.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane'
4+
extends: 'octane',
55
};

‎.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ node_js:
55
# so that your addon works for all apps
66
- "10"
77

8-
dist: trusty
8+
dist: xenial
99

1010
addons:
1111
chrome: stable
@@ -46,20 +46,19 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
5049
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5151
- env: EMBER_TRY_SCENARIO=ember-release
5252
- env: EMBER_TRY_SCENARIO=ember-beta
5353
- env: EMBER_TRY_SCENARIO=ember-canary
5454
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5555
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5658

5759
before_install:
5860
- curl -o- -L https://yarnpkg.com/install.sh | bash
5961
- export PATH=$HOME/.yarn/bin:$PATH
6062

61-
install:
62-
- yarn install --non-interactive
63-
6463
script:
6564
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
## Installation
44

55
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `npm install`
6+
* `cd @eflexsystems/ember-cli-coffeescript`
7+
* `yarn install`
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

‎blueprints/acceptance-test/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
22

33
module.exports = {
44
description: 'Generates an acceptance test for a feature.',
5-
locals: function() {
5+
locals: function () {
66
var blueprint = ancestralBlueprint('acceptance-test', this.project);
77
blueprint.project = this.project;
88
return blueprint.locals.apply(blueprint, arguments);
9-
}
9+
},
1010
};

‎blueprints/adapter-test/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
33
module.exports = {
44
description: 'Generates an ember-data adapter unit test.',
55

6-
locals: function() {
6+
locals: function () {
77
var blueprint = ancestralBlueprint('adapter-test', this.project);
88
return blueprint.locals.apply(blueprint, arguments);
9-
}
9+
},
1010
};

‎blueprints/adapter/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
33
module.exports = {
44
description: 'Generates an ember-data adapter.',
55

6-
availableOptions: [
7-
{ name: 'base-class', type: String }
8-
],
9-
locals: function() {
6+
availableOptions: [{ name: 'base-class', type: String }],
7+
locals: function () {
108
var blueprint = ancestralBlueprint('adapter', this.project);
119
var locals = blueprint.locals.apply(blueprint, arguments);
1210
locals.importStatement = locals.importStatement.replace(/;$/, '');
1311
return locals;
14-
}
12+
},
1513
};

‎blueprints/addon-import/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
33
module.exports = {
44
description: 'Generates an import wrapper',
55

6-
fileMapTokens: function() {
6+
fileMapTokens: function () {
77
var blueprint = ancestralBlueprint('addon-import', this.project);
88
return blueprint.fileMapTokens.apply(blueprint, arguments);
99
},
1010

11-
locals: function() {
11+
locals: function () {
1212
var blueprint = ancestralBlueprint('addon-import', this.project);
1313
return blueprint.locals.apply(blueprint, arguments);
14-
}
14+
},
1515
};

‎blueprints/component-addon/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
33
module.exports = {
44
description: 'Generates a component. Name must contain a hyphen.',
55

6-
fileMapTokens: function() {
6+
fileMapTokens: function () {
77
var blueprint = ancestralBlueprint('component-addon', this.project);
88
return blueprint.fileMapTokens.apply(blueprint, arguments);
99
},
1010

11-
normalizeEntityName: function() {
11+
normalizeEntityName: function () {
1212
var blueprint = ancestralBlueprint('component-addon', this.project);
1313
return blueprint.normalizeEntityName.apply(blueprint, arguments);
1414
},
1515

16-
locals: function() {
16+
locals: function () {
1717
var blueprint = ancestralBlueprint('component-addon', this.project);
1818
return blueprint.locals.apply(blueprint, arguments);
19-
}
19+
},
2020
};

‎blueprints/component-test/index.js

Lines changed: 63 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,90 @@ module.exports = {
1212
type: ['integration', 'unit'],
1313
default: 'integration',
1414
aliases: [
15-
{ 'i': 'integration' },
16-
{ 'u': 'unit' },
17-
{ 'integration': 'integration' },
18-
{ 'unit': 'unit' }
19-
]
20-
}
15+
{ i: 'integration' },
16+
{ u: 'unit' },
17+
{ integration: 'integration' },
18+
{ unit: 'unit' },
19+
],
20+
},
2121
],
2222

23-
fileMapTokens: function() {
23+
fileMapTokens: function () {
2424
var blueprint = ancestralBlueprint('component-test', this.project);
2525
return blueprint.fileMapTokens.apply(blueprint, arguments);
2626
},
2727

28-
locals: function(options) {
28+
locals: function (options) {
2929
var blueprint = ancestralBlueprint('component-test', this.project);
3030
var locals = blueprint.locals.apply(blueprint, arguments);
3131

3232
var dasherizedModuleName = stringUtils.dasherize(options.entity.name);
3333
var testImports = EOL + "import hbs from 'htmlbars-inline-precompile'";
34-
var testOptions = "integration: true";
34+
var testOptions = 'integration: true';
3535

36-
var testContent = "assert.expect 2" + EOL + EOL +
37-
" # Set any properties with @set 'myProperty', 'value'" + EOL +
38-
" # Handle any actions with @on 'myAction', (val) ->" + EOL + EOL +
39-
' @render hbs """{{' + dasherizedModuleName + '}}"""' + EOL + EOL +
40-
" assert.equal @$().text().trim(), ''" + EOL + EOL +
41-
" # Template block usage:" + EOL +
42-
' @render hbs """' + EOL +
43-
" {{#" + dasherizedModuleName + "}}" + EOL +
44-
" template block text" + EOL +
45-
" {{/" + dasherizedModuleName + "}}" + EOL +
46-
' """' + EOL + EOL +
36+
var testContent =
37+
'assert.expect 2' +
38+
EOL +
39+
EOL +
40+
" # Set any properties with @set 'myProperty', 'value'" +
41+
EOL +
42+
" # Handle any actions with @on 'myAction', (val) ->" +
43+
EOL +
44+
EOL +
45+
' @render hbs """{{' +
46+
dasherizedModuleName +
47+
'}}"""' +
48+
EOL +
49+
EOL +
50+
" assert.equal @$().text().trim(), ''" +
51+
EOL +
52+
EOL +
53+
' # Template block usage:' +
54+
EOL +
55+
' @render hbs """' +
56+
EOL +
57+
' {{#' +
58+
dasherizedModuleName +
59+
'}}' +
60+
EOL +
61+
' template block text' +
62+
EOL +
63+
' {{/' +
64+
dasherizedModuleName +
65+
'}}' +
66+
EOL +
67+
' """' +
68+
EOL +
69+
EOL +
4770
" assert.equal @$().text().trim(), 'template block text'";
4871

4972
if (options.testType === 'unit') {
50-
testImports = "";
51-
testOptions = "# Specify the other units that are required for this test" + EOL +
52-
" # needs: ['component:foo', 'helper:bar']," + EOL + " unit: true";
73+
testImports = '';
74+
testOptions =
75+
'# Specify the other units that are required for this test' +
76+
EOL +
77+
" # needs: ['component:foo', 'helper:bar']," +
78+
EOL +
79+
' unit: true';
5380

54-
testContent = "assert.expect 1" + EOL + EOL +
55-
" # Creates the component instance" + EOL +
56-
" component = @subject()" + EOL +
57-
" # Renders the component to the page" + EOL +
58-
" @render()" + EOL +
81+
testContent =
82+
'assert.expect 1' +
83+
EOL +
84+
EOL +
85+
' # Creates the component instance' +
86+
EOL +
87+
' component = @subject()' +
88+
EOL +
89+
' # Renders the component to the page' +
90+
EOL +
91+
' @render()' +
92+
EOL +
5993
" assert.equal @$().text().trim(), ''";
6094
}
6195

6296
locals.testImports = testImports;
6397
locals.testOptions = testOptions;
6498
locals.testContent = testContent;
6599
return locals;
66-
}
100+
},
67101
};

0 commit comments

Comments
 (0)