Upgrade Launchpad (firefox-devtools#4332)

khal0988 · Oct 13, 2017 · 096cfcd · 096cfcd
1 parent 8e633b8
commit 096cfcd
Show file tree

Hide file tree

Showing 4 changed files with 262 additions and 97 deletions.
diff --git a/bin/dev-server.js b/bin/dev-server.js
@@ -5,6 +5,7 @@ const toolbox = require("devtools-launchpad/index");
 const feature = require("devtools-config");
 const getConfig = require("./getConfig");
 const express = require("express");
+const serve = require("express-static");
 
 const envConfig = getConfig();
 feature.setConfig(envConfig);
@@ -14,6 +15,7 @@ let webpackConfig = require("../webpack.config");
 let { app } = toolbox.startDevServer(envConfig, webpackConfig, __dirname);
 
 app.use("/integration/examples", express.static("src/test/mochitest/examples"));
+app.use("/images", serve(path.join(__dirname, "../assets/images")));
 
 console.log("View debugger examples here:");
 console.log("https://github.com/devtools-html/debugger-examples");
diff --git a/package.json b/package.json
@@ -18,40 +18,31 @@
     "start": "node bin/dev-server",
     "start-app": "TARGET=application node bin/dev-server",
     "flow": "flow",
-    "eslint-check":
-      "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
+    "eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
     "prettier": "node bin/prettier.js",
     "license-check": "devtools-license-check",
     "links": "ls -l node_modules/ | grep ^l || echo 'no linked packages'",
     "lint": "run-p lint-css lint-js lint-md",
     "lint-css": "stylelint \"src/components/**/*.css\"",
     "lint-js": "eslint *.js \"src/**/*.js\" --fix",
-    "lint-md":
-      "remark -u devtools-linters/markdown/preset -qf *.md src configs docs",
+    "lint-md": "remark -u devtools-linters/markdown/preset -qf *.md src configs docs",
     "lint-fix": "yarn lint-js -- --fix",
-    "mochi":
-      "mochii --mc ./firefox --default-test-path devtools/client/debugger/new",
+    "mochi": "mochii --mc ./firefox --default-test-path devtools/client/debugger/new",
     "mochid": "yarn mochi -- --jsdebugger --",
     "mochir": "yarn mochi -- --repeat 10 --",
     "mochih": "yarn mochi -- --setenv MOZ_HEADLESS=1 --",
     "test": "jest",
     "test:watch": "jest --watch",
     "test-coverage": "yarn test -- --coverage",
     "test-all": "yarn test; yarn lint; yarn flow",
-    "firefox":
-      "start-firefox --start --location https://devtools-html.github.io/debugger-examples/",
-    "chrome":
-      "start-chrome --location https://devtools-html.github.io/debugger-examples/",
+    "firefox": "start-firefox --start --location https://devtools-html.github.io/debugger-examples/",
+    "chrome": "start-chrome --location https://devtools-html.github.io/debugger-examples/",
     "copy-assets": "node bin/copy-assets --symlink",
     "copy-assets-watch": "node bin/copy-assets --watch --symlink",
-    "build-docs":
-      "documentation build --format html --sort-order alpha --shallow  --document-exported --output docs/reference/ src/types.js src/utils/ src/reducers/ src/actions/ src/test/mochitest/head.js",
-    "flow-coverage":
-      "flow-coverage-report --threshold 50 -i 'src/actions/*.js' -i 'src/reducers/*.js' -i 'src/utils/*.js' -i 'src/components/*.js' -i 'src/components/**/*.js' -t html -t text",
-    "flow-utils":
-      "flow-coverage-report -i 'src/utils/*.js' -i 'src/utils/**/*.js' -t text",
-    "flow-redux":
-      "flow-coverage-report  -i 'src/reducers/*.js' -i 'src/actions/*.js'  -t text",
+    "build-docs": "documentation build --format html --sort-order alpha --shallow  --document-exported --output docs/reference/ src/types.js src/utils/ src/reducers/ src/actions/ src/test/mochitest/head.js",
+    "flow-coverage": "flow-coverage-report --threshold 50 -i 'src/actions/*.js' -i 'src/reducers/*.js' -i 'src/utils/*.js' -i 'src/components/*.js' -i 'src/components/**/*.js' -t html -t text",
+    "flow-utils": "flow-coverage-report -i 'src/utils/*.js' -i 'src/utils/**/*.js' -t text",
+    "flow-redux": "flow-coverage-report  -i 'src/reducers/*.js' -i 'src/actions/*.js'  -t text",
     "flow-react": "flow-coverage-report -i 'src/components/**/*.js' -t text",
     "storybook": "start-storybook -p 6006",
     "snapshot": "NODE_ENV='development' build-storybook && percy-storybook",
@@ -70,13 +61,13 @@
     "babylon": "^6.18.0",
     "codemirror": "^5.28.0",
     "devtools-components": "^0.0.2",
-    "devtools-launchpad": "^0.0.100",
+    "devtools-launchpad": "0.0.102",
     "devtools-linters": "^0.0.3",
     "devtools-map-bindings": "^0.2.0",
     "devtools-reps": "^0.12.3",
     "devtools-source-editor": "0.0.6",
-    "devtools-source-map": "^0.14.2",
-    "devtools-splitter": "^0.0.3",
+    "devtools-source-map": "^0.14.3",
+    "devtools-splitter": "^0.0.4",
     "devtools-utils": "^0.0.9",
     "fuzzaldrin-plus": "^0.4.1",
     "immutable": "^3.7.6",
@@ -97,9 +88,18 @@
     "svg-inline-react": "^1.0.2",
     "wasmparser": "^0.4.10"
   },
-  "files": ["src", "assets"],
+  "files": [
+    "src",
+    "assets"
+  ],
   "greenkeeper": {
-    "ignore": ["react", "react-dom", "react-redux", "redux", "codemirror"]
+    "ignore": [
+      "react",
+      "react-dom",
+      "react-redux",
+      "redux",
+      "codemirror"
+    ]
   },
   "main": "src/main.js",
   "author": "Jason Laster <[email protected]>",
@@ -111,7 +111,7 @@
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-preset-react": "^6.24.1",
     "chalk": "^2.1.0",
-    "devtools-license-check": "^0.5.0",
+    "devtools-license-check": "^0.5.1",
     "documentation": "^5.2.1",
     "enzyme": "^2.9.1",
     "eslint": "^4.2.0",
@@ -159,19 +159,47 @@
     "workerjs": "github:jasonLaster/workerjs"
   },
   "lint-staged": {
-    "*.js": ["prettier", "git add"],
-    "src/*.js": ["prettier", "git add"],
-    "src/*/*.js": ["prettier", "git add"],
-    "src/*/!(mochitest)**/*.js": ["prettier", "git add"],
-    "src/*/!(mochitest)*/**/*.js": ["prettier", "git add"]
+    "*.js": [
+      "prettier",
+      "git add"
+    ],
+    "src/*.js": [
+      "prettier",
+      "git add"
+    ],
+    "src/*/*.js": [
+      "prettier",
+      "git add"
+    ],
+    "src/*/!(mochitest)**/*.js": [
+      "prettier",
+      "git add"
+    ],
+    "src/*/!(mochitest)*/**/*.js": [
+      "prettier",
+      "git add"
+    ]
   },
   "jest": {
     "rootDir": "src",
-    "testMatch": ["**/tests/**/*.js"],
-    "testPathIgnorePatterns": ["/node_modules/", "/helpers/", "/fixtures/"],
-    "transformIgnorePatterns": ["node_modules/(?!devtools-)"],
-    "setupFiles": ["<rootDir>/test/tests-setup.js", "jest-localstorage-mock"],
-    "snapshotSerializers": ["jest-serializer-babel-ast"],
+    "testMatch": [
+      "**/tests/**/*.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/helpers/",
+      "/fixtures/"
+    ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!devtools-)"
+    ],
+    "setupFiles": [
+      "<rootDir>/test/tests-setup.js",
+      "jest-localstorage-mock"
+    ],
+    "snapshotSerializers": [
+      "jest-serializer-babel-ast"
+    ],
     "setupTestFrameworkScriptFile": "<rootDir>/test/tests-framework.js",
     "moduleNameMapper": {
       "\\.css$": "<rootDir>/test/__mocks__/styleMock.js",

diff --git a/webpack.config.js b/webpack.config.js
@@ -35,6 +35,9 @@ function buildConfig(envConfig) {
   const extra = {};
   if (isDevelopment()) {
     webpackConfig.plugins = [];
+
+    webpackConfig.module = webpackConfig.module || {};
+    webpackConfig.module.rules = webpackConfig.module.rules || [];
   } else {
     webpackConfig.plugins = [];
     webpackConfig.output.libraryTarget = "umd";