Update to create-react-app v2.1.0 (#375)

* Update to create-react-app v2.1.0 * Remove IGroupRenderProps * Update inline html report
Flank · Oct 31, 2018 · 43b2f54 · 43b2f54
1 parent f404140
commit 43b2f54
Show file tree

Hide file tree

Showing 21 changed files with 21,338 additions and 5,211 deletions.
diff --git a/junit_html_report/.gitignore b/junit_html_report/.gitignore
@@ -1,4 +1,23 @@
-node_modules/
-build/
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
 .DS_Store
-*.log
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/junit_html_report/README.md b/junit_html_report/README.md
diff --git a/junit_html_report/inline.js b/junit_html_report/inline.js
@@ -9,6 +9,6 @@ inline.html({
 },
 function(err, result) {
   if (err) { console.log(err); }
-  var kotlinResource = '../kotlin_poc/src/main/resources/inline.html';
+  var kotlinResource = '../test_runner/src/main/resources/inline.html';
   fs.writeFileSync(kotlinResource, result);
 });
diff --git a/junit_html_report/package-lock.json b/junit_html_report/package-lock.json
diff --git a/junit_html_report/package.json b/junit_html_report/package.json
@@ -1,29 +1,32 @@
 {
-  "name": "tmp_react_ts",
+  "name": "junit_html_report",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "office-ui-fabric-react": "^5.57.0",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
-    "react-scripts-ts": "2.13.0"
-  },
-  "scripts": {
-    "start": "react-scripts-ts start",
-    "build": "react-scripts-ts build",
-    "test": "react-scripts-ts test --env=jsdom",
-    "eject": "react-scripts-ts eject"
+    "office-ui-fabric-react": "^6.97.0",
+    "react": "^16.6.0",
+    "react-dom": "^16.6.0",
+    "react-scripts": "2.1.0",
+    "typescript": "^3.1.4"
   },
   "devDependencies": {
-    "@types/jest": "^22.1.4",
-    "@types/node": "^9.4.6",
-    "@types/prop-types": "^15.5.2",
-    "@types/react": "^16.0.39",
-    "@types/react-dom": "^16.0.4",
-    "office-ui-fabric-react-tslint": "file:packages/office-ui-fabric-react-tslint",
-    "tslint": "^5.9.1",
-    "tslint-microsoft-contrib": "^5.0.3",
-    "typescript": "^2.7.2",
+    "@types/react": "^16.4.18",
+    "@types/react-dom": "^16.0.9",
     "web-resource-inliner": "^4.2.1"
-  }
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }
diff --git a/junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json b/junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json
diff --git a/junit_html_report/packages/office-ui-fabric-react-tslint/package.json b/junit_html_report/packages/office-ui-fabric-react-tslint/package.json
diff --git a/junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json b/junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json
diff --git a/junit_html_report/public/index.html b/junit_html_report/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
     <!--
       manifest.json provides metadata used when your web app is added to the
-      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
+      homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/junit_html_report/public/manifest.json b/junit_html_report/public/manifest.json
@@ -8,7 +8,7 @@
       "type": "image/x-icon"
     }
   ],
-  "start_url": "./index.html",
+  "start_url": ".",
   "display": "standalone",
   "theme_color": "#000000",
   "background_color": "#ffffff"

diff --git a/junit_html_report/src/App.tsx b/junit_html_report/src/App.tsx
@@ -52,11 +52,9 @@ class App extends React.Component {
           selectionMode={SelectionMode.none}
           selection={this._selection}
           groups={_groups}
-          groupProps={
-            {
-              onRenderHeader: this._onRenderHeader
-            }
-          }
+          groupProps={{
+            onRenderHeader: this._onRenderHeader
+          }}
         />
       </div>
     );
@@ -67,7 +65,8 @@ class App extends React.Component {
     if (props.onToggleCollapse !== undefined) { props.onToggleCollapse(group); }
   }
 
-  private _onRenderHeader(props: IGroupDividerProps): JSX.Element {
+  private _onRenderHeader(props?: IGroupDividerProps): JSX.Element {
+    if (props === undefined) return <GroupHeader />;
     props.onGroupHeaderClick = this._onGroupHeaderClick.bind(null, props);
 
     return <GroupHeader { ...props } />;
@@ -79,16 +78,18 @@ class App extends React.Component {
     return { root: style};
   }
 
-  private _onRenderCell(nestingDepth: number, item: IItem, itemIndex: number): JSX.Element {
+  private _onRenderCell(nestingDepth?: number, item?: IItem, itemIndex?: number): React.ReactNode {
+    var emptyItem: IItem = { "key": "empty", "name": "empty", "link": "empty"}
+    var itemObj = item || emptyItem
     return (
       <div data-selection-index={itemIndex}>
         <span className='GroupedList-name'>
           <Link
-            href={item.link}
+            href={itemObj.link}
             getStyles={this._linkStyles}
             target='_blank'
           >
-            {item.name}
+            {itemObj.name}
           </Link>
         </span>
       </div>

diff --git a/junit_html_report/src/index.css b/junit_html_report/src/index.css
@@ -3,3 +3,7 @@ body {
   padding: 0;
   font-family: sans-serif;
 }
+
+.GroupedList-name {
+  padding-bottom: 40px;
+}
diff --git a/junit_html_report/src/index.tsx b/junit_html_report/src/index.tsx
@@ -3,11 +3,13 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import App from './App';
-import registerServiceWorker from './registerServiceWorker';
+import * as serviceWorker from './serviceWorker';
 import './index.css';
 
 ReactDOM.render(
   <App />,
   document.getElementById('root') as HTMLElement
 );
-registerServiceWorker();
+
+// http://bit.ly/CRA-PWA
+serviceWorker.register();
diff --git a/junit_html_report/src/react-app-env.d.ts b/junit_html_report/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />