fix(deps): make react packages not required (#16)

ClearC2 · Feb 12, 2020 · 17ceb69 · 17ceb69
1 parent 12c488d
commit 17ceb69
Show file tree

Hide file tree

Showing 11 changed files with 3,090 additions and 2,490 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:8.11
+      - image: circleci/node:10.16.0
     working_directory: ~/repo
     steps:
       - checkout
@@ -19,4 +19,4 @@ jobs:
       - run:
           command: yarn run semantic-release
           environment:
-            ASSETS: lib,api-explorer-dist
+            ASSETS: lib,api-explorer-dist
diff --git a/api-explorer-dist/1.5fa7fc7921140c03d4d2.css b/api-explorer-dist/1.5fa7fc7921140c03d4d2.css
diff --git a/api-explorer-dist/1.7c1a41530433198c5a0f.css b/api-explorer-dist/1.7c1a41530433198c5a0f.css
diff --git a/api-explorer-dist/index.html b/api-explorer-dist/index.html
@@ -5,7 +5,7 @@
     <title>Headlamp</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
-  <link href="/_docs/1.7c1a41530433198c5a0f.css" rel="stylesheet"><link href="/_docs/main.8d67c61bfa4e2256cb5d.css" rel="stylesheet"></head>
+  <link href="/_docs/1.5fa7fc7921140c03d4d2.css" rel="stylesheet"><link href="/_docs/main.8d67c61bfa4e2256cb5d.css" rel="stylesheet"></head>
   <body>
     <div id="app-root"></div>
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>

diff --git a/api-explorer-dist/main.js b/api-explorer-dist/main.js
diff --git a/api-explorer-dist/vendors~main.js b/api-explorer-dist/vendors~main.js
diff --git a/api-explorer/webpack/dev-server.development.js b/api-explorer/webpack/dev-server.development.js
@@ -0,0 +1,10 @@
+const {webpackUtils} = require('@clearc2/c2-react-config')
+
+module.exports = (env) => webpackUtils.extendPreset(env, 'dev-server.development',
+  {
+    devServer: {
+      port: 8082,
+      overlay: false
+    }
+  }
+)
diff --git a/babel.config.js b/babel.config.js
@@ -11,15 +11,15 @@ const presets = [
       useBuiltIns: 'entry'
     }
   ],
-  require.resolve('@babel/preset-react')
-]
+  BABEL_MODULES === 'cjs' ? null : require.resolve('@babel/preset-react')
+].filter(Boolean)
 
 const plugins = [
   require.resolve('@babel/plugin-proposal-class-properties'),
   require.resolve('@babel/plugin-proposal-object-rest-spread'),
   require.resolve('@babel/plugin-syntax-dynamic-import'),
-  require.resolve('react-hot-loader/babel')
-]
+  BABEL_MODULES === 'cjs' ? null : require.resolve('react-hot-loader/babel')
+].filter(Boolean)
 
 const ignore = []
 

diff --git a/lib/api-route-provider.js b/lib/api-route-provider.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports["default"] = _default;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -17,18 +17,17 @@ var _child_process = _interopRequireDefault(require("child_process"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-(function () {
-  var enterModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).enterModule;
-  enterModule && enterModule(module);
-})();
-
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
 
@@ -38,17 +37,11 @@ function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal["default"].signature : function (a) {
-  return a;
-};
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 var execSync = _child_process["default"].execSync;
 
-var _default = function _default(app) {
+function _default(app) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var responseStore = createActivationStore();
   var customResponseStore = createCustomResponseStore();
@@ -185,9 +178,9 @@ var _default = function _default(app) {
       searchResult.toString().split('\n').filter(function (l) {
         return !!l;
       }).forEach(function (result) {
-        var _parseFileAndLineNo3 = parseFileAndLineNo(result),
-            file = _parseFileAndLineNo3.file,
-            lineNo = _parseFileAndLineNo3.lineNo;
+        var _parseFileAndLineNo = parseFileAndLineNo(result),
+            file = _parseFileAndLineNo.file,
+            lineNo = _parseFileAndLineNo.lineNo;
 
         if (!files[file]) {
           files[file] = {
@@ -381,10 +374,7 @@ var _default = function _default(app) {
   app.use('/_docs', _express["default"]["static"](_path["default"].resolve(__dirname, '..', 'api-explorer-dist'))); // fallback to serve the api explorer so /_docs/request/* will work
 
   app.use('/_docs/*', _express["default"]["static"](_path["default"].resolve(__dirname, '..', 'api-explorer-dist')));
-};
-
-var _default2 = _default;
-exports["default"] = _default2;
+}
 
 function warnDuplicateRoutes(app) {
   var routes = getAPIRoutes(app);
@@ -604,9 +594,9 @@ function findPathInSrc(options, path) {
     searchResult.split('\n').filter(function (l) {
       return !!l;
     }).forEach(function (result) {
-      var _parseFileAndLineNo = parseFileAndLineNo(result),
-          file = _parseFileAndLineNo.file,
-          lineNo = _parseFileAndLineNo.lineNo;
+      var _parseFileAndLineNo2 = parseFileAndLineNo(result),
+          file = _parseFileAndLineNo2.file,
+          lineNo = _parseFileAndLineNo2.lineNo;
 
       files["".concat(file, ":").concat(lineNo)] = {
         file: file,
@@ -641,9 +631,9 @@ function findPathInServer(options, path) {
     searchResult.split('\n').filter(function (l) {
       return !!l;
     }).forEach(function (result) {
-      var _parseFileAndLineNo2 = parseFileAndLineNo(result),
-          file = _parseFileAndLineNo2.file,
-          lineNo = _parseFileAndLineNo2.lineNo;
+      var _parseFileAndLineNo3 = parseFileAndLineNo(result),
+          file = _parseFileAndLineNo3.file,
+          lineNo = _parseFileAndLineNo3.lineNo;
 
       if (!files[file]) {
         files[file] = {
@@ -688,39 +678,4 @@ function nthIndex(str, pat, n) {
   }
 
   return i;
-}
-
-;
-
-(function () {
-  var reactHotLoader = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).default;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(execSync, "execSync", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(warnDuplicateRoutes, "warnDuplicateRoutes", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(createActivationStore, "createActivationStore", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(createCustomResponseStore, "createCustomResponseStore", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(getRouteResponses, "getRouteResponses", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(getRouteHeaders, "getRouteHeaders", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(callIfFunc, "callIfFunc", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(getFileRoutes, "getFileRoutes", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(getRouteId, "getRouteId", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(getAPIRoutes, "getAPIRoutes", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(parseFileAndLineNo, "parseFileAndLineNo", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(dirsToArray, "dirsToArray", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(findPathInSrc, "findPathInSrc", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(findPathInServer, "findPathInServer", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(createSrcPathRegExp, "createSrcPathRegExp", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(nthIndex, "nthIndex", "/home/circleci/repo/src/api-route-provider.js");
-  reactHotLoader.register(_default, "default", "/home/circleci/repo/src/api-route-provider.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).leaveModule;
-  leaveModule && leaveModule(module);
-})();
+}
diff --git a/lib/index.js b/lib/index.js
@@ -9,33 +9,5 @@ var _apiRouteProvider = _interopRequireDefault(require("./api-route-provider"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-(function () {
-  var enterModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).enterModule;
-  enterModule && enterModule(module);
-})();
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal["default"].signature : function (a) {
-  return a;
-};
-
 var _default = _apiRouteProvider["default"];
-var _default2 = _default;
-exports["default"] = _default2;
-;
-
-(function () {
-  var reactHotLoader = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).default;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(_default, "default", "/home/circleci/repo/src/index.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).leaveModule;
-  leaveModule && leaveModule(module);
-})();
+exports["default"] = _default;