Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Update to ember 3.16 #56

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
end_of_line = lf
charset = utf-8
Expand Down
15 changes: 11 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'
'ember',
'bbva'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'eslint-config-bbva'
],
env: {
browser: true
},
rules: {
'ember/no-jquery': 'error'
},
overrides: [{
files: [
'.huskyrc.js',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
Expand Down
32 changes: 32 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.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: 3 additions & 6 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"prepare": [
"@semantic-release/changelog",
"@semantic-release/npm",
"@semantic-release/git"
],
"verifyConditions": [
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
"@semantic-release/npm",
"@semantic-release/git",
Expand Down
6 changes: 2 additions & 4 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict';

module.exports = {
extends: 'recommended',
extends: 'octane',
rules: {
'no-bare-strings': false,
'no-bare-strings': true,
'block-indentation': 'tab',
'no-html-comments': true,
'no-nested-interactive': true,
Expand Down
150 changes: 73 additions & 77 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,79 +1,75 @@
---
language: node_js
os: linux
node_js: lts/erbium
dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm

env:
global:
- JOBS=1

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

include:
- stage: "Tests"
before_install:
- npm config set spin false
- npm install -g npm@6
- npm install -g codecov
- npm install -g greenkeeper-lockfile@1
- npm install -g @commitlint/travis-cli
- npm --version
install:
- if [[ $TRAVIS_BRANCH =~ greenkeeper || $TRAVIS_PULL_REQUEST_BRANCH =~ greenkeeper ]]; then npm install; else npm ci; fi
- bower install
before_script:
- greenkeeper-lockfile-update
script:
- commitlint-travis
- npm run lint:js
- npm run lint:hbs
- npm test
after_script:
- greenkeeper-lockfile-upload
after_success:
- codecov --file=coverage/node/lcov.info
- codecov --file=coverage/ember/lcov.info

- stage: "Regression Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.8
- 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

- stage: "Release"
script: skip
deploy:
provider: script
cleanup: true
language: node_js
os: linux
node_js: stable
dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm

env:
global:
- JOBS=1

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

include:
- stage: "Tests"
before_install:
- npm config set spin false
- npm install -g npm@6
- npm install -g bower
- npm install -g codecov
- npm install -g greenkeeper-lockfile@1
- npm install -g @commitlint/travis-cli
- npm --version
install:
- if [[ $TRAVIS_BRANCH =~ greenkeeper || $TRAVIS_PULL_REQUEST_BRANCH =~ greenkeeper ]]; then npm install; else npm ci; fi
before_script:
- greenkeeper-lockfile-update
script:
- npx -p @semantic-release/changelog -p @semantic-release/git -p semantic-release semantic-release

before_install:
- npm config set spin false
- npm install -g npm@6
- npm --version

install:
- npm ci
- bower install

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup --- mocha --recursive node-tests

stages:
- "Tests"
- "Regression Tests"
- name: "Release"
if: branch = master

- commitlint-travis
- npm run lint:js
- npm run lint:hbs
- npm test
after_script:
- greenkeeper-lockfile-upload
after_success:
- codecov --file=coverage/lcov.info

- stage: "Regression Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.12
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
- 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

- stage: "Release"
script: skip
deploy:
provider: script
skip_cleanup: true
script: npx semantic-release

before_install:
- npm config set spin false
- npm install -g npm@6
- npm --version

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip_cleanup

stages:
- "Tests"
- "Regression Tests"
- name: "Release"
if: branch = master
- name: "Deploy"
if: branch = master
43 changes: 31 additions & 12 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,46 @@

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

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => ({
module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.8',
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
'ember-source': '~3.12.0'
}
}
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
'ember-source': await getChannelURL('release')
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
'ember-source': await getChannelURL('beta')
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
'ember-source': await getChannelURL('canary')
}
}
},
Expand All @@ -63,7 +67,22 @@ module.exports = function() {
'@ember/jquery': '^0.5.1'
}
}
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false
})
},
npm: {
ember: {
edition: 'classic'
}
}
}
]
}));
};
};
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-unsanitized/method */
'use strict';

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