Merge pull request #6 from patternfly/remove-popper

reduce bundle size
patternfly · Jun 23, 2021 · 0d43874 · 0d43874
2 parents f9bb11e + 274c775
commit 0d43874
Show file tree

Hide file tree

Showing 43 changed files with 229 additions and 410 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -34,7 +34,8 @@
   "plugins": [
     "@typescript-eslint",
     "react-hooks",
-    "eslint-plugin-react-hooks"
+    "eslint-plugin-react-hooks",
+    "sort-imports-es6-autofix"
   ],
   "rules": {
     "@typescript-eslint/explicit-function-return-type": "off",
@@ -46,7 +47,11 @@
     "import/extensions": "off",
     "react/prop-types": "off",
     "@typescript-eslint/no-empty-function": "off",
-    "sort-imports": "warn"
+    "sort-imports-es6-autofix/sort-imports-es6": [2, {
+      "ignoreCase": false,
+      "ignoreMemberSort": false,
+      "memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
+    }]
   },
   "env": {
     "browser": true,

diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "@types/jest": "^26.0.14",
     "concurrently": "^5.3.0",
     "enzyme-adapter-react-16": "^1.15.6",
+    "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
     "jest": "21.x",
     "jest-resolve": "^26.4.0",
     "jsdom": "^16.6.0",

diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -9,7 +9,7 @@
     "serve": "serve public"
   },
   "dependencies": {
-    "@patternfly/quickstarts": "1.0.0-rc.18",
+    "@patternfly/quickstarts": "1.0.0-rc.19",
     "@patternfly/react-core": "^4.101.3",
     "asciidoctor": "^2.2.1",
     "react": "^16.14.0",

diff --git a/packages/dev/src/App.tsx b/packages/dev/src/App.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import "./App.css";
 import {
   Avatar,
   Brand,
@@ -10,22 +10,22 @@ import {
   PageHeaderTools,
   PageSidebar,
 } from "@patternfly/react-core";
-import imgBrand from "./assets/images/imgBrand.svg";
-import imgAvatar from "./assets/images/imgAvatar.svg";
 import { Link, useHistory } from "react-router-dom";
-import Demos from "./Demos";
-import "./App.css";
 import {
   LoadingBox,
+  QuickStart,
   QuickStartContextProvider,
   QuickStartContextValues,
   QuickStartDrawer,
-  useLocalStorage,
-  QuickStart
+  useLocalStorage
 } from "@patternfly/quickstarts";
-import { allQuickStarts as yamlQuickStarts } from "./quickstarts-data/quick-start-test-data";
 import { loadJSONQuickStarts } from "./quickstarts-data/mas-guides/quickstartLoader";
+import { allQuickStarts as yamlQuickStarts } from "./quickstarts-data/quick-start-test-data";
+import Demos from "./Demos";
+import React from "react";
 import i18n from './i18n/i18n';
+import imgAvatar from "./assets/images/imgAvatar.svg";
+import imgBrand from "./assets/images/imgBrand.svg";
 
 type AppProps = {
   children?: React.ReactNode;
@@ -102,7 +102,8 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
   const { pathname: currentPath } = window.location;
   const quickStartPath = "/quickstarts";
 
-  const resourceBundle = i18n.getResourceBundle(localStorage.getItem('bridge/language') || 'en', 'quickstart');
+  const language = localStorage.getItem('bridge/language') || 'en';
+  const resourceBundle = i18n.getResourceBundle(language, 'quickstart');
 
   const valuesForQuickstartContext: QuickStartContextValues = {
     allQuickStarts,
@@ -115,7 +116,7 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
       showAllLink: currentPath !== quickStartPath,
       onShowAllLinkClick: () => history.push(quickStartPath),
     },
-    lng: localStorage.getItem('bridge/language'),
+    language,
     resourceBundle: {
       ...resourceBundle,
       "Start": "Let's go!",

diff --git a/packages/dev/src/Home.tsx b/packages/dev/src/Home.tsx
@@ -7,7 +7,7 @@ import i18n from './i18n/i18n';
 
 export const Home: React.FunctionComponent = () => {
   // const [inputValue, setInputValue] = React.useState("");
-  const { setLng, setResourceBundle } = React.useContext(QuickStartContext);
+  const { setResourceBundle } = React.useContext(QuickStartContext);
 
   // console.log(getQuickStartStatus(qsContext.allQuickStartStates, 'managing-business-central-data-sources-proc'));
   // console.log(getQuickStartStatusCount(qsContext.allQuickStartStates, qsContext.allQuickStarts));
@@ -43,8 +43,7 @@ export const Home: React.FunctionComponent = () => {
     i18n.changeLanguage(lng);
     localStorage.setItem('bridge/language', lng);
     const resourceBundle = i18n.getResourceBundle(lng, 'quickstart');
-    setLng(lng);
-    setResourceBundle(resourceBundle);
+    setResourceBundle(resourceBundle, lng);
   }
 
   return (

diff --git a/packages/module/package.json b/packages/module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/quickstarts",
-  "version": "1.0.0-rc.18",
+  "version": "1.0.0-rc.19",
   "description": "PatternFly quick starts",
   "files": [
     "dist"
@@ -42,7 +42,6 @@
     "showdown": ">=1.8.6"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.9.0",
     "@patternfly/patternfly": "^4.90.5",
     "@patternfly/react-catalog-view-extension": "^4.10.13",
     "@patternfly/react-core": "^4.101.3",
@@ -51,7 +50,6 @@
     "dompurify": "^2.2.6",
     "history": "^5.0.0",
     "lodash-es": "^4.17.20",
-    "sass": "^1.30.0",
     "showdown": "1.8.6"
   },
   "devDependencies": {
@@ -66,7 +64,6 @@
     "@types/node": "^14.14.35",
     "@types/react": "^16.8.0",
     "@types/react-dom": "^16.8.0",
-    "@types/victory": "^33.1.4",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
     "clean-css-cli": "^4.3.0",
@@ -76,11 +73,9 @@
     "eslint": "^7.11.0",
     "eslint-plugin-react": "^7.21.4",
     "eslint-plugin-react-hooks": "^4.1.2",
-    "express": "^4.17.1",
-    "imagemin": "^7.0.0",
+    "sass": "^1.30.0",
     "node-sass": "^5.0.0",
     "prettier": "^2.1.2",
-    "prop-types": "^15.6.1",
     "purgecss": "^4.0.0",
     "react": "^16.8.0",
     "react-axe": "^3.5.4",

diff --git a/packages/module/src/ConsoleInternal/components/markdown-view.tsx b/packages/module/src/ConsoleInternal/components/markdown-view.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
-import cx from 'classnames';
-import _truncate from 'lodash-es/truncate.js';
-import _uniqueId from 'lodash-es/uniqueId.js';
 import { Converter } from 'showdown';
 import { QuickStartContext, QuickStartContextValues } from '../../utils/quick-start-context';
+import _truncate from 'lodash-es/truncate.js';
+import _uniqueId from 'lodash-es/uniqueId.js';
+import cx from 'classnames';
 
 import './_markdown-view.scss';
 

diff --git a/packages/module/src/ConsoleInternal/components/utils/status-box.tsx b/packages/module/src/ConsoleInternal/components/utils/status-box.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import classNames from 'classnames';
 import { QuickStartContext, QuickStartContextValues } from '../../../utils/quick-start-context';
+import classNames from 'classnames';
 
 // import * as restrictedSignImg from '../../imgs/restricted-sign.svg';
 // import { TimeoutError } from '../../co-fetch';

diff --git a/packages/module/src/ConsoleInternal/vendor.scss b/packages/module/src/ConsoleInternal/vendor.scss
@@ -8,6 +8,12 @@
 
 @import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize";
 @import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
-
 @import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
 @import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
+
+// .co-quick-start-panel-content,
+// .ocs-page-layout__content {
+//     @import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
+//     @import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
+//     @import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
+// }
diff --git a/packages/module/src/ConsoleShared/src/components/modal/Modal.tsx b/packages/module/src/ConsoleShared/src/components/modal/Modal.tsx
@@ -1,7 +1,7 @@
+import './Modal.scss';
 import * as React from 'react';
-import cx from 'classnames';
 import { Modal as PfModal, ModalProps as PfModalProps } from '@patternfly/react-core';
-import './Modal.scss';
+import cx from 'classnames';
 
 type ModalProps = {
   isFullScreen?: boolean;