Skip to content

Commit

Permalink
reset using ember-cli-update --to 2.18 --reset
Browse files Browse the repository at this point in the history
  • Loading branch information
mansona committed Sep 10, 2021
1 parent d53367b commit 8726389
Show file tree
Hide file tree
Showing 31 changed files with 10,339 additions and 7,106 deletions.
48 changes: 46 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,54 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
overrides: [
// node files
{
files: [
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
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
}
}
]
};
20 changes: 13 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- run: yarn
- run: yarn lint:js
- run: npm i -g npm@6
- run: npm ci
- run: npm run lint:js

test:
name: Tests
Expand All @@ -34,8 +35,9 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- run: yarn --ignore-engines
- run: yarn test:ember
- run: npm i -g npm@6
- run: npm ci
- run: npm run test:ember

floating-dependencies:
name: Floating Dependencies
Expand All @@ -46,8 +48,9 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- run: yarn --no-lockfile --ignore-engines
- run: yarn test:ember
- run: npm i -g npm@6
- run: npm install --no-package-lock
- run: npm run test:ember

try-scenarios:
name: "ember-try: ${{ matrix.ember-try-scenario }}"
Expand All @@ -61,6 +64,8 @@ jobs:
ember-try-scenario:
- ember-lts-2.4
- ember-lts-2.8
- ember-lts-2.12
- ember-lts-2.16
- ember-release
- ember-canary

Expand All @@ -69,6 +74,7 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- run: yarn --ignore-engines
- run: npm i -g npm@6
- run: npm ci
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,10 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
7 changes: 6 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015
Copyright (c) 2021

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Ember CLI Showdown
# ember-cli-showdown

[![Build Status](https://travis-ci.org/gcollazo/ember-cli-showdown.svg?branch=master)](https://travis-ci.org/gcollazo/ember-cli-showdown)
[![Ember Observer Score](http://emberobserver.com/badges/ember-cli-showdown.svg)](http://emberobserver.com/addons/ember-cli-showdown)

This addon provides a component that transforms [Markdown](http://en.wikipedia.org/wiki/Markdown) into valid HTML.
Expand Down Expand Up @@ -120,21 +119,23 @@ export default {

## Development

* `git clone https://github.com/gcollazo/ember-cli-showdown.git`
* `git clone git@github.com:ember-cli/ember-addon-output.git` this repository
* `cd ember-cli-showdown`
* `npm install`
* `bower install`

## Previewing
## Running

* `ember server`
* Visit your app at http://localhost:4200.
* `ember serve`
* Visit your app at [http://localhost:4200](http://localhost:4200).

## Running Tests

* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
* `ember test`
* `ember test --server`

## Building

* `ember build`

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
Empty file added addon/.gitkeep
Empty file.
Empty file added app/.gitkeep
Empty file.
23 changes: 16 additions & 7 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
module.exports = {
scenarios: [
{
Expand Down Expand Up @@ -33,6 +32,22 @@ module.exports = {
}
}
},
{
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: {
Expand Down Expand Up @@ -80,12 +95,6 @@ module.exports = {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
};
1 change: 0 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
5 changes: 3 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-env node */
'use strict';

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

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
let app = new EmberAddon(defaults, {
// Add options here
});

Expand Down
1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

const path = require('path');
Expand Down
Loading

0 comments on commit 8726389

Please sign in to comment.