Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ember 3.0, dep updates, testing updates, and codemods #762

Merged
merged 59 commits into from
Mar 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
02f5c6a
Bump some deps
RobbieTheWagner Feb 24, 2018
6ef16d6
Remove manual sass and lint
RobbieTheWagner Feb 24, 2018
70cddb7
First pass at ember 3
RobbieTheWagner Feb 24, 2018
3feaeb8
Fix the first container test
teddyzeenny Feb 25, 2018
781c679
Convert to ember-test-helpers
RobbieTheWagner Feb 25, 2018
59f9121
Use vertical-collection
RobbieTheWagner Feb 25, 2018
5067ac2
Use positional param for VC
RobbieTheWagner Feb 25, 2018
d8de046
Fix some lint issues
RobbieTheWagner Feb 25, 2018
4c62875
Fix the view tree
teddyzeenny Feb 25, 2018
bf6249b
Add trs with classes
RobbieTheWagner Feb 25, 2018
fd8af7e
Add imports for wait helper
RobbieTheWagner Feb 25, 2018
f8f00e2
Fix class
RobbieTheWagner Feb 25, 2018
a2af5ba
WIP
rwjblue Feb 26, 2018
521f255
Remove usage of container-instance for simple action case.
rwjblue Feb 26, 2018
c686736
Fix acceptance test to use `find` / `findAll` without "context" element.
rwjblue Feb 26, 2018
e53ee33
Tweak ember debug tests to use newer ember testing setup..
rwjblue Feb 26, 2018
26267a7
Fix a bunch of tests
RobbieTheWagner Feb 26, 2018
c625c39
Remove unused container-instance component
RobbieTheWagner Feb 26, 2018
0b74961
Fix more tests, use location: none
RobbieTheWagner Feb 26, 2018
58c9e50
Fix rootElement and binding tests
RobbieTheWagner Feb 27, 2018
366a63b
Fix some missed __container__
RobbieTheWagner Feb 27, 2018
60843f2
Lint ember_debug
RobbieTheWagner Feb 27, 2018
31d814e
Fix getClassName resolver
RobbieTheWagner Feb 27, 2018
7c351c8
Add ember-try
RobbieTheWagner Feb 27, 2018
659695f
Filter ember-try to only test ember_debug
RobbieTheWagner Feb 27, 2018
ea8ffab
Attempt to use stages
RobbieTheWagner Feb 27, 2018
d265e64
Try to fix stages
RobbieTheWagner Feb 27, 2018
1fcc5e6
Try another env
RobbieTheWagner Feb 27, 2018
d2cd7b7
Try matrix
RobbieTheWagner Feb 27, 2018
4022715
Adjust matrix more
RobbieTheWagner Feb 27, 2018
4be65b2
Add missing :
RobbieTheWagner Feb 27, 2018
97b0f1d
Fix indent lint
RobbieTheWagner Feb 27, 2018
eb26c0d
fail_fast: false so we can see all test results
RobbieTheWagner Feb 27, 2018
cac04da
Travis tweaks
RobbieTheWagner Feb 27, 2018
115f510
Move script to stage
RobbieTheWagner Feb 27, 2018
655ac24
Maybe fix stage?
RobbieTheWagner Feb 27, 2018
e38aee2
Remove stages config, set script back to global
RobbieTheWagner Feb 27, 2018
e20434c
Since stages do not proceed if the previous fails, switch them
RobbieTheWagner Feb 27, 2018
cd4a943
Bump ember-try, fix owner.factoryFor
RobbieTheWagner Feb 27, 2018
c152d2d
Restrict to master for builds
RobbieTheWagner Feb 27, 2018
7673884
Try skip cleanup
RobbieTheWagner Feb 27, 2018
121c512
Try to fix some hover issues
RobbieTheWagner Feb 28, 2018
b2adefa
Test with more ember versions
RobbieTheWagner Feb 28, 2018
27d653f
Use short name for view
RobbieTheWagner Feb 28, 2018
d454cbc
Use Ember.Component instead of Ember.View
RobbieTheWagner Feb 28, 2018
d118382
Use controller.controller
RobbieTheWagner Feb 28, 2018
5de9701
Super hacky workaround for 2.10
RobbieTheWagner Feb 28, 2018
3f09cbc
Work around computed issues in 3.1+ tests
RobbieTheWagner Mar 1, 2018
ae91d9b
Fix lint issues
RobbieTheWagner Mar 1, 2018
e752344
Fix calculating computeds, cleanup TODOs
RobbieTheWagner Mar 1, 2018
c4f4af3
Remove RowEventsMixin, move actions to trs
RobbieTheWagner Mar 1, 2018
bc8a4f6
Update yarn commands
teddyzeenny Mar 3, 2018
ee53155
Fix view preview layer test
teddyzeenny Mar 3, 2018
2b20159
Revert preview layer changes
teddyzeenny Mar 3, 2018
1a8ea27
Revert previews, fix tests
RobbieTheWagner Mar 3, 2018
b3f656f
Merge branch 'ember-3' of https://github.com/emberjs/ember-inspector …
RobbieTheWagner Mar 3, 2018
89749d9
Remove the index property
teddyzeenny Mar 3, 2018
329655d
Remove ember-math-helpers
RobbieTheWagner Mar 3, 2018
056b70b
Confirm removal of eslint test generator
teddyzeenny Mar 3, 2018
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ember_debug/vendor/startup-wrapper.js
47 changes: 40 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
Expand Down Expand Up @@ -42,19 +48,19 @@ module.exports = {
'no-shadow': 0,
'no-use-before-define': [2, {
'classes': false,
'functions': false,
'functions': false
}],

/* Stylistic Issues */

'array-bracket-spacing': 2,
'block-spacing': 2,
'camelcase': [0, {
'properties': 'always',
'properties': 'always'
}],
'comma-spacing': [2, {
'before': false,
'after': true,
'after': true
}],
'comma-style': 2,
'computed-property-spacing': 2,
Expand All @@ -63,19 +69,19 @@ module.exports = {
'VariableDeclarator': {
'var': 2,
'let': 2,
'const': 3,
'const': 3
}
}],
'key-spacing': [2, {
'beforeColon': false,
'afterColon': true,
'afterColon': true
}],
'keyword-spacing': 2,
'linebreak-style': [2, 'unix'],
'max-len': [2, 250],
'max-nested-callbacks': [2, 5],
'new-cap': [2, {
'capIsNew': false,
'capIsNew': false
}],
'new-parens': 2,
'no-array-constructor': 2,
Expand Down Expand Up @@ -115,5 +121,32 @@ module.exports = {
'prefer-template': 2,
'require-yield': 2,
'template-curly-spacing': 2,

// Temporarily turn these off
'ember/avoid-leaking-state-in-ember-objects': 'off',
'ember/closure-actions': 'off',
'ember/no-on-calls-in-components': 'off',
'ember/jquery-ember-run': 'off',
'ember/use-brace-expansion': 'off'
},
overrides: [
// node files
{
files: [
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'lib/*/index.js',
'Gruntfile.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
}
}
]
};
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
config/secrets.json

/.mozilla-addon-sdk

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
5 changes: 5 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ dist_prev
.mozilla-addon-sdk

aws.json

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
48 changes: 39 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,48 @@
---
language: node_js

node_js:
- "6"

sudo: false
dist: trusty
sudo: required

addons:
chrome: stable

cache:
yarn: true

addons:
chrome: stable
env:
global:
- secure: EYaa9XxKkfJbQENuQPNFAIIieMWBiSknGCO9he8MH8ZHbqJODTjFixJnD5ZYLZCXH67SmjorBneznQHp8Xaf0aIuHbRhRY/MOUzqEWw12MmexW1kJF5wX+oxEnvzoiVAUJLNTIQi+g5WN43YBleASKMjUPa2i/3GBIcTlsVdf3U=
- secure: g+Qh9jUTpK1yFpcZi9O8rsybfqv3TFE2hTFvG8XZ+QaQYBLLZ52JfhsJhdI0cvRRp7qWOhzE784iadkPWgvhj8c0/N/af5ZrSP3ceiv6RKqSUG2/iQyzX/qUh3vqrZ7a4xTsELTwswQtR+sA+I+DQVVlnqcCqYTAW2SFR/D4H8o=

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

include:
# runs tests for ember_debug against each supported Ember version
- stage: ember debug test
env: EMBER_TRY_SCENARIO=ember-2.7
- env: EMBER_TRY_SCENARIO=ember-lts-2.8
- env: EMBER_TRY_SCENARIO=ember-2.9
- env: EMBER_TRY_SCENARIO=ember-2.10
- env: EMBER_TRY_SCENARIO=ember-2.11
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
- env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default

# runs tests with current locked deps and linting
- stage: test
script:
- yarn lint:js
- yarn test

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
Expand All @@ -23,12 +54,11 @@ install:
- bower install

script:
- yarn test
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup=true --- node_modules/.bin/ember test --filter="Ember Debug"

after_success:
- test $TRAVIS_BRANCH == "stable" && yarn run upload

env:
global:
- secure: EYaa9XxKkfJbQENuQPNFAIIieMWBiSknGCO9he8MH8ZHbqJODTjFixJnD5ZYLZCXH67SmjorBneznQHp8Xaf0aIuHbRhRY/MOUzqEWw12MmexW1kJF5wX+oxEnvzoiVAUJLNTIQi+g5WN43YBleASKMjUPa2i/3GBIcTlsVdf3U=
- secure: g+Qh9jUTpK1yFpcZi9O8rsybfqv3TFE2hTFvG8XZ+QaQYBLLZ52JfhsJhdI0cvRRp7qWOhzE784iadkPWgvhj8c0/N/af5ZrSP3ceiv6RKqSUG2/iQyzX/qUh3vqrZ7a4xTsELTwswQtR+sA+I+DQVVlnqcCqYTAW2SFR/D4H8o=
branches:
only:
- "master"
12 changes: 6 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = function(grunt) {
var packageJson = grunt.file.readJSON('package.json');
var versionedPane = 'panes-' + packageJson.emberVersionsSupported[0].replace(/\./g, '-');
var config = {
let packageJson = grunt.file.readJSON('package.json');
let versionedPane = `panes-${packageJson.emberVersionsSupported[0].replace(/\./g, '-')}`;
let config = {
pkg: packageJson,
env: process.env,
"s3": {
Expand Down Expand Up @@ -47,7 +47,7 @@ module.exports = function(grunt) {
},
expand: true,
pretty: true,
cwd: 'dist/chrome/' + versionedPane,
cwd: `dist/chrome/${versionedPane}`,
src: ['**/*']
},
"firefox-pane": {
Expand All @@ -56,7 +56,7 @@ module.exports = function(grunt) {
},
expand: true,
pretty: true,
cwd: 'dist/firefox/' + versionedPane,
cwd: `dist/firefox/${versionedPane}`,
src: ['**/*']
},
"bookmarklet-pane": {
Expand All @@ -65,7 +65,7 @@ module.exports = function(grunt) {
},
expand: true,
pretty: true,
cwd: 'dist/bookmarklet/' + versionedPane,
cwd: `dist/bookmarklet/${versionedPane}`,
src: ['**/*']
}
}
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ OR:
- cd into the repo directory
- run `yarn install && bower install`
- run `yarn global add ember-cli`
- run `yarn run build` to build the `dist` directory
- run `yarn build` to build the `dist` directory
- Visit `chrome://extensions` in Chrome
- Make sure `Developer mode` is checked
- Click on 'Load unpacked extension...'
Expand All @@ -32,7 +32,7 @@ OR:
- cd into the repo directory
- run `yarn install && bower install`
- run `yarn global add ember-cli`
- run `yarn run build` to build the `dist` directory
- run `yarn build` to build the `dist` directory
- Visit `about:debugging` in Firefox
- Click on 'Load Temporary Addon-on'
- Choose the `dist/firefox/manifest.json` file in the cloned repo
Expand All @@ -43,7 +43,7 @@ OR:
- cd into the repo directory
- run `yarn install && bower install`
- run `yarn global add ember-cli`
- run `yarn run build` to build the `dist` directory
- run `yarn build` to build the `dist` directory
- Visit `chrome://extensions` in Opera
- Make sure `Developer mode` is checked
- Click on 'Load unpacked extension...'
Expand All @@ -60,7 +60,7 @@ Internet explorer will open an iframe instead of a popup due to the lack of supp

For development:

- run `yarn run serve:bookmarklet`
- run `yarn serve:bookmarklet`
- create a bookmark (make sure you unblock the popup when you run the bookmarklet):

```javascript
Expand All @@ -71,8 +71,8 @@ javascript: (function() { var s = document.createElement('script'); s.src = 'htt

Run `yarn install && yarn global add ember-cli && yarn global add bower && bower install && grunt-cli` to install the required modules.

- `yarn run build` to build the files in the `dist` directory
- `yarn run watch` To watch the files and re-build in `dist` when anything changes (useful during development).
- `yarn build` to build the files in the `dist` directory
- `yarn watch` To watch the files and re-build in `dist` when anything changes (useful during development).
- `yarn test` To run the tests in the terminal
- `yarn start` To start the test server at `localhost:4200/testing/tests`

Expand Down Expand Up @@ -104,7 +104,7 @@ When releasing a major/minor version, master would already have this version set
#### Steps to publish

- Push the `stable` branch to github (this will publish the bookmarklet version).
- `yarn run build:production`
- `yarn build:production`
- `git tag` the new version
- Follow the "Publishing to Chrome" steps
- Follow the "Publishing to Firefox" steps
Expand Down Expand Up @@ -142,7 +142,7 @@ Here are the steps to lock an inspector version:

- Update `package.json`'s `emberVersionsSupported`: add a second element that indicates the minimum Ember version this inspector *does not* support.
- Release a new version (See "Minor and major versions"). Create a branch for this version.
- Run `yarn run lock-version`. This will build, compress, and upload this version to S3.
- Run `yarn lock-version`. This will build, compress, and upload this version to S3.
- Update `package.json`'s `previousEmberVersionsSupported`: add the first Ember version supported by the recently locked version (the first element in the `emberVersionsSupported` array).
- Update `package.json`'s `emberVersionsSupported`: Move the second element in the array to the first position. Add an empty string as the second element to indicate there's currently no maximum Ember version supported yet.
- Commit.
Expand Down
13 changes: 0 additions & 13 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ const App = Application.extend({
Resolver
});

// TODO: remove this when fixed
// problem description: registry classes being registered
// again on app reset. this will clear the registry.
// long term solution: make registry initializers run once on app
// creation.
// issue: https://github.com/emberjs/ember.js/issues/10310
// pr: https://github.com/emberjs/ember.js/pull/10597
App.reopen({
buildInstance() {
this.buildRegistry();
return this._super(...arguments);
}
});

config.VERSION = version;

Expand Down
21 changes: 0 additions & 21 deletions app/components/container-instance.js

This file was deleted.

12 changes: 6 additions & 6 deletions app/components/drag-handle.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ export default Component.extend({

$('body').on(`mousemove.${namespace}`, e => {
let position = this.get('isLeft') ?
e.pageX - $containerOffsetLeft :
$containerOffsetRight - e.pageX;
e.pageX - $containerOffsetLeft :
$containerOffsetRight - e.pageX;

position -= this.get('left');
if (position >= this.get('minWidth') && position <= this.get('maxWidth')) {
this.set('position', position);
this.get('on-drag')(position);
}
})
.on(`mouseup.${namespace} mouseleave.${namespace}`, () => {
this.stopDragging();
});
.on(`mouseup.${namespace} mouseleave.${namespace}`, () => {
this.stopDragging();
});
},

stopDragging() {
Expand All @@ -89,7 +89,7 @@ export default Component.extend({
return false;
},

style: computed('side', 'position', 'left', function () {
style: computed('side', 'position', 'left', function() {
let string;
if (this.get('side')) {
string = `${this.get('side')}: ${(this.get('position') + this.get('left'))}px;`;
Expand Down
Loading