Merge branch 'master' into patch-2

emberjs · May 25, 2020 · f9d4d9d · f9d4d9d
2 parents f1edfd8 + 6fd4849
commit f9d4d9d
Show file tree

Hide file tree

Showing 176 changed files with 4,832 additions and 3,724 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -21,6 +21,5 @@
 
 # ember-inspector specific
 /dist_prev/
-/scripts/
 /skeletons/
 /ember_debug/vendor/startup-wrapper.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,32 +7,32 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember', 'prettier'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
+    browser: true,
   },
   globals: {
-    basicContext: false
+    basicContext: false,
   },
   rules: {
     'no-prototype-builtins': 'off',
-    
+
     'ember/no-jquery': 'error',
 
     // Temporarily turn these off
     'ember/avoid-leaking-state-in-ember-objects': 'off',
 
     // Best practice
-    'no-duplicate-imports': 'error'
+    'no-duplicate-imports': 'error',
+    'ember/no-mixins': 'error',
   },
   overrides: [
     // node files
@@ -48,27 +48,25 @@ module.exports = {
         'blueprints/*/index.js',
         'config/**/*.js',
         'lib/*/index.js',
-        'server/**/*.js'
-      ],
-      excludedFiles: [
-        'app/**',
+        'scripts/**/*.js',
+        'server/**/*.js',
       ],
+      excludedFiles: ['app/**'],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015
+        ecmaVersion: 2015,
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-
+      extends: ['plugin:node/recommended'],
+      rules: {
         // this can be removed once the following is fixed
         // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off'
-      })
-    }
-  ]
+        'node/no-unpublished-require': 'off',
+      },
+    },
+  ],
 };
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -7,8 +7,8 @@ module.exports = {
       files: '**/*.hbs',
       options: {
         parser: 'glimmer',
-        singleQuote: false
-      }
-    }
-  ]
+        singleQuote: false,
+      },
+    },
+  ],
 };
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -1,3 +1,3 @@
 module.exports = {
-  extends: 'stylelint-config-ship-shape'
+  extends: 'stylelint-config-ship-shape',
 };
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -8,6 +8,6 @@ module.exports = {
     'no-invalid-interactive': false,
     'no-negated-condition': false,
     'no-positive-tabindex': false,
-    'table-groups': false
-  }
+    'table-groups': false,
+  },
 };
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Changelog
 
+## [v4.1.0](https://github.com/emberjs/ember-inspector/tree/v4.1.0) (2020-05-12)
+
+[Full Changelog](https://github.com/emberjs/ember-inspector/compare/v4.0.1...v4.1.0)
+
+**Implemented enhancements:**
+
+- Add ability to sort container instances alphabetically [\#1198](https://github.com/emberjs/ember-inspector/pull/1198) ([lukemelia](https://github.com/lukemelia))
+
+**Fixed bugs:**
+
+- Rendering tests unusable in ember-inspectors test suite [\#1201](https://github.com/emberjs/ember-inspector/issues/1201)
+- Can't see full list of components in `Components` tab after 4.0.0 [\#1200](https://github.com/emberjs/ember-inspector/issues/1200)
+- Component Tree - dissapears if modal-dialog used and focused using component explorer [\#1195](https://github.com/emberjs/ember-inspector/issues/1195)
+- Component tree: incorrect string component arguments serialization [\#1190](https://github.com/emberjs/ember-inspector/issues/1190)
+- Ensure renderDebug is properly unregistered. [\#1202](https://github.com/emberjs/ember-inspector/pull/1202) ([rwjblue](https://github.com/rwjblue))
+- Upgrade to Ember 3.18 to fix list rendering issue [\#1196](https://github.com/emberjs/ember-inspector/pull/1196) ([chancancode](https://github.com/chancancode))
+- Fix string arguments in component tree to render only one pair of double quotes fixes \#1190 [\#1193](https://github.com/emberjs/ember-inspector/pull/1193) ([SYU15](https://github.com/SYU15))
+- fix attrs/args - toString is undefined [\#1189](https://github.com/emberjs/ember-inspector/pull/1189) ([patricklx](https://github.com/patricklx))
+
+**Merged pull requests:**
+
+- Bump jquery from 3.4.1 to 3.5.1 [\#1207](https://github.com/emberjs/ember-inspector/pull/1207) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Remove private API usage to set moduleName in view debug tests. [\#1205](https://github.com/emberjs/ember-inspector/pull/1205) ([rwjblue](https://github.com/rwjblue))
+- Introduce `setupEmberDebugTest` test helper. [\#1204](https://github.com/emberjs/ember-inspector/pull/1204) ([rwjblue](https://github.com/rwjblue))
+- Reset internal test helper state for EmberDebug tests. [\#1203](https://github.com/emberjs/ember-inspector/pull/1203) ([rwjblue](https://github.com/rwjblue))
+- Add 4.0.0 changelog, bump minor version [\#1188](https://github.com/emberjs/ember-inspector/pull/1188) ([rwwagner90](https://github.com/rwwagner90))
+- No observers lint rule [\#1181](https://github.com/emberjs/ember-inspector/pull/1181) ([ansmonjol](https://github.com/ansmonjol))
+
+## [v4.0.1](https://github.com/emberjs/ember-inspector/tree/v4.0.1) (2020-05-06)
+
+[Full Changelog](https://github.com/emberjs/ember-inspector/compare/v4.0.0...v4.0.1)
+
 ## [v4.0.0](https://github.com/emberjs/ember-inspector/tree/v4.0.0) (2020-05-06)
 
 [Full Changelog](https://github.com/emberjs/ember-inspector/compare/v3.13.2...v4.0.0)

diff --git a/app/adapters/basic.js b/app/adapters/basic.js
@@ -39,7 +39,7 @@ export default EmberObject.extend({
    * @private
    */
   _checkVersion() {
-    this.onMessageReceived(message => {
+    this.onMessageReceived((message) => {
       let { name, version } = message;
       if (name === 'version-mismatch') {
         let previousVersions = config.previousEmberVersionsSupported;
@@ -90,7 +90,7 @@ export default EmberObject.extend({
   },
 
   _messageReceived(message) {
-    this._messageCallbacks.forEach(callback => {
+    this._messageCallbacks.forEach((callback) => {
       callback(message);
     });
   },
@@ -99,8 +99,7 @@ export default EmberObject.extend({
   willReload() {},
 
   canOpenResource: false,
-  openResource(/* file, line */) {}
-
+  openResource(/* file, line */) {},
 });
 
 /**

diff --git a/app/adapters/bookmarklet.js b/app/adapters/bookmarklet.js
@@ -1,7 +1,7 @@
 /* eslint no-useless-escape: 0 */
 import { computed } from '@ember/object';
 
-import BasicAdapter from "./basic";
+import BasicAdapter from './basic';
 
 export default BasicAdapter.extend({
   name: 'bookmarklet',
@@ -16,11 +16,11 @@ export default BasicAdapter.extend({
     return this._super(...arguments);
   },
 
-  inspectedWindow: computed(function() {
+  inspectedWindow: computed(function () {
     return window.opener || window.parent;
   }),
 
-  inspectedWindowURL: computed(function() {
+  inspectedWindowURL: computed(function () {
     return loadPageVar('inspectedWindowURL');
   }),
 
@@ -37,11 +37,14 @@ export default BasicAdapter.extend({
    */
   onVersionMismatch(goToVersion) {
     this.sendMessage({ name: 'version-mismatch', version: goToVersion });
-    window.location.href = `../panes-${goToVersion.replace(/\./g, '-')}/index.html${window.location.search}`;
+    window.location.href = `../panes-${goToVersion.replace(
+      /\./g,
+      '-'
+    )}/index.html${window.location.search}`;
   },
 
   _connect() {
-    window.addEventListener('message', e => {
+    window.addEventListener('message', (e) => {
       let message = e.data;
       if (e.origin !== this.inspectedWindowURL) {
         return;
@@ -54,10 +57,20 @@ export default BasicAdapter.extend({
         this._messageReceived(message);
       }
     });
-  }
+  },
 });
 
-
-function loadPageVar (sVar) {
-  return decodeURI(window.location.search.replace(new RegExp(`^(?:.*[&\\?]${encodeURI(sVar).replace(/[\.\+\*]/g, "\\$&")}(?:\\=([^&]*))?)?.*$`, "i"), "$1"));
+function loadPageVar(sVar) {
+  return decodeURI(
+    window.location.search.replace(
+      new RegExp(
+        `^(?:.*[&\\?]${encodeURI(sVar).replace(
+          /[\.\+\*]/g,
+          '\\$&'
+        )}(?:\\=([^&]*))?)?.*$`,
+        'i'
+      ),
+      '$1'
+    )
+  );
 }
diff --git a/app/adapters/chrome.js b/app/adapters/chrome.js
@@ -1,4 +1,4 @@
-import WebExtension from "./web-extension";
+import WebExtension from './web-extension';
 
 export default WebExtension.extend({
   name: 'chrome',
@@ -12,10 +12,10 @@ export default WebExtension.extend({
   },
 
   onResourceAdded() {
-    chrome.devtools.inspectedWindow.onResourceAdded.addListener(opts => {
+    chrome.devtools.inspectedWindow.onResourceAdded.addListener((opts) => {
       if (opts.type === 'document') {
         this.sendIframes([opts.url]);
       }
     });
-  }
+  },
 });
diff --git a/app/adapters/firefox.js b/app/adapters/firefox.js
@@ -1,5 +1,5 @@
-import WebExtension from "./web-extension";
+import WebExtension from './web-extension';
 
 export default WebExtension.extend({
-  name: 'firefox'
+  name: 'firefox',
 });
diff --git a/app/adapters/web-extension.js b/app/adapters/web-extension.js
@@ -1,7 +1,7 @@
 /* globals chrome */
 import { computed } from '@ember/object';
 
-import BasicAdapter from "./basic";
+import BasicAdapter from './basic';
 import config from 'ember-inspector/config/environment';
 
 let emberDebug = null;
@@ -28,15 +28,15 @@ export default BasicAdapter.extend({
     this._chromePort.postMessage(options);
   },
 
-  _chromePort: computed(function() {
+  _chromePort: computed(function () {
     return chrome.runtime.connect();
   }),
 
   _connect() {
     let chromePort = this._chromePort;
     chromePort.postMessage({ appId: chrome.devtools.inspectedWindow.tabId });
 
-    chromePort.onMessage.addListener(message => {
+    chromePort.onMessage.addListener((message) => {
       if (typeof message.type === 'string' && message.type === 'iframes') {
         this.sendIframes(message.urls);
       }
@@ -46,14 +46,14 @@ export default BasicAdapter.extend({
 
   _handleReload() {
     let self = this;
-    chrome.devtools.network.onNavigated.addListener(function() {
+    chrome.devtools.network.onNavigated.addListener(function () {
       self._injectDebugger();
       location.reload(true);
     });
   },
 
   _injectDebugger() {
-    loadEmberDebug().then(emberDebug => {
+    loadEmberDebug().then((emberDebug) => {
       chrome.devtools.inspectedWindow.eval(emberDebug, (success, error) => {
         if (success === undefined && error) {
           throw error;
@@ -74,7 +74,7 @@ export default BasicAdapter.extend({
     document.body.classList.add(theme);
   },
 
-  onResourceAdded(/*callback*/) { },
+  onResourceAdded(/*callback*/) {},
 
   willReload() {
     this._injectDebugger();
@@ -111,30 +111,33 @@ export default BasicAdapter.extend({
     scripts as soon as possible into the new page.
   */
   reloadTab() {
-    loadEmberDebug().then(emberDebug => {
+    loadEmberDebug().then((emberDebug) => {
       chrome.devtools.inspectedWindow.reload({ injectedScript: emberDebug });
     });
   },
 
   canOpenResource: false,
 
   sendIframes(urls) {
-    loadEmberDebug().then(emberDebug => {
-      urls.forEach(url => {
+    loadEmberDebug().then((emberDebug) => {
+      urls.forEach((url) => {
         chrome.devtools.inspectedWindow.eval(emberDebug, { frameURL: url });
       });
     });
-  }
+  },
 });
 
 function loadEmberDebug() {
   let minimumVersion = config.emberVersionsSupported[0].replace(/\./g, '-');
   let xhr;
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     if (!emberDebug) {
       xhr = new XMLHttpRequest();
-      xhr.open("GET", chrome.runtime.getURL(`/panes-${minimumVersion}/ember_debug.js`));
-      xhr.onload = function() {
+      xhr.open(
+        'GET',
+        chrome.runtime.getURL(`/panes-${minimumVersion}/ember_debug.js`)
+      );
+      xhr.onload = function () {
         if (xhr.readyState === 4) {
           if (xhr.status === 200) {
             emberDebug = xhr.responseText;

diff --git a/app/adapters/websocket.js b/app/adapters/websocket.js
@@ -14,7 +14,7 @@ export default BasicAdapter.extend({
   },
 
   _connect() {
-    this.socket.on('emberInspectorMessage', message => {
+    this.socket.on('emberInspectorMessage', (message) => {
       run(() => {
         this._messageReceived(message);
       });
@@ -27,6 +27,5 @@ export default BasicAdapter.extend({
 
   willDestroy() {
     this._disconnect();
-  }
+  },
 });
-
diff --git a/app/components/app-picker.hbs b/app/components/app-picker.hbs
@@ -1,7 +1,7 @@
 <div class="h-7 text-base13">
   <select
     class="box-border block w-full h-full m-0 border-0 pr-4 pl-1 text-base text-base13 bg-transparent appearance-none outline-none"
-    onchange={{action "selectApp" value="target.value"}}
+    {{on 'change' this.selectApp}}
   >
     {{#each-in this.apps as |id name|}}
       <option