fix: pr edits

2020-05-18 19:50:45 +02:00
parent 860bf51728
commit 7dd484d4df
7 changed files with 7 additions and 138 deletions
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// eslint-disable-next-line
-const createProxyMiddleware = require('http-proxy-middleware');
-
-// FIXME: somehow get it from within the plugin itself?
-const circleCIProxySettings = {
-  '/circleci/api': {
-    target: 'https://circleci.com/api/v1.1',
-    changeOrigin: true,
-    logLevel: 'debug',
-    pathRewrite: {
-      '^/circleci/api/': '/',
-    },
-  },
-};
-
-module.exports = (/** @type {import('express').Application} */ app) =>
-  Object.entries(circleCIProxySettings).forEach(([url, settings]) =>
-    app.use(url, createProxyMiddleware(settings)),
-  );
@@ -83,6 +83,7 @@
    "@types/diff": "^4.0.2",
    "@types/fs-extra": "^8.1.0",
    "@types/html-webpack-plugin": "^3.2.2",
+    "@types/http-proxy": "^1.17.4",
    "@types/inquirer": "^6.5.0",
    "@types/mini-css-extract-plugin": "^0.9.1",
    "@types/node": "^13.7.2",
@@ -14,19 +14,13 @@
 * limitations under the License.
 */

-import fs from 'fs-extra';
 import { Command } from 'commander';
 import { serveBundle } from '../../lib/bundler';
-import { paths } from '../../lib/paths';

 export default async (cmd: Command) => {
-  const pkgPath = paths.resolveTarget('package.json');
-  const pkg = await fs.readJson(pkgPath);
-
  const waitForExit = await serveBundle({
    entry: 'src/index',
    checksEnabled: cmd.check,
-    proxy: pkg.proxy,
  });

  await waitForExit();
@@ -14,19 +14,13 @@
 * limitations under the License.
 */

-import fs from 'fs-extra';
-import { serveBundle } from '../../lib/bundler';
 import { Command } from 'commander';
-import { paths } from '../../lib/paths';
+import { serveBundle } from '../../lib/bundler';

 export default async (cmd: Command) => {
-  const pkgPath = paths.resolveTarget('package.json');
-  const pkg = await fs.readJson(pkgPath);
-
  const waitForExit = await serveBundle({
    entry: 'dev/index',
    checksEnabled: cmd.check,
-    proxy: pkg.proxy,
  });

  await waitForExit();
@@ -15,7 +15,6 @@
 */

 import { BundlingPathsOptions } from './paths';
-import { ProxyConfigMap } from 'webpack-dev-server';

 export type BundlingOptions = {
  checksEnabled: boolean;
@@ -24,7 +23,6 @@ export type BundlingOptions = {

 export type ServeOptions = BundlingPathsOptions & {
  checksEnabled: boolean;
-  proxy?: ProxyConfigMap;
 };

 export type BuildOptions = BundlingPathsOptions & {
@@ -33,7 +33,6 @@
    "@material-ui/lab": "4.0.0-alpha.45",
    "@types/react-lazylog": "^4.5.0",
    "circleci-api": "^4.0.0",
-    "fast-deep-equal": "^3.1.1",
    "moment": "^2.25.3",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
@@ -870,7 +870,7 @@
    core-js-pure "^3.0.0"
    regenerator-runtime "^0.13.4"

-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
  version "7.9.6"
  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
@@ -3554,21 +3554,6 @@
    dom-accessibility-api "^0.4.2"
    pretty-format "^25.1.0"

-"@testing-library/jest-dom@^4.2.4":
-  version "4.2.4"
-  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz#00dfa0cbdd837d9a3c2a7f3f0a248ea6e7b89742"
-  integrity sha512-j31Bn0rQo12fhCWOUWy9fl7wtqkp7In/YP2p5ZFyRuiiB9Qs3g+hS4gAmDWONbAHcRmVooNJ5eOHQDCOmUFXHg==
-  dependencies:
-    "@babel/runtime" "^7.5.1"
-    chalk "^2.4.1"
-    css "^2.2.3"
-    css.escape "^1.5.1"
-    jest-diff "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    lodash "^4.17.11"
-    pretty-format "^24.0.0"
-    redent "^3.0.0"
-
 "@testing-library/jest-dom@^5.7.0":
  version "5.7.0"
  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.7.0.tgz#b2e2acb4c088a293d52ba2cd1674b526282a2f87"
@@ -3598,11 +3583,6 @@
  resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-10.3.1.tgz#8ed6fbfa40fbb866fa4666c9a62d7f7ff151f93b"
  integrity sha512-HozvWlr/xHmkoJrrDdZBbUOXAC/STAeXGyNU+g5KgEwWBpLJi1RPCHJKbTjwz8hp2jDFsk/jjfD0530eZjcFEg==

-"@testing-library/user-event@^7.1.2":
-  version "7.2.1"
-  resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-7.2.1.tgz#2ad4e844175a3738cb9e7064be5ea070b8863a1c"
-  integrity sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA==
-
 "@theme-ui/color-modes@^0.3.1":
  version "0.3.1"
  resolved "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.3.1.tgz#8c2b18fb170e6c998287b7381240a8b9cca8b0d1"
@@ -3997,13 +3977,6 @@
    jest-diff "^25.2.1"
    pretty-format "^25.2.1"

-"@types/jest@^24.0.0":
-  version "24.9.1"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
-  integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
-  dependencies:
-    jest-diff "^24.3.0"
-
 "@types/jquery@*", "@types/jquery@^3.3.34":
  version "3.3.38"
  resolved "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.38.tgz#6385f1e1b30bd2bff55ae8ee75ea42a999cc3608"
@@ -4018,11 +3991,6 @@
  dependencies:
    "@types/sizzle" "*"

-"@types/js-cookie@2.2.5":
-  version "2.2.5"
-  resolved "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.5.tgz#38dfaacae8623b37cc0b0d27398e574e3fc28b1e"
-  integrity sha512-cpmwBRcHJmmZx0OGU7aPVwGWGbs4iKwVYchk9iuMtxNCA2zorwdaTz4GkLgs2WGxiRZRFKnV1k6tRUHX7tBMxg==
-
 "@types/js-cookie@2.2.6":
  version "2.2.6"
  resolved "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
@@ -4373,13 +4341,6 @@
  dependencies:
    pretty-format "^25.1.0"

-"@types/testing-library__jest-dom@5.0.2":
-  version "5.0.2"
-  resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.0.2.tgz#89b782e0f187fe1e80d6375133da74182ba02065"
-  integrity sha512-dZP+/WHndgCSmdaImITy0KhjGAa9c0hlGGkzefbtrPFpnGEPZECDA0zyvfSp8RKhHECJJSKHFExjOwzo0rHyIA==
-  dependencies:
-    "@types/jest" "*"
-
 "@types/testing-library__jest-dom@^5.0.2":
  version "5.7.0"
  resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.7.0.tgz#078790bf4dc89152a74428591a228ec5f9433251"
@@ -7448,7 +7409,7 @@ css.escape@^1.5.1:
  resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
  integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=

-css@^2.2.3, css@^2.2.4:
+css@^2.2.4:
  version "2.2.4"
  resolved "https://registry.npmjs.org/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
@@ -8024,11 +7985,6 @@ diagnostics@^1.1.1:
    enabled "1.0.x"
    kuler "1.0.x"

-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-
 diff-sequences@^25.2.6:
  version "25.2.6"
  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
@@ -11970,16 +11926,6 @@ jest-css-modules@^2.1.0:
  dependencies:
    identity-obj-proxy "3.0.0"

-jest-diff@^24.0.0, jest-diff@^24.3.0, jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
 jest-diff@^25.1.0, jest-diff@^25.2.1:
  version "25.5.0"
  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
@@ -12122,16 +12068,6 @@ jest-leak-detector@^25.1.0:
    jest-get-type "^25.1.0"
    pretty-format "^25.1.0"

-jest-matcher-utils@^24.0.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
 jest-matcher-utils@^25.1.0:
  version "25.1.0"
  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220"
@@ -16130,7 +16066,7 @@ pretty-error@^2.0.2, pretty-error@^2.1.1:
    renderkid "^2.0.1"
    utila "~0.4"

-pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0:
+pretty-format@^24.3.0, pretty-format@^24.9.0:
  version "24.9.0"
  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -16625,7 +16561,7 @@ react-docgen@^5.0.0:
    node-dir "^0.1.10"
    strip-indent "^3.0.0"

-react-dom@16.13.1, react-dom@^16.12.0, react-dom@^16.13.1, react-dom@^16.8.3:
+react-dom@^16.12.0, react-dom@^16.13.1, react-dom@^16.8.3:
  version "16.13.1"
  resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
@@ -16897,25 +16833,6 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0:
    loose-envify "^1.4.0"
    prop-types "^15.6.2"

-react-use@^13.0.0:
-  version "13.27.1"
-  resolved "https://registry.npmjs.org/react-use/-/react-use-13.27.1.tgz#e2ae2b708dafc7893c4772628801589aab9de370"
-  integrity sha512-bAwdqDMXs5lovEanXnL1izledfrPEUUv1afoTVB59eUiYcDyKul+M/dT/2WcgHjoY/R6QlrTcZoW4R7ifwvBfw==
-  dependencies:
-    "@types/js-cookie" "2.2.5"
-    "@xobotyi/scrollbar-width" "1.9.5"
-    copy-to-clipboard "^3.2.0"
-    fast-deep-equal "^3.1.1"
-    fast-shallow-equal "^1.0.0"
-    js-cookie "^2.2.1"
-    nano-css "^5.2.1"
-    resize-observer-polyfill "^1.5.1"
-    screenfull "^5.0.0"
-    set-harmonic-interval "^1.0.1"
-    throttle-debounce "^2.1.0"
-    ts-easing "^0.2.0"
-    tslib "^1.10.0"
-
 react-use@^14.2.0:
  version "14.2.0"
  resolved "https://registry.npmjs.org/react-use/-/react-use-14.2.0.tgz#abac033fae5e358599b7e38084ff11b02e5d4868"
@@ -16947,7 +16864,7 @@ react-virtualized@^9.21.0:
    prop-types "^15.6.0"
    react-lifecycles-compat "^3.0.4"

-react@16.13.1, react@^16.0.0, react@^16.12.0, react@^16.13.1, react@^16.8.3:
+react@^16.0.0, react@^16.12.0, react@^16.13.1, react@^16.8.3:
  version "16.13.1"
  resolved "https://registry.npmjs.org/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==