Skip to content

Commit

Permalink
Upgrade To Ember-3.3 (#12)
Browse files Browse the repository at this point in the history
* Just get this old girl working

* v2.10.0...v2.11.1

# Conflicts:
#	.travis.yml
#	bower.json
#	config/ember-try.js

* Fixing tests, removing bower

* v2.11.1...v2.12.3

# Conflicts:
#	.jshintrc
#	testem.js
#	tests/.jshintrc

* v2.11.1...v2.12.3

# Conflicts:
#	.jshintrc
#	testem.js
#	tests/.jshintrc

* Node8?

* v2.12.3...v2.13.3

# Conflicts:
#	bower.json

* v2.13.3...v2.14.2

# Conflicts:
#	.gitignore
#	ember-cli-build.js
#	testem.js
#	tests/dummy/config/environment.js

* v2.14.2...v2.15.1

# Conflicts:
#	testem.js
#	tests/dummy/app/index.html

* v2.15.1...v2.16.2

# Conflicts:
#	tests/dummy/app/router.js

* v2.16.2...v2.17.2

* ember module code-mod

* v2.17.2...v2.18.2

# Conflicts:
#	.eslintrc.js

* Some cleanup before 3.0

* v2.18.2...v3.0.4

# Conflicts:
#	README.md
#	tests/helpers/module-for-acceptance.js
#	tests/helpers/start-app.js

* qunit codemod

* ember test helpers codemod

* Adding dependabot & github workflows

* v3.0.4...v3.1.4

# Conflicts:
#	.eslintignore
#	README.md

* Updating docs and `on` usage

* v3.1.4...v3.2.0

# Conflicts:
#	testem.js

* Code mod for qunit-dom

* Upgrade to ember-cli@3.3

* Upgrading ember-cli-sass

* ✅ Upgrading Demo
  • Loading branch information
nadnoslen committed Mar 29, 2022
1 parent 1eb6eef commit c374552
Show file tree
Hide file tree
Showing 53 changed files with 7,899 additions and 1,002 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

22 changes: 22 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# see https://dependabot.com/docs/config-file/
version: 1
update_configs:
- package_manager: "javascript"
directory: "/"
update_schedule: "live"
default_reviewers:
- "nadnoslen"
allowed_updates:
- match:
update_type: all
dependency_type: direct
- match:
update_type: security
dependency_type: indirect
# automerged_updates: []
# default_assignees: []
default_labels:
- dependencies
# ignored_updates: []
target_branch: master
version_requirement_updates: auto
17 changes: 16 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
**/*{.,-}min.js
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
213 changes: 0 additions & 213 deletions .eslintrc

This file was deleted.

49 changes: 49 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'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
})
}
]
};
Loading

0 comments on commit c374552

Please sign in to comment.