Create devtools-environment (#1063)

jasonLaster · web-flow · commit 6f77738ce0d6 · 2018-05-18T08:29:05.000-04:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 |:----:|:---:|
 | [![devtools-launchpad-version]][devtools-launchpad-pkg] | [devtools-launchpad] |
 | [![devtools-config-version]][devtools-config-pkg] | [devtools-config] |
+| [![devtools-environment-version]][devtools-environment-pkg] | [devtools-environment] |
 | [![devtools-connection-version]][devtools-connection-pkg] | [devtools-connection] |
 | [![devtools-contextmenu-version]][devtools-contextmenu-pkg] | [devtools-contextmenu] |
 | [![devtools-modules-version]][devtools-modules-pkg] | [devtools-modules] |
@@ -41,6 +42,10 @@ the dependency in the launchpad.
 [devtools-config-pkg]:https://npmjs.org/package/devtools-config
 [devtools-config]:./packages/devtools-config/#readme
 
+[devtools-environment-version]:https://img.shields.io/npm/v/devtools-environment.svg
+[devtools-environment-pkg]:https://npmjs.org/package/devtools-environment
+[devtools-environment]:./packages/devtools-environment/#readme
+
 [devtools-modules-version]:https://img.shields.io/npm/v/devtools-modules.svg
 [devtools-modules-pkg]:https://npmjs.org/package/devtools-modules
 [devtools-modules]:./packages/devtools-modules/#readme
diff --git a/packages/devtools-config/README.md b/packages/devtools-config/README.md
@@ -5,13 +5,7 @@
 All default config values are in [`config/development.json`](./development.json), to override these values you need to [create a local config file](#create-a-local-config-file).
 
 * *logging*
-  * `client` Enables logging the Firefox protocol in the devtools console of the debugger
   * `firefoxProxy` Enables logging the Firefox protocol in the terminal running `npm start`
-  * `actions` Enables logging the redux actions
-* *features* debugger related features
-  * `tabs` Enables source view tabs in the editor (CodeMirror)
-  * `sourceMaps` Enables source map loading when available
-  * `watchExpressions` Enables accordion component for working with watch expressions
 * *chrome* Chrome browser related flags
   * `debug` Enables listening for remotely debuggable Chrome browsers
   * `port` web socket port specified when launching Chrome from the command line
diff --git a/packages/devtools-config/package.json b/packages/devtools-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "devtools-config",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Devtools Local Configuration System",
   "main": "index.js",
   "directories": {
diff --git a/packages/devtools-config/src/feature.js b/packages/devtools-config/src/feature.js
@@ -7,13 +7,6 @@ const fs = require("fs");
 const path = require("path");
 
 let config;
-
-const flag = require("./test-flag");
-
-function isBrowser() {
-  return typeof window == "object" && typeof module == "undefined";
-}
-
 /**
  * Gets a config value for a given key
  * e.g "chrome.webSocketPort"
@@ -26,44 +19,6 @@ function setValue(key, value) {
   return put(config, key, value);
 }
 
-function isEnabled(key) {
-  return config.features && typeof config.features[key] == "object"
-    ? config.features[key].enabled
-    : config.features[key];
-}
-
-function isDevelopment() {
-  if (isBrowser()) {
-    if (process.env.NODE_ENV === "production") {
-      return false;
-    }
-    const href = window.location ? window.location.href : "";
-    return href.match(/^file:/) || href.match(/localhost:/);
-  }
-
-  if (isFirefoxPanel()) {
-    // Default to production if compiling for the Firefox panel
-    return process.env.NODE_ENV === "development";
-  }
-  return process.env.NODE_ENV !== "production";
-}
-
-function isTesting() {
-  return flag.testing;
-}
-
-function isFirefoxPanel() {
-  return process.env.TARGET == "firefox-panel";
-}
-
-function isApplication() {
-  return process.env.TARGET == "application";
-}
-
-function isFirefox() {
-  return /firefox/i.test(navigator.userAgent);
-}
-
 function setConfig(value) {
   config = value;
 }
@@ -80,14 +35,8 @@ function updateLocalConfig(relativePath) {
 }
 
 module.exports = {
-  isEnabled,
   getValue,
   setValue,
-  isDevelopment,
-  isTesting,
-  isFirefoxPanel,
-  isApplication,
-  isFirefox,
   getConfig,
   setConfig,
   updateLocalConfig,
diff --git a/packages/devtools-environment/README.md b/packages/devtools-environment/README.md
@@ -0,0 +1,8 @@
+## Environment
+
+[![Npm version](https://img.shields.io/npm/v/devtools-environment.svg)](https://npmjs.org/package/devtools-environment)
+
+* `isFirefox` is the tool is running in firefox
+* `isFirefoxPanel` - is the tool running in the firefox panel (toolbox)
+* `isDevelopment` - is the tool running in the launchpad
+* `isTesting` - is the tool running in a mochitest environment
diff --git a/packages/devtools-environment/index.js b/packages/devtools-environment/index.js
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 flag = require("./test-flag");
+
+function isBrowser() {
+  return typeof window == "object";
+}
+
+function isNode() {
+  return process && process.release && process.release.name == 'node'
+}
+
+export function isDevelopment() {
+  if (!isNode() && isBrowser()) {
+    const href = window.location ? window.location.href : "";
+    return href.match(/^file:/) || href.match(/localhost:/);
+  }
+
+  return process.env.NODE_ENV != "production";
+}
+
+export function isTesting() {
+  return flag.testing;
+}
+
+export function isFirefoxPanel() {
+  return !isDevelopment();
+}
+
+export function isFirefox() {
+  return /firefox/i.test(navigator.userAgent);
+}
diff --git a/packages/devtools-environment/package.json b/packages/devtools-environment/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "devtools-environment",
+  "version": "0.0.4",
+  "description": "Devtools Environment Check",
+  "main": "index.js",
+  "scripts": {},
+  "author": "",
+  "license": "MPL-2.0"
+}
diff --git a/packages/devtools-environment/test-flag.js b/packages/devtools-environment/test-flag.js
diff --git a/packages/devtools-launchpad/configs/development.json b/packages/devtools-launchpad/configs/development.json
@@ -7,9 +7,7 @@
   "dir": "ltr",
   "defaultURL": "https://devtools-html.github.io/debugger-examples/",
   "logging": {
-    "client": false,
-    "firefoxProxy": false,
-    "actions": false
+    "firefoxProxy": false
   },
   "development": {
     "serverPort": 8000,
diff --git a/packages/devtools-launchpad/package.json b/packages/devtools-launchpad/package.json
@@ -2,17 +2,15 @@
   "name": "devtools-launchpad",
   "version": "0.0.123",
   "license": "MPL-2.0",
-  "description":
-    "The Launchpad makes it easy to build a developer tool for Firefox, Chrome, and Node.",
+  "description": "The Launchpad makes it easy to build a developer tool for Firefox, Chrome, and Node.",
   "repository": {
     "url": "git://github.com/devtools-html/devtools-core.git",
     "type": "git"
   },
   "bugs": {
     "url": "https://github.com/devtools-html/devtools-core/issues"
   },
-  "homepage":
-    "https://github.com/devtools-html/devtools-core/tree/master/packages/devtools-launchpad#readme",
+  "homepage": "https://github.com/devtools-html/devtools-core/tree/master/packages/devtools-launchpad#readme",
   "scripts": {
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
@@ -52,9 +50,10 @@
     "co": "=4.6.0",
     "css-loader": "^0.26.1",
     "debug": "^3.1.0",
-    "devtools-config": "^0.0.15",
+    "devtools-config": "^0.0.16",
     "devtools-connection": "^0.0.9",
     "devtools-contextmenu": "^0.0.8",
+    "devtools-environment": "^0.0.4",
     "devtools-mc-assets": "^0.0.5",
     "devtools-modules": "^0.0.37",
     "devtools-sprintf-js": "^1.0.3",
@@ -80,7 +79,7 @@
     "ps-node": "^0.1.4",
     "raw-loader": "^0.5.1",
     "react": "^16.2.0",
-    "react-dom":"^16.2.0",
+    "react-dom": "^16.2.0",
     "react-dom-factories": "^1.0.2",
     "react-immutable-proptypes": "^2.1.0",
     "react-redux": "^5.0.6",
@@ -121,8 +120,14 @@
   ],
   "jest": {
     "rootDir": "src",
-    "testMatch": ["**/tests/**/*.js"],
-    "testPathIgnorePatterns": ["/node_modules/"],
-    "transformIgnorePatterns": ["node_modules/(?!devtools-)"]
+    "testMatch": [
+      "**/tests/**/*.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/"
+    ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!devtools-)"
+    ]
   }
 }
diff --git a/packages/devtools-launchpad/webpack.config.js b/packages/devtools-launchpad/webpack.config.js
@@ -7,14 +7,9 @@ require("babel-register");
 const path = require("path");
 
 const webpack = require("webpack");
-
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
-const {
-  isDevelopment,
-  isFirefoxPanel,
-  getValue,
-  setConfig
-} = require("devtools-config");
+const {isDevelopment, isFirefoxPanel} = require("devtools-environment")
+const { getValue, setConfig } = require("devtools-config");
 const NODE_ENV = process.env.NODE_ENV || "development";
 const TARGET = process.env.TARGET || "local";
 
diff --git a/packages/devtools-launchpad/yarn.lock b/packages/devtools-launchpad/yarn.lock
@@ -2523,10 +2523,35 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+devtools-config@^0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/devtools-config/-/devtools-config-0.0.16.tgz#e7251788422f42a16aa1372b6adbebfcb7a74994"
+
+devtools-connection@^0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/devtools-connection/-/devtools-connection-0.0.9.tgz#31121090c8594da7bcc5ee763a34002de932f317"
+
+devtools-contextmenu@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/devtools-contextmenu/-/devtools-contextmenu-0.0.8.tgz#13a211eca131ab573b0d320c65258ca3f6cfee27"
+  dependencies:
+    devtools-modules "^0.0.36"
+
+devtools-environment@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/devtools-environment/-/devtools-environment-0.0.4.tgz#d1c8f399cdaa89358bb0049c276d6e092c24d778"
+
 devtools-mc-assets@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/devtools-mc-assets/-/devtools-mc-assets-0.0.5.tgz#cfa501248c4e025c8cfb28ff0cabdea32f40eb8a"
 
+devtools-modules@^0.0.36:
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/devtools-modules/-/devtools-modules-0.0.36.tgz#ebc0f8dfbad80a2786154c99d49db83dc8e2eec0"
+  dependencies:
+    jest "^20.0.4"
+    punycode "^2.1.0"
+
 devtools-sprintf-js@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/devtools-sprintf-js/-/devtools-sprintf-js-1.0.3.tgz#c2aa3c39d4047525e60410325c86770620281b87"
@@ -5929,6 +5954,10 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "devtools-config",`
`3`		`- "version": "0.0.15",`
	`3`	`+ "version": "0.0.16",`
`4`	`4`	`"description": "Devtools Local Configuration System",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"directories": {`