Skip to content

Commit 0d43874

Browse files
jschulerjschuler
authored
Merge pull request #6 from patternfly/remove-popper
reduce bundle size
2 parents f9bb11e + 274c775 commit 0d43874

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+229
-410
lines changed

‎.eslintrc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"plugins": [
3535
"@typescript-eslint",
3636
"react-hooks",
37-
"eslint-plugin-react-hooks"
37+
"eslint-plugin-react-hooks",
38+
"sort-imports-es6-autofix"
3839
],
3940
"rules": {
4041
"@typescript-eslint/explicit-function-return-type": "off",
@@ -46,7 +47,11 @@
4647
"import/extensions": "off",
4748
"react/prop-types": "off",
4849
"@typescript-eslint/no-empty-function": "off",
49-
"sort-imports": "warn"
50+
"sort-imports-es6-autofix/sort-imports-es6": [2, {
51+
"ignoreCase": false,
52+
"ignoreMemberSort": false,
53+
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
54+
}]
5055
},
5156
"env": {
5257
"browser": true,

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@types/jest": "^26.0.14",
1919
"concurrently": "^5.3.0",
2020
"enzyme-adapter-react-16": "^1.15.6",
21+
"eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
2122
"jest": "21.x",
2223
"jest-resolve": "^26.4.0",
2324
"jsdom": "^16.6.0",

‎packages/dev/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "serve public"
1010
},
1111
"dependencies": {
12-
"@patternfly/quickstarts": "1.0.0-rc.18",
12+
"@patternfly/quickstarts": "1.0.0-rc.19",
1313
"@patternfly/react-core": "^4.101.3",
1414
"asciidoctor": "^2.2.1",
1515
"react": "^16.14.0",

‎packages/dev/src/App.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from "react";
1+
import "./App.css";
22
import {
33
Avatar,
44
Brand,
@@ -10,22 +10,22 @@ import {
1010
PageHeaderTools,
1111
PageSidebar,
1212
} from "@patternfly/react-core";
13-
import imgBrand from "./assets/images/imgBrand.svg";
14-
import imgAvatar from "./assets/images/imgAvatar.svg";
1513
import { Link, useHistory } from "react-router-dom";
16-
import Demos from "./Demos";
17-
import "./App.css";
1814
import {
1915
LoadingBox,
16+
QuickStart,
2017
QuickStartContextProvider,
2118
QuickStartContextValues,
2219
QuickStartDrawer,
23-
useLocalStorage,
24-
QuickStart
20+
useLocalStorage
2521
} from "@patternfly/quickstarts";
26-
import { allQuickStarts as yamlQuickStarts } from "./quickstarts-data/quick-start-test-data";
2722
import { loadJSONQuickStarts } from "./quickstarts-data/mas-guides/quickstartLoader";
23+
import { allQuickStarts as yamlQuickStarts } from "./quickstarts-data/quick-start-test-data";
24+
import Demos from "./Demos";
25+
import React from "react";
2826
import i18n from './i18n/i18n';
27+
import imgAvatar from "./assets/images/imgAvatar.svg";
28+
import imgBrand from "./assets/images/imgBrand.svg";
2929

3030
type AppProps = {
3131
children?: React.ReactNode;
@@ -102,7 +102,8 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
102102
const { pathname: currentPath } = window.location;
103103
const quickStartPath = "/quickstarts";
104104

105-
const resourceBundle = i18n.getResourceBundle(localStorage.getItem('bridge/language') || 'en', 'quickstart');
105+
const language = localStorage.getItem('bridge/language') || 'en';
106+
const resourceBundle = i18n.getResourceBundle(language, 'quickstart');
106107

107108
const valuesForQuickstartContext: QuickStartContextValues = {
108109
allQuickStarts,
@@ -115,7 +116,7 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
115116
showAllLink: currentPath !== quickStartPath,
116117
onShowAllLinkClick: () => history.push(quickStartPath),
117118
},
118-
lng: localStorage.getItem('bridge/language'),
119+
language,
119120
resourceBundle: {
120121
...resourceBundle,
121122
"Start": "Let's go!",

‎packages/dev/src/Home.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import i18n from './i18n/i18n';
77

88
export const Home: React.FunctionComponent = () => {
99
// const [inputValue, setInputValue] = React.useState("");
10-
const { setLng, setResourceBundle } = React.useContext(QuickStartContext);
10+
const { setResourceBundle } = React.useContext(QuickStartContext);
1111

1212
// console.log(getQuickStartStatus(qsContext.allQuickStartStates, 'managing-business-central-data-sources-proc'));
1313
// console.log(getQuickStartStatusCount(qsContext.allQuickStartStates, qsContext.allQuickStarts));
@@ -43,8 +43,7 @@ export const Home: React.FunctionComponent = () => {
4343
i18n.changeLanguage(lng);
4444
localStorage.setItem('bridge/language', lng);
4545
const resourceBundle = i18n.getResourceBundle(lng, 'quickstart');
46-
setLng(lng);
47-
setResourceBundle(resourceBundle);
46+
setResourceBundle(resourceBundle, lng);
4847
}
4948

5049
return (

‎packages/module/package.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/quickstarts",
3-
"version": "1.0.0-rc.18",
3+
"version": "1.0.0-rc.19",
44
"description": "PatternFly quick starts",
55
"files": [
66
"dist"
@@ -42,7 +42,6 @@
4242
"showdown": ">=1.8.6"
4343
},
4444
"dependencies": {
45-
"@fortawesome/fontawesome-free": "^5.9.0",
4645
"@patternfly/patternfly": "^4.90.5",
4746
"@patternfly/react-catalog-view-extension": "^4.10.13",
4847
"@patternfly/react-core": "^4.101.3",
@@ -51,7 +50,6 @@
5150
"dompurify": "^2.2.6",
5251
"history": "^5.0.0",
5352
"lodash-es": "^4.17.20",
54-
"sass": "^1.30.0",
5553
"showdown": "1.8.6"
5654
},
5755
"devDependencies": {
@@ -66,7 +64,6 @@
6664
"@types/node": "^14.14.35",
6765
"@types/react": "^16.8.0",
6866
"@types/react-dom": "^16.8.0",
69-
"@types/victory": "^33.1.4",
7067
"@typescript-eslint/eslint-plugin": "^4.4.1",
7168
"@typescript-eslint/parser": "^4.4.1",
7269
"clean-css-cli": "^4.3.0",
@@ -76,11 +73,9 @@
7673
"eslint": "^7.11.0",
7774
"eslint-plugin-react": "^7.21.4",
7875
"eslint-plugin-react-hooks": "^4.1.2",
79-
"express": "^4.17.1",
80-
"imagemin": "^7.0.0",
76+
"sass": "^1.30.0",
8177
"node-sass": "^5.0.0",
8278
"prettier": "^2.1.2",
83-
"prop-types": "^15.6.1",
8479
"purgecss": "^4.0.0",
8580
"react": "^16.8.0",
8681
"react-axe": "^3.5.4",

‎packages/module/src/ConsoleInternal/components/markdown-view.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react';
2-
import cx from 'classnames';
3-
import _truncate from 'lodash-es/truncate.js';
4-
import _uniqueId from 'lodash-es/uniqueId.js';
52
import { Converter } from 'showdown';
63
import { QuickStartContext, QuickStartContextValues } from '../../utils/quick-start-context';
4+
import _truncate from 'lodash-es/truncate.js';
5+
import _uniqueId from 'lodash-es/uniqueId.js';
6+
import cx from 'classnames';
77

88
import './_markdown-view.scss';
99

‎packages/module/src/ConsoleInternal/components/utils/status-box.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
2-
import classNames from 'classnames';
32
import { QuickStartContext, QuickStartContextValues } from '../../../utils/quick-start-context';
3+
import classNames from 'classnames';
44

55
// import * as restrictedSignImg from '../../imgs/restricted-sign.svg';
66
// import { TimeoutError } from '../../co-fetch';

‎packages/module/src/ConsoleInternal/vendor.scss‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
@import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize";
1010
@import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
11-
1211
@import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
1312
@import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
13+
14+
// .co-quick-start-panel-content,
15+
// .ocs-page-layout__content {
16+
// @import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
17+
// @import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
18+
// @import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
19+
// }

‎packages/module/src/ConsoleShared/src/components/modal/Modal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import './Modal.scss';
12
import * as React from 'react';
2-
import cx from 'classnames';
33
import { Modal as PfModal, ModalProps as PfModalProps } from '@patternfly/react-core';
4-
import './Modal.scss';
4+
import cx from 'classnames';
55

66
type ModalProps = {
77
isFullScreen?: boolean;

0 commit comments

Comments
 (0)