Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emberjs/ember.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 258f670145676edde8fb157538efa8b626a868cf
Choose a base ref
..
head repository: emberjs/ember.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7aa1d4c99173514057b25f2f13e0d5713a2c37bb
Choose a head ref
Showing 967 changed files with 55,378 additions and 30,981 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blueprints/*/*files/**/*.js
node-tests/fixtures/**/*.js
docs/
/docs/
dist/
tmp/
52 changes: 42 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -2,21 +2,31 @@ const path = require('path');

module.exports = {
root: true,
parser: 'babel-eslint',
extends: [
'eslint:recommended',
'prettier',
'plugin:import/errors',
'plugin:qunit/recommended',
],
plugins: [
'ember-internal',
'prettier',
'import',
'qunit',
'disable-features',
],
rules: {
'semi': 'error',
'no-implicit-coercion': 'error',
'no-new-wrappers': 'error',
'no-unused-vars': 'error',
'no-throw-literal': 'error',
'no-useless-escape': 'off', // TODO: bring this back
'prettier/prettier': 'error',
'qunit/no-commented-tests': 'off',
'qunit/require-expect': 'off',
'disable-features/disable-async-await': 'error',
'disable-features/disable-generator-functions': 'error',
},

settings: {
@@ -48,6 +58,17 @@ module.exports = {

parserOptions: {
sourceType: 'module',
},

rules: {
// the TypeScript compiler already takes care of this and
// leaving it enabled results in false positives for interface imports
'no-unused-vars': 'off',
'no-undef': 'off',

'import/export': 'off',
'import/named': 'off',
'import/no-unresolved': 'off',
}
},
{
@@ -76,30 +97,32 @@ module.exports = {
rules: {
'ember-internal/require-yuidoc-access': 'error',
'ember-internal/no-const-outside-module-scope': 'error',

'semi': 'error',
'no-unused-vars': 'error',
'comma-dangle': 'off',
},
},
{
files: [
'packages/*/tests/**/*.js',
'packages/@ember/*/tests/**/*.js',
'packages/internal-test-helpers/**/*.js',
'packages/*/tests/**/*.[jt]s',
'packages/@ember/*/tests/**/*.[jt]s',
'packages/@ember/-internals/*/tests/**/*.[jt]s',
'packages/internal-test-helpers/**/*.[jt]s',
],
env: {
qunit: true,
},
globals: {
'expectAssertion': true,
'expectDeprecation': true,
'expectDeprecationAsync': true,
'expectNoDeprecation': true,
'expectWarning': true,
'expectNoWarning': true,
'ignoreAssertion': true,
'ignoreDeprecation': true,
},
rules: {
'disable-features/disable-async-await': 'off',
'disable-features/disable-generator-functions': 'off',
}
},
{
// matches all node-land files
@@ -108,11 +131,13 @@ module.exports = {
'tests/node/**/*.js',
'blueprints/**/*.js',
'bin/**/*.js',
'tests/docs/*.js',
'config/**/*.js',
'lib/**/*.js',
'server/**/*.js',
'testem.js',
'testem.travis-browsers.js',
'testem.dist.js',
'testem.browserstack.js',
'd8-runner.js',
'broccoli/**/*.js',
'ember-cli-build.js',
@@ -133,12 +158,16 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
'no-process-exit': 'off',
'no-throw-literal': 'error',
'disable-features/disable-async-await': 'off',
'disable-features/disable-generator-functions': 'off',
}),
},
{
// matches node-land files that aren't shipped to consumers (allows using Node 6+ features)
files: [
'broccoli/**/*.js',
'tests/node/**/*.js',
'ember-cli-build.js',
'rollup.config.js',
'd8-runner.js',
@@ -156,7 +185,10 @@ module.exports = {
},
},
{
files: [ 'tests/node/**/*.js' ],
files: [
'tests/docs/**/*.js',
'tests/node/**/*.js',
],

env: {
qunit: true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
.bpm
.bundle
.config
.eslintcache
.github-upload-token
.yardoc
InstalledFiles
@@ -15,7 +16,7 @@ assets/bpm_libs.js
assets/bpm_styles.css
coverage
dist
docs
/docs
lib/*/tests/all.js
lib/*/tests/qunit*
lib/bundler/man
113 changes: 58 additions & 55 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,20 @@
branches:
only:
- master
- beta
- release
# release branches
- /^(?:release|lts)-\d+-\d+$/
# npm version tags
- /^v\d+\.\d+\.\d+/

language: node_js
dist: trusty
node_js:
- "10"

addons:
firefox: "latest"

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

before_install:
- |
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
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
# install the most recent `npm version`
# used when publishing to build a properly packed tarball
npm i -g npm
install:
- |
yarn install
branches:
only:
- master
- beta
- release
# npm version tags
- /^v\d+\.\d+\.\d+/

stages:
- basic test
- additional tests
- name: deploy
if: type IN (push)

env:
global:
- BROWSERSTACK_USERNAME=emberjscoreteam1
@@ -62,44 +34,75 @@ env:
I/BFT0MbnR6JVCZiPV7TCWPgY1gvgZ6TEEIKGqauDMUBdL8ZK6I='
- secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E=

jobs:
fail_fast: true
matrix:
fast_finish: true

include:
cache:
yarn: true

stages:
- basic test
- additional tests
- name: deploy
if: type IN (push)

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

# install the most recent `npm version`
# used when publishing to build a properly packed tarball
- npm i -g npm

install:
- yarn install --frozen-lockfile --non-interactive

jobs:
include:
- stage: basic test
env: TEST_SUITE=each-package-tests

- env: TEST_SUITE=code-quality
- name: Linting
script:
# avoiding `yarn test` here because pretest does a build, which isn't needed
- node bin/run-tests.js
- yarn lint

- stage: additional tests
name: Browserstack Tests (Safari, Edge, IE11)
script:
- yarn ember build -prod
- yarn test:browserstack

env: TEST_SUITE=browserstack
- env:
- TEST_SUITE=built-tests
- EMBER_ENV=production

- env: TEST_SUITE=old-jquery-and-extend-prototypes
- env: TEST_SUITE=node
node_js: "6"
- env: TEST_SUITE=blueprints
node_js: "6"
- env: TEST_SUITE=travis-browsers
- env:
- TEST_SUITE=each-package-tests
- BUILD_TYPE=alpha

- name: Node.js Tests
node_js: "8"
script:
- yarn ember build -prod
- yarn test:node

- name: Blueprint Tests
node_js: "8"
script:
- yarn test:blueprints

- name: Browser Tests (Firefox)
script:
- yarn ember test -c testem.travis-browsers.js

- stage: deploy
env:
- BUILD_TYPE=canary
- PUBLISH=true
script:
- "./bin/publish_builds"

- env:
- if: branch = master
env:
- BUILD_TYPE=alpha
- OVERRIDE_FEATURES=EMBER_METAL_TRACKED_PROPERTIES,EMBER_GLIMMER_ANGLE_BRACKET_BUILT_INS,EMBER_GLIMMER_ANGLE_BRACKET_NESTED_LOOKUP,EMBER_NATIVE_DECORATOR_SUPPORT,EMBER_GLIMMER_FORWARD_MODIFIERS_WITH_SPLATTRIBUTES
- PUBLISH=true
script:
- "./bin/publish_builds"
Loading