ember-inspector 4.13.1 → 4.15.0

package/dist/websocket/websocket-BSUvUqER.js

@@ -0,0 +1,58 @@
+import { B as BasicAdapter, o as onReady } from './basic-B1dkgN3d.js';
+import { r as run } from './runloop-6_0lpzTA.js';
+import './base-object-HAEdWjmg.js';
+import './ember.js';
+
+class websocket extends BasicAdapter {
+  sendMessage(options = {}) {
+    this.socket.emit('emberInspectorMessage', options);
+  }
+  get socket() {
+    return window.EMBER_INSPECTOR_CONFIG.remoteDebugSocket;
+  }
+  _listen() {
+    this.socket.on('emberInspectorMessage', message => {
+      // We should generally not be run-wrapping here. Starting a runloop in
+      // ember-debug will cause the inspected app to revalidate/rerender. We
+      // are generally not intending to cause changes to the rendered output
+      // of the app, so this is generally unnecessary, and in big apps this
+      // could be quite slow. There is nothing special about the `view:*`
+      // messages – I (GC) just happened to have reviewed all of them recently
+      // and can be quite sure that they don't need the runloop. We should
+      // audit the rest of them and see if we can remove the else branch. I
+      // think we most likely can. In the limited cases (if any) where the
+      // runloop is needed, the callback code should just do the wrapping
+      // themselves.
+      if (message.type.startsWith('view:')) {
+        this._messageReceived(message);
+      } else {
+        run(() => {
+          this._messageReceived(message);
+        });
+      }
+    });
+  }
+  _disconnect() {
+    this.socket.removeAllListeners('emberInspectorMessage');
+  }
+  connect() {
+    return new Promise((resolve, reject) => {
+      onReady(() => {
+        if (this.isDestroyed) {
+          reject();
+        }
+        const EMBER_INSPECTOR_CONFIG = window.EMBER_INSPECTOR_CONFIG;
+        if (typeof EMBER_INSPECTOR_CONFIG === 'object' && EMBER_INSPECTOR_CONFIG.remoteDebugSocket) {
+          resolve();
+        }
+      });
+    }).then(() => {
+      this._listen();
+    });
+  }
+  willDestroy() {
+    this._disconnect();
+  }
+}
+
+export { websocket as default };

package/dist/websocket/websocket-debug.js

@@ -0,0 +1,10 @@
+import { l as loadEmberDebugInWebpage } from './load-ember-debug-in-webpage-DCWcJhQm.js';
+
+loadEmberDebugInWebpage(async () => {
+  const {
+    onEmberReady,
+    startInspector
+  } = await import('./start-inspector-BIYQArZn.js');
+  const adapter = (await import('./websocket-BSUvUqER.js')).default;
+  onEmberReady(startInspector(adapter));
+});

package/ember-cli-build.js

@@ -7,15 +7,14 @@ const concatFiles = require('broccoli-concat');
 const stew = require('broccoli-stew');
 const writeFile = require('broccoli-file-creator');
 const replace = require('broccoli-string-replace');
-const Babel = require('broccoli-babel-transpiler');
-const moduleResolver = require('amd-name-resolver').resolveModules({
-  throwOnRootAccess: false,
-});
 const Funnel = require('broccoli-funnel');
-const ensurePosix = require('ensure-posix-path');
-const path = require('path');
 const packageJson = require('./package.json');
-const { map, mv } = stew;
+const { mv } = stew;
+
+const {
+  EMBER_VERSIONS_SUPPORTED,
+  PREVIOUS_EMBER_VERSIONS_SUPPORTED,
+} = require('ember-debug/versions');
 
 const options = {
   autoImport: {
@@ -33,16 +32,6 @@ const options = {
 options.minifyJS = { enabled: false };
 options.minifyCSS = { enabled: false };
 
-// Stolen from relative-module-paths.js in ember-cli-babel
-function getRelativeModulePath(modulePath) {
-  return ensurePosix(path.relative(process.cwd(), modulePath));
-}
-
-// Stolen from relative-module-paths.js in ember-cli-babel
-function resolveRelativeModulePath(name, child) {
-  return moduleResolver(name, getRelativeModulePath(child));
-}
-
 module.exports = function (defaults) {
   let checker = new VersionChecker(defaults);
   let emberChecker = checker.for('ember-source');
@@ -100,127 +89,32 @@ module.exports = function (defaults) {
   app.import('node_modules/compare-versions/index.js');
   app.import('node_modules/normalize.css/normalize.css');
 
-  // Ember Debug
-
-  let emberDebug = 'ember_debug';
-
-  let sourceMap = new Funnel('node_modules/source-map-js', {
-    files: ['**/*.js'],
-    destDir: 'ember-debug/deps',
-  });
-
-  sourceMap = new Babel(sourceMap, {
-    plugins: ['transform-commonjs'],
-  });
-
-  const backburner = new Funnel('node_modules/backburner.js/dist/es6', {
-    files: ['backburner.js'],
-    destDir: 'ember-debug/deps',
-  });
-
-  emberDebug = new Funnel(emberDebug, {
-    destDir: 'ember-debug',
-    include: ['**/*.js'],
-    exclude: ['vendor/startup-wrapper.js', 'vendor/loader.js'],
-  });
-
-  emberDebug = mergeTrees([sourceMap, backburner, emberDebug]);
-
-  emberDebug = new Babel(emberDebug, {
-    moduleIds: true,
-    getModuleId: getRelativeModulePath,
-    plugins: [
-      ['@babel/plugin-transform-class-properties'],
-      ['@babel/plugin-transform-class-static-block'],
-      ['module-resolver', { resolvePath: resolveRelativeModulePath }],
-      ['@babel/plugin-transform-modules-amd', { noInterop: true }],
-    ],
-  });
-
-  const previousEmberVersionsSupportedString = `[${packageJson.previousEmberVersionsSupported
-    .map(function (item) {
-      return `'${item}'`;
-    })
-    .join(',')}]`;
-  const emberVersionsSupportedString = `[${packageJson.emberVersionsSupported
-    .map(function (item) {
-      return `'${item}'`;
-    })
-    .join(',')}]`;
-
-  let startupWrapper = new Funnel('ember_debug', {
-    srcDir: 'vendor',
-    files: ['startup-wrapper.js'],
-  });
-
-  startupWrapper = replace(startupWrapper, {
-    files: ['startup-wrapper.js'],
-    patterns: [
-      {
-        match: /{{EMBER_VERSIONS_SUPPORTED}}/,
-        replacement: emberVersionsSupportedString,
-      },
-    ],
-  });
-
-  const loader = new Funnel('ember_debug', {
-    srcDir: 'vendor',
-    files: ['loader.js'],
-  });
+  const previousEmberVersionsSupportedString = JSON.stringify(
+    PREVIOUS_EMBER_VERSIONS_SUPPORTED,
+  );
+  const emberVersionsSupportedString = JSON.stringify(EMBER_VERSIONS_SUPPORTED);
 
-  emberDebug = mergeTrees([startupWrapper, emberDebug, loader]);
+  const emberDebugs = [];
 
-  emberDebug = concatFiles(emberDebug, {
-    headerFiles: ['loader.js'],
-    inputFiles: ['**/*.js'],
-    outputFile: '/ember_debug.js',
-    sourceMapConfig: { enabled: false },
-  });
+  ['basic', 'chrome', 'firefox', 'bookmarklet', 'websocket'].forEach(
+    function (dist) {
+      let emberDebug = 'ember_debug/dist';
 
-  function wrapWithLoader(content) {
-    return `(function loadEmberDebugInWebpage() {
-    const waitForEmberLoad = new Promise((resolve) => {
-      if (window.requireModule) {
-        const has =
-          window.requireModule.has ||
-          function has(id) {
-            return !!(
-              window.requireModule.entries[id] ||
-              window.requireModule.entries[id + '/index']
-            );
-          };
-        if (has('ember')) {
-          return resolve();
-        }
-      }
-
-      /**
-       * NOTE: if the above (for some reason) fails and the consuming app has
-       *       deprecation-workflow's throwOnUnhandled: true
-       *         or set \`ember-global\`'s handler to 'throw'
-       *       and is using at least \`ember-source@3.27\`
-       *
-       *       this will throw an exception in the consuming project
-       */
-      if (window.Ember) return resolve();
-
-      window.addEventListener('Ember', resolve, { once: true });
-    });
-    waitForEmberLoad.then(() => ${content});
-  })()
-  `;
-  }
-
-  const emberDebugs = [];
-  ['basic', 'chrome', 'firefox', 'bookmarklet', 'websocket'].forEach(function (
-    dist
-  ) {
-    emberDebugs[dist] = map(emberDebug, '**/*.js', function (content) {
-      return wrapWithLoader(
-        `(function(adapter, env) {\n${content}\n}('${dist}', '${env}'))`
+      let entryPoint = concatFiles(
+        new Funnel(emberDebug, {
+          destDir: 'ember-debug',
+          include: [`${dist}-debug.js`],
+        }),
+        {
+          inputFiles: ['**/*.js'],
+          outputFile: '/ember_debug.js',
+          sourceMapConfig: { enabled: false },
+        },
       );
-    });
-  });
+
+      emberDebugs[dist] = mergeTrees([emberDebug, entryPoint]);
+    },
+  );
 
   let tree = app.toTree();
 
@@ -236,10 +130,7 @@ module.exports = function (defaults) {
     patterns: emberInspectorVersionPattern,
   });
 
-  const minimumVersion = packageJson.emberVersionsSupported[0].replace(
-    /\./g,
-    '-'
-  );
+  const minimumVersion = EMBER_VERSIONS_SUPPORTED[0].replace(/\./g, '-');
   const webExtensionRoot = `panes-${minimumVersion}`;
 
   let tabLabel;
@@ -310,7 +201,7 @@ module.exports = function (defaults) {
     skeletonBookmarklet,
   ]);
 
-  packageJson.previousEmberVersionsSupported.forEach(function (version) {
+  PREVIOUS_EMBER_VERSIONS_SUPPORTED.forEach(function (version) {
     version = version.replace(/\./g, '-');
     if (env === 'production') {
       const prevDist = `dist_prev/${env}`;
@@ -330,7 +221,7 @@ module.exports = function (defaults) {
     } else {
       const file = writeFile(
         'index.html',
-        'This Ember version is not supported in development environment.'
+        'This Ember version is not supported in development environment.',
       );
       const emberDebugFile = writeFile('ember_debug.js', 'void(0);');
       chrome = mergeTrees([mv(file, `panes-${version}`), chrome]);

package/ember_debug/adapters/basic.js

@@ -1,8 +1,9 @@
 /* eslint no-console: 0 */
-import { onReady } from 'ember-debug/utils/on-ready';
-import BaseObject from '../utils/base-object';
+import { onReady } from '../utils/on-ready';
+import BaseObject from '../utils/base-object.js';
 
 export default class BasicAdapter extends BaseObject {
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     Promise.resolve(this.connect()).then(() => {
       this.onConnectionReady();
@@ -11,21 +12,6 @@ export default class BasicAdapter extends BaseObject {
     this._messageCallbacks = [];
   }
 
-  /**
-   * Uses the current build's config module to determine
-   * the environment.
-   *
-   * @property environment
-   * @type {String}
-   */
-  get environment() {
-    if (!this.__environment) {
-      this.__environment =
-        requireModule('ember-debug/config')['default'].environment;
-    }
-    return this.__environment;
-  }
-
   debug() {
     return console.debug(...arguments);
   }
@@ -93,19 +79,14 @@ export default class BasicAdapter extends BaseObject {
    * @param {Error} error
    */
   handleError(error) {
-    if (this.environment === 'production') {
-      if (error && error instanceof Error) {
-        error = `Error message: ${error.message}\nStack trace: ${error.stack}`;
-      }
-      this.warn(
-        `Ember Inspector has errored.\n` +
-          `This is likely a bug in the inspector itself.\n` +
-          `You can report bugs at https://github.com/emberjs/ember-inspector.\n${error}`
-      );
-    } else {
-      this.warn('EmberDebug has errored:');
-      throw error;
+    if (error && error instanceof Error) {
+      error = `Error message: ${error.message}\nStack trace: ${error.stack}`;
     }
+    this.warn(
+      `Ember Inspector has errored.\n` +
+        `This is likely a bug in the inspector itself.\n` +
+        `You can report bugs at https://github.com/emberjs/ember-inspector.\n${error}`,
+    );
   }
 
   /**

package/ember_debug/adapters/bookmarklet.js

@@ -1,6 +1,7 @@
 import BasicAdapter from './basic';
 
 export default class extends BasicAdapter {
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     super.init();
     this._listen();

package/ember_debug/adapters/firefox.js

@@ -1,4 +1,4 @@
-/* eslint no-empty:0 */
+/* eslint-disable no-empty */
 import WebExtension from './web-extension';
 
 export default class extends WebExtension {
@@ -9,7 +9,7 @@ export default class extends WebExtension {
     // - https://code.google.com/p/fbug/issues/detail?id=7045
     try {
       super.debug(...arguments);
-    } catch (e) {}
+    } catch {}
   }
 
   log() {
@@ -19,6 +19,6 @@ export default class extends WebExtension {
     // - https://code.google.com/p/fbug/issues/detail?id=7045
     try {
       super.log(...arguments);
-    } catch (e) {}
+    } catch {}
   }
 }

package/ember_debug/adapters/web-extension.js

@@ -1,13 +1,14 @@
 import BasicAdapter from './basic';
-import { typeOf } from 'ember-debug/utils/type-check';
+import { typeOf } from '../utils/type-check';
 
-import Ember from 'ember-debug/utils/ember';
-import { run } from 'ember-debug/utils/ember/runloop';
+import { getEnv } from '../utils/ember';
+import { run } from '../utils/ember/runloop';
 
 const { isArray } = Array;
 const { keys } = Object;
 
 export default class extends BasicAdapter {
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     this._channel = new MessageChannel();
     this._chromePort = this._channel?.port1;
@@ -105,8 +106,8 @@ export default class extends BasicAdapter {
 // adapter later. See GH #1114.
 const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
   try {
-    return Ember.ENV.EXTEND_PROTOTYPES.Array === true;
-  } catch (e) {
+    return getEnv().EXTEND_PROTOTYPES.Array === true;
+  } catch {
     return false;
   }
 })();

package/ember_debug/adapters/websocket.js

@@ -1,6 +1,6 @@
 import BasicAdapter from './basic';
-import { onReady } from 'ember-debug/utils/on-ready';
-import { run } from 'ember-debug/utils/ember/runloop';
+import { onReady } from '../utils/on-ready';
+import { run } from '../utils/ember/runloop';
 
 export default class extends BasicAdapter {
   sendMessage(options = {}) {

package/ember_debug/babel.config.cjs

@@ -0,0 +1,11 @@
+module.exports = {
+  plugins: [
+    ['@babel/plugin-proposal-decorators', { version: 'legacy' }],
+    ['@babel/plugin-transform-class-properties'],
+    ['@babel/plugin-transform-class-static-block'],
+  ],
+
+  generatorOpts: {
+    compact: false,
+  },
+};

package/ember_debug/container-debug.js

@@ -1,4 +1,4 @@
-import DebugPort from './debug-port';
+import DebugPort from './debug-port.js';
 
 export default class extends DebugPort {
   get objectInspector() {

package/ember_debug/data-debug.js

@@ -1,7 +1,8 @@
-import DebugPort from './debug-port';
-import { guidFor } from 'ember-debug/utils/ember/object/internals';
+import DebugPort from './debug-port.js';
+import { guidFor } from './utils/ember/object/internals';
 
 export default class extends DebugPort {
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     super.init();
     this.sentTypes = {};
@@ -11,7 +12,6 @@ export default class extends DebugPort {
   releaseTypesMethod = null;
   releaseRecordsMethod = null;
 
-  /* eslint-disable ember/no-side-effects */
   get adapter() {
     const owner = this.namespace?.owner;
 
@@ -26,7 +26,6 @@ export default class extends DebugPort {
 
     return null;
   }
-  /* eslint-enable ember/no-side-effects */
 
   _resolve(name) {
     const owner = this.namespace?.owner;
@@ -93,7 +92,7 @@ export default class extends DebugPort {
     }
     // make sure keywords can be searched and clonable
     searchKeywords = record.searchKeywords.filter(
-      (keyword) => typeof keyword === 'string' || typeof keyword === 'number'
+      (keyword) => typeof keyword === 'string' || typeof keyword === 'number',
     );
     return {
       columnValues,
@@ -142,7 +141,7 @@ export default class extends DebugPort {
           },
           (types) => {
             this.modelTypesUpdated(types);
-          }
+          },
         );
       },
 
@@ -171,7 +170,7 @@ export default class extends DebugPort {
           },
           (...args) => {
             this.recordsRemoved(...args);
-          }
+          },
         );
         this.releaseRecordsMethod = releaseMethod;
       },
@@ -182,7 +181,7 @@ export default class extends DebugPort {
 
       inspectModel(message) {
         this.objectInspector.sendObject(
-          this.sentRecords[message.objectId].object
+          this.sentRecords[message.objectId].object,
         );
       },
 

package/ember_debug/debug-port.js

@@ -1,4 +1,4 @@
-import BaseObject from 'ember-debug/utils/base-object';
+import BaseObject from './utils/base-object';
 
 export default class extends BaseObject {
   port = null;

package/ember_debug/deprecation-debug.js

@@ -1,9 +1,9 @@
-import DebugPort from './debug-port';
-import SourceMap from 'ember-debug/libs/source-map';
+import DebugPort from './debug-port.js';
+import SourceMap from './libs/source-map';
 
-import { registerDeprecationHandler } from 'ember-debug/utils/ember/debug';
-import { guidFor } from 'ember-debug/utils/ember/object/internals';
-import { cancel, debounce } from 'ember-debug/utils/ember/runloop';
+import { Debug } from './utils/ember';
+import { guidFor } from './utils/ember/object/internals';
+import { cancel, debounce } from './utils/ember/runloop';
 
 export default class extends DebugPort {
   static {
@@ -32,7 +32,7 @@ export default class extends DebugPort {
           let stack = source.stackStr;
           stack = stack.split('\n');
           stack.unshift(
-            `Ember Inspector (Deprecation Trace): ${deprecation.message || ''}`
+            `Ember Inspector (Deprecation Trace): ${deprecation.message || ''}`,
           );
           this.adapter.log(stack.join('\n'));
         });
@@ -100,8 +100,8 @@ export default class extends DebugPort {
               (item) =>
                 item.source &&
                 !!item.source.match(
-                  new RegExp(this.emberCliConfig.modulePrefix)
-                )
+                  new RegExp(this.emberCliConfig.modulePrefix),
+                ),
             );
 
             if (source) {
@@ -114,7 +114,7 @@ export default class extends DebugPort {
           }
         },
         null,
-        'ember-inspector'
+        'ember-inspector',
       );
     } else {
       return Promise.resolve(null);
@@ -147,7 +147,7 @@ export default class extends DebugPort {
           grouped[id] = obj;
         }
         let found = obj.sources.find(
-          (s) => s.stackStr === deprecation.stackStr
+          (s) => s.stackStr === deprecation.stackStr,
         );
         if (!found) {
           let stackStr = deprecation.stackStr;
@@ -159,7 +159,7 @@ export default class extends DebugPort {
               }
             },
             null,
-            'ember-inspector'
+            'ember-inspector',
           );
         }
         return promise.then(() => {
@@ -168,7 +168,7 @@ export default class extends DebugPort {
             deprecations.push(obj);
           }
         }, null);
-      })
+      }),
     );
 
     promises.then(() => {
@@ -194,7 +194,7 @@ export default class extends DebugPort {
   }
 
   handleDeprecations() {
-    registerDeprecationHandler((message, options, next) => {
+    Debug.registerDeprecationHandler((message, options, next) => {
       if (!this.adapter) {
         next(message, options);
         return;
@@ -253,7 +253,7 @@ export default class extends DebugPort {
         }
         if (!this._warned) {
           this.adapter.warn(
-            'Deprecations were detected, see the Ember Inspector deprecations tab for more details.'
+            'Deprecations were detected, see the Ember Inspector deprecations tab for more details.',
           );
           this._warned = true;
         }

package/ember_debug/entrypoints/basic-debug.js

@@ -0,0 +1,10 @@
+import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
+
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
+
+  const adapter = (await import('../adapters/basic')).default;
+  onEmberReady(startInspector(adapter));
+});

package/ember_debug/entrypoints/bookmarklet-debug.js

@@ -0,0 +1,10 @@
+import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
+
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
+
+  const adapter = (await import('../adapters/bookmarklet.js')).default;
+  onEmberReady(startInspector(adapter));
+});

package/ember_debug/entrypoints/chrome-debug.js

@@ -0,0 +1,10 @@
+import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
+
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
+
+  const adapter = (await import('../adapters/chrome.js')).default;
+  onEmberReady(startInspector(adapter));
+});

package/ember_debug/entrypoints/firefox-debug.js

@@ -0,0 +1,10 @@
+import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
+
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
+
+  const adapter = (await import('../adapters/firefox.js')).default;
+  onEmberReady(startInspector(adapter));
+});

package/ember_debug/entrypoints/websocket-debug.js

@@ -0,0 +1,10 @@
+import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
+
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
+
+  const adapter = (await import('../adapters/websocket.js')).default;
+  onEmberReady(startInspector(adapter));
+});