Skip to content

Commit

Permalink
run npx ember-cli-update --to=4.4.0 to align with the latest blueprint
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeAstapov committed May 28, 2022
1 parent 0174322 commit 2a640ca
Show file tree
Hide file tree
Showing 27 changed files with 1,920 additions and 2,731 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ module.exports = {
},
requireConfigFile: false,
babelOptions: {
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
plugins: [
['@babel/plugin-proposal-decorators', { legacy: true }],
'@babel/plugin-proposal-class-properties',
],
},
},
plugins: ['ember'],
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: yarn lint

- name: Run Tests
run: yarn test
run: yarn test:ember

floating:
name: "Floating Dependencies"
Expand All @@ -48,7 +48,7 @@ jobs:
run: yarn install --no-lockfile

- name: Run Tests
run: yarn test
run: yarn test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -61,14 +61,17 @@ jobs:
try-scenario:
- ember-lts-3.4
- ember-lts-3.8
# - ember-lts-3.24
# - ember-lts-3.28
# - ember-release
# - ember-beta
# - ember-canary
# - ember-classic
# - embroider-safe
# - embroider-optimized
- ember-lts-3.12
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-release
- ember-beta
- ember-canary
- ember-classic
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v3
Expand Down
32 changes: 20 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.eslintcache
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/.travis.yml
/.watchmanconfig
/bower.json
/bin/
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
Expand Down
25 changes: 25 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# How To Contribute

## Installation

* `git clone https://github.com/ember-engines/ember-asset-loader.git`
* `cd ember-asset-loader`
* `yarn install`

## Linting

* `yarn lint`
* `yarn lint:fix`

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ Provides experimental support for the [Asset Manifest RFC](https://github.com/em
* Ember CLI v3.24 or above
* Node.js v14 or above


## Installation

```
ember install ember-asset-loader
```


## Usage

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

## Installation

* `git clone https://github.com/ember-engines/ember-asset-loader`
* `cd ember-asset-loader`
* `npm install`
* `bower install`

## Running

* `ember serve`
* Visit the tests at [http://localhost:4200/tests](http://localhost:4200/tests).

## Running Tests

One of three options:
## Contributing

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

## Building

* `ember build`
## License

For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
This project is licensed under the [MIT License](LICENSE.md).
Empty file removed addon/.gitkeep
Empty file.
64 changes: 51 additions & 13 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

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

module.exports = async function () {
return {
Expand All @@ -22,6 +23,46 @@ module.exports = async function () {
},
},
},
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0',
},
},
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0',
},
},
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.20.0',
},
},
},
{
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.24.3',
},
},
},
{
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
},
},
{
name: 'ember-release',
npm: {
Expand All @@ -46,29 +87,26 @@ module.exports = async function () {
},
},
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {},
},
},
{
name: 'ember-default-with-jquery',
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};
15 changes: 9 additions & 6 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
/* eslint-env node */
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
'ember-cli-babel': {
// Needed because ember-maybe-import-regenerator uses Promise
includePolyfill: EmberAddon.env() === 'test',
},
// Add options here
});

/*
Expand All @@ -18,5 +14,12 @@ module.exports = function (defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app, {
skipBabel: [
{
package: 'qunit',
},
],
});
};
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* eslint-env node */
'use strict';

const funnel = require('broccoli-funnel');
const findHost = require('./lib/utils/find-host');

module.exports = {
name: 'ember-asset-loader',
name: require('./package').name,

/**
* If the app has specified `noManifest` to be generated, then we don't
Expand Down
Loading

0 comments on commit 2a640ca

Please sign in to comment.