Skip to content

Commit

Permalink
Upgraded to Ember 3.8, got rid of jQuery, moved to kaliber5/ember-dra…
Browse files Browse the repository at this point in the history
…g-sort
  • Loading branch information
lolmaus committed Apr 3, 2019
1 parent ae755bf commit 67c51fd
Show file tree
Hide file tree
Showing 42 changed files with 7,448 additions and 3,643 deletions.
20 changes: 20 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
116 changes: 82 additions & 34 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,88 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
root : true,
parserOptions : {
ecmaVersion : 2017,
sourceType : 'module',
},
env: {
browser: true
},
extends: [
"eslint:recommended",
"standard"
plugins : [
'ember',
'varspacing',
],
extends : [
'eslint:recommended',
'plugin:ember/recommended',
'standard',
'plugin:varspacing/recommended',
],
"rules": {
"arrow-parens": "off",
"camelcase": "off",
"comma-dangle": "off",
"func-call-spacing": "off",
"generator-star-spacing": "off",
"key-spacing": ["error", { beforeColon: true, afterColon: true, align: "colon" }],
"new-cap": "off",
"no-console": "off",
"no-mixed-operators": "off",
"no-multi-spaces": "off",
"no-multiple-empty-lines": "off",
"no-return-assign": "off",
"no-sequences": "off",
"no-template-curly-in-string": "off",
"no-whitespace-before-property": "off",
"operator-linebreak": "off",
"padded-blocks": "off",
"quotes": "off",
"spaced-comment": "off",
"standard/object-curly-even-spacing": "off",
env : {
browser : true,
},

"globals": {
// "showdown": false,
rules : {
'arrow-parens' : 'off',
'camelcase' : 'off',
'comma-dangle' : ['error', 'always-multiline'],
'func-call-spacing' : 'off',
'generator-star-spacing' : 'off',
'key-spacing' : ['error', { beforeColon : true, afterColon : true, align : 'colon' }],
'new-cap' : 'off',
'no-console' : 'off',
'no-mixed-operators' : 'off',
'no-multi-spaces' : 'off',
'no-multiple-empty-lines' : 'off',
'no-return-assign' : 'off',
'no-sequences' : 'off',
'no-template-curly-in-string' : 'off',
'no-whitespace-before-property' : 'off',
'object-curly-spacing' : 'off',
'operator-linebreak' : 'off',
'padded-blocks' : 'off',
'quote-props' : ['error', 'consistent-as-needed'],
'quotes' : ['error', 'single'],
'spaced-comment' : 'off',
'standard/object-curly-even-spacing' : 'off',
},
overrides : [
// node files
{
files : [
'.eslintrc.js',
'.template-lintrc.js',
'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/**',
'tests/pages/**',
],
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
}),
},

// tests
{
files : [
'tests/**/*.js',
],
rules : {
'no-unused-expressions' : 'off',
},
},
],
}
16 changes: 12 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,23 @@
/tmp/

# dependencies
/node_modules/
/bower_components/
/node_modules/

# misc
/.sass-cache/
/*.log
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
/*.ember-try
/*.log*

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

# IDE
/.idea/
/*.iml
/jsconfig.json
45 changes: 30 additions & 15 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
9 changes: 9 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict'

module.exports = {
extends : 'recommended',

rules : {
quotes : false,
},
}
71 changes: 43 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,63 @@ node_js:
# so that your addon works for all apps
- "6"

dist: trusty
sudo: false
dist: trusty

addons:
chrome: stable

cache:
yarn: true

cache:
directories:
- $HOME/.npm
- $HOME/.yarn-cache

env:
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
global:
# See https://git.io/vdao3 for details.
- JOBS=1

branches:
only:
- master
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
install:
- yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- yarn test

- name: "Floating Dependencies"
script:
- yarn test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery

before_install:
- |
sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update -qq
sudo apt-get install -y -qq yarn
yarn --version
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --no-lockfile
- yarn add bower
- yarn install --no-lockfile --non-interactive

script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.0.0-alpha.0] - 2019-04-03

No user-facing changes.

### Internal changes
- Upgraded to Ember CLI 3.8, got rid of jQuery dependency. :warning: Nested lists don't work in Ember without jQuery, see https://github.com/emberjs/ember.js/issues/17840
- Moved to kaliber5/ember-drag-sort
- Adjusted code style/linting

## [1.1.1] - 2017-11-15
### Fixed
* Fixed placeholder jumping around in nested lists, by [@lolmaus](https://github.com/lolmaus/)
Expand Down
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# How To Contribute

## Installation

* `git clone <repository-url>`
* `cd ember-drag-sort`
* `yarn install`

## Linting

* `yarn lint:hbs`
* `yarn lint:js`
* `yarn lint:js --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://ember-cli.com/](https://ember-cli.com/).
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) 2017
Copyright (c) 2019

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
Loading

0 comments on commit 67c51fd

Please sign in to comment.