use devtools-services

Author: jasonLaster

packages/devtools-modules/index.js

@@ -5,7 +5,6 @@
 const Menu = require("./src/menu");
 const MenuItem = require("./src/menu/menu-item");
 const { PrefsHelper } = require("./src/prefs");
-const Services = require("./src/Services");
 const KeyShortcuts = require("./src/key-shortcuts");
 const { ZoomKeys } = require("./src/zoom-keys");
 const EventEmitter = require("./src/utils/event-emitter");
@@ -19,7 +18,6 @@ module.exports = {
   Menu,
   MenuItem,
   PrefsHelper,
-  Services,
   ZoomKeys,
   EventEmitter,
   SourceUtils,

packages/devtools-modules/package.json

@@ -11,7 +11,8 @@
   "license": "MPL-2.0",
   "dependencies": {
     "jest": "^20.0.4",
-    "punycode": "^2.1.0"
+    "punycode": "^2.1.0",
+    "devtools-services": "0.0.1"
   },
   "files": ["src"],
   "jest": {

packages/devtools-modules/src/key-shortcuts.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { appinfo } = require("./Services");
+const { appinfo } = require("devtools-services");
 const EventEmitter = require("./utils/event-emitter");
 const isOSX = appinfo.OS === "Darwin";
 

packages/devtools-modules/src/prefs.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const Services = require("./Services");
+const Services = require("devtools-services");
 const EventEmitter = require("./utils/event-emitter");
 
 /**

packages/devtools-modules/src/tests/prefs-helper.js

@@ -1,5 +1,5 @@
 const { PrefsHelper } = require("../prefs");
-const Services = require("../Services");
+const Services = require(".devtools-services");
 const pref = Services.pref;
 
 describe("prefs helper", () => {

packages/devtools-modules/src/tests/services-prefs.js

@@ -1,4 +1,4 @@
-const Services = require("../Services");
+const Services = require(".devtools-services");
 const pref = Services.pref;
 
 describe("services prefs shim", () => {

packages/devtools-modules/src/tests/services-telemetry.js

@@ -1,4 +1,4 @@
-const Services = require("../Services");
+const Services = require(".devtools-services");
 
 // const pref = Services;