Skip to content

Commit 5e6f85b

Browse files
committed
ecu to 4.12
1 parent 23dbd2b commit 5e6f85b

26 files changed

+245
-202
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

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

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./index.js',
@@ -41,11 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
48-
// Test files:
51+
// test files
4952
files: ['tests/**/*-test.{js,ts}'],
5053
extends: ['plugin:qunit/recommended'],
5154
},

.github/workflows/ci.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
name: "Tests"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: yarn
27+
- name: Install Dependencies
28+
run: yarn install --frozen-lockfile
29+
- name: Lint
30+
run: yarn lint
31+
- name: Run Tests
32+
run: yarn test:ember
33+
34+
floating:
35+
name: "Floating Dependencies"
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 10
38+
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
42+
with:
43+
node-version: 14.x
44+
cache: yarn
45+
- name: Install Dependencies
46+
run: yarn install --no-lockfile
47+
- name: Run Tests
48+
run: yarn test:ember
49+
50+
try-scenarios:
51+
name: ${{ matrix.try-scenario }}
52+
runs-on: ubuntu-latest
53+
needs: "test"
54+
timeout-minutes: 10
55+
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
try-scenario:
60+
- ember-lts-4.4
61+
- ember-lts-4.8
62+
- ember-release
63+
- ember-beta
64+
- ember-canary
65+
- embroider-safe
66+
- embroider-optimized
67+
68+
steps:
69+
- uses: actions/checkout@v3
70+
- name: Install Node
71+
uses: actions/setup-node@v3
72+
with:
73+
node-version: 14.x
74+
cache: yarn
75+
- name: Install Dependencies
76+
run: yarn install --frozen-lockfile
77+
- name: Run Tests
78+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2023
/.template-lintrc.js
2124
/.travis.yml
2225
/.watchmanconfig
2326
/bower.json
24-
/config/ember-try.js
2527
/CONTRIBUTING.md
2628
/ember-cli-build.js
2729
/testem.js
@@ -33,4 +35,7 @@
3335
# ember-try
3436
/.node_modules.ember-try/
3537
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3639
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

.stylelintrc.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: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

.travis.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember serve`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ember-cli-deploy-s3-pack
1+
# ember-cli-deploy-s3-pack
22

33
> An ember-cli-deploy plugin pack to implement a simple S3 deployment pattern
44
@@ -9,6 +9,13 @@ This package bundles the plugins you need to have a deployment pipeline for your
99

1010
It also has a blueprint for your `config/deploy.js` file to get you started.
1111

12+
## Compatibility
13+
14+
* Ember.js v4.4 or above
15+
* Ember CLI v4.4 or above
16+
* Node.js v14 or above
17+
18+
1219
## Installation
1320

1421
```
@@ -30,9 +37,12 @@ A "plugin pack" is a concept supported by ember-cli-deploy that allows a single
3037
* [ember-cli-deploy-revision-data](https://github.com/ember-cli-deploy/ember-cli-deploy-revision-data)
3138
* [ember-cli-deploy-display-revisions](https://github.com/ember-cli-deploy/ember-cli-deploy-display-revisions)
3239
* [ember-cli-deploy-manifest](https://github.com/ember-cli-deploy/ember-cli-deploy-manifest)
33-
* [ember-cli-deploy-gzip](https://github.com/ember-cli-deploy/ember-cli-deploy-gzip)
40+
* [ember-cli-deploy-smart-compress](https://github.com/ember-cli-deploy/ember-cli-deploy-smart-compress)
41+
## Contributing
42+
43+
See the [Contributing](CONTRIBUTING.md) guide for details.
44+
3445

35-
License
36-
------------------------------------------------------------------------------
46+
## License
3747

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

config/environment.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

config/release.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

0 commit comments

Comments
 (0)