Skip to content
This repository has been archived by the owner on Sep 8, 2021. It is now read-only.

Commit

Permalink
upgrade to 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentcapicotto authored and romaingweb committed Aug 11, 2021
1 parent e2b9cb5 commit 6f19ada
Show file tree
Hide file tree
Showing 9 changed files with 127 additions and 143 deletions.
9 changes: 0 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
}
}
]
};
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -16,12 +16,8 @@
npm-debug.log*
yarn-error.log
testem.log
jsconfig.json

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

# editor configs
.vscode/
57 changes: 36 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,50 @@
# Ember-easy-datatable
[![Build Status](https://travis-ci.org/hiptest/ember-easy-datatable.svg?branch=master)](https://travis-ci.org/hiptest/ember-easy-datatable)
my-addon
==============================================================================

This README outlines the details of collaborating on this Ember addon.
[Short description of the addon.]

## Installation
Installation
------------------------------------------------------------------------------

* `git clone` this repository
* `npm install`
```
ember install my-addon
```


Usage
------------------------------------------------------------------------------

[Longer description of how to use the addon in apps.]

## Running

* `ember server`
* Visit your app at http://localhost:4200.
Contributing
------------------------------------------------------------------------------

### Installation

* `git clone <repository-url>`
* `cd my-addon`
* `npm install`

## Running Tests
### Linting

In the browser: http://localhost:4200/tests
* `npm run lint:js`
* `npm run lint:js -- --fix`

* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
* `ember test`
* `ember test --server`
### Running tests

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

* `ember build`
### Running the dummy application

For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

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

Because in addon prototype extensions are turned off:
* https://guides.emberjs.com/v1.11.0/configuring-ember/disabling-prototype-extensions/
* https://dockyard.com/blog/2015/03/22/tips-for-writing-ember-addons
License
------------------------------------------------------------------------------

This project is licensed under the [MIT License](LICENSE.md).
134 changes: 65 additions & 69 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,74 +1,70 @@
module.exports = {
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
'use strict';

const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary'),
]).then((urls) => {
return {
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
]
};
});
};
34 changes: 7 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.2",
"ember-source": "~2.18.0",
"ember-source": "~3.0.0",
"ember-truth-helpers": "3.0.0",
"eslint": "^7.32.0",
"eslint-plugin-ember": "^10.5.1",
Expand Down
3 changes: 0 additions & 3 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ const Router = EmberRouter.extend({
});

Router.map(function() {
this.route('datatable', {
path: '/'
});
});

export default Router;
5 changes: 3 additions & 2 deletions tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<h2 id="title">Sample datatable</h2>
{{outlet}}
<h2 id="title">Welcome to Ember</h2>

{{outlet}}
20 changes: 14 additions & 6 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
const browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
];

const isCI = !!process.env.CI;
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
browsers.push('ie 11');
}

module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
browsers
};

0 comments on commit 6f19ada

Please sign in to comment.