Skip to content

Commit 3e84c6d

Browse files
committed
run npx ember-cli-update --to=4.4.0 to align with the latest blueprint
1 parent 0174322 commit 3e84c6d

28 files changed

+1927
-2740
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
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

.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
}

.eslintrc.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ module.exports = {
1111
},
1212
requireConfigFile: false,
1313
babelOptions: {
14-
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
14+
plugins: [
15+
['@babel/plugin-proposal-decorators', { legacy: true }],
16+
'@babel/plugin-proposal-class-properties',
17+
],
1518
},
1619
},
1720
plugins: ['ember'],

.github/workflows/ci.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: yarn lint
3232

3333
- name: Run Tests
34-
run: yarn test
34+
run: yarn test:ember
3535

3636
floating:
3737
name: "Floating Dependencies"
@@ -48,7 +48,7 @@ jobs:
4848
run: yarn install --no-lockfile
4949

5050
- name: Run Tests
51-
run: yarn test
51+
run: yarn test:ember
5252

5353
try-scenarios:
5454
name: ${{ matrix.try-scenario }}
@@ -61,14 +61,17 @@ jobs:
6161
try-scenario:
6262
- ember-lts-3.4
6363
- ember-lts-3.8
64-
# - ember-lts-3.24
65-
# - ember-lts-3.28
66-
# - ember-release
67-
# - ember-beta
68-
# - ember-canary
69-
# - ember-classic
70-
# - embroider-safe
71-
# - embroider-optimized
64+
- ember-lts-3.12
65+
- ember-lts-3.16
66+
- ember-lts-3.20
67+
- ember-lts-3.24
68+
- ember-lts-3.28
69+
- ember-release
70+
- ember-beta
71+
- ember-canary
72+
- ember-classic
73+
- embroider-safe
74+
- embroider-optimized
7275

7376
steps:
7477
- uses: actions/checkout@v3

.gitignore

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
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-
/.eslintcache
12+
/.env*
13+
/.pnp*
1314
/.sass-cache
15+
/.eslintcache
1416
/connect.lock
15-
/coverage/*
17+
/coverage/
1618
/libpeerconnection.log
17-
npm-debug.log*
18-
yarn-error.log
19-
testem.log
19+
/npm-debug.log*
20+
/testem.log
21+
/yarn-error.log
2022

2123
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
27+
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/.travis.yml
2323
/.watchmanconfig
2424
/bower.json
25+
/bin/
2526
/config/ember-try.js
2627
/CONTRIBUTING.md
2728
/ember-cli-build.js

CONTRIBUTING.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone https://github.com/ember-engines/ember-asset-loader.git`
6+
* `cd ember-asset-loader`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint`
12+
* `yarn lint:fix`
13+
14+
## Running tests
15+
16+
* `ember test` – Runs the test suite on the current Ember version
17+
* `ember test --server` – Runs the test suite in "watch mode"
18+
* `ember try:each` – Runs the test suite against multiple Ember versions
19+
20+
## Running the dummy application
21+
22+
* `ember serve`
23+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
24+
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ Provides experimental support for the [Asset Manifest RFC](https://github.com/em
1212
* Ember CLI v3.24 or above
1313
* Node.js v14 or above
1414

15+
16+
## Installation
17+
18+
```
19+
ember install ember-asset-loader
20+
```
21+
22+
1523
## Usage
1624

1725
Ember Asset Loader does three primary things:
@@ -171,28 +179,12 @@ already in the browser.
171179
_Note: If you use QUnit, it may be worthwhile to turn on the [`noglobals` config option](https://api.qunitjs.com/QUnit.config/),
172180
to help catch mutated global state._
173181

174-
## Installation
175-
176-
* `git clone https://github.com/ember-engines/ember-asset-loader`
177-
* `cd ember-asset-loader`
178-
* `npm install`
179-
* `bower install`
180-
181-
## Running
182-
183-
* `ember serve`
184-
* Visit the tests at [http://localhost:4200/tests](http://localhost:4200/tests).
185-
186-
## Running Tests
187182

188-
One of three options:
183+
## Contributing
189184

190-
* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
191-
* `ember test`
192-
* `ember test --server`
185+
See the [Contributing](CONTRIBUTING.md) guide for details.
193186

194-
## Building
195187

196-
* `ember build`
188+
## License
197189

198-
For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
190+
This project is licensed under the [MIT License](LICENSE.md).

addon/.gitkeep

Whitespace-only changes.

config/ember-try.js

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

56
module.exports = async function () {
67
return {
@@ -22,6 +23,46 @@ module.exports = async function () {
2223
},
2324
},
2425
},
26+
{
27+
name: 'ember-lts-3.12',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~3.12.0',
31+
},
32+
},
33+
},
34+
{
35+
name: 'ember-lts-3.16',
36+
npm: {
37+
devDependencies: {
38+
'ember-source': '~3.16.0',
39+
},
40+
},
41+
},
42+
{
43+
name: 'ember-lts-3.20',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': '~3.20.0',
47+
},
48+
},
49+
},
50+
{
51+
name: 'ember-lts-3.24',
52+
npm: {
53+
devDependencies: {
54+
'ember-source': '~3.24.3',
55+
},
56+
},
57+
},
58+
{
59+
name: 'ember-lts-3.28',
60+
npm: {
61+
devDependencies: {
62+
'ember-source': '~3.28.0',
63+
},
64+
},
65+
},
2566
{
2667
name: 'ember-release',
2768
npm: {
@@ -46,29 +87,26 @@ module.exports = async function () {
4687
},
4788
},
4889
},
49-
// The default `.travis.yml` runs this scenario via `yarn test`,
50-
// not via `ember try`. It's still included here so that running
51-
// `ember try:each` manually or from a customized CI config will run it
52-
// along with all the other scenarios.
53-
{
54-
name: 'ember-default',
55-
npm: {
56-
devDependencies: {},
57-
},
58-
},
5990
{
60-
name: 'ember-default-with-jquery',
91+
name: 'ember-classic',
6192
env: {
6293
EMBER_OPTIONAL_FEATURES: JSON.stringify({
63-
'jquery-integration': true,
94+
'application-template-wrapper': true,
95+
'default-async-observers': false,
96+
'template-only-glimmer-components': false,
6497
}),
6598
},
6699
npm: {
67100
devDependencies: {
68-
'@ember/jquery': '^0.5.1',
101+
'ember-source': '~3.28.0',
102+
},
103+
ember: {
104+
edition: 'classic',
69105
},
70106
},
71107
},
108+
embroiderSafe(),
109+
embroiderOptimized(),
72110
],
73111
};
74112
};

0 commit comments

Comments
 (0)