Upgrade react, react-select, & related

Jacob Peddicord · Jacob Peddicord · commit f9f062a58ec2 · 2017-11-29T15:21:53.000-08:00
diff --git a/browser/components/App.tsx b/browser/components/App.tsx
@@ -122,7 +122,7 @@ class App extends React.Component<Props, {}> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   generalError: state.common.generalError,
   canAdmin: state.common.info.permissions && state.common.info.permissions.admin,
   admin: state.common.admin,
diff --git a/browser/components/Landing.tsx b/browser/components/Landing.tsx
@@ -61,7 +61,7 @@ class Landing extends React.Component<Props, {}> {
   }
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   displayName: state.common.info.displayName,
   admin: state.common.admin,
 }))(Landing as any);
diff --git a/browser/components/projects/ProjectRouter.tsx b/browser/components/projects/ProjectRouter.tsx
@@ -72,6 +72,6 @@ class ProjectRouter extends React.Component<Props, {}> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   project: state.projects.active,
 }))(ProjectRouter);
diff --git a/browser/components/projects/acl/GroupSelect.tsx b/browser/components/projects/acl/GroupSelect.tsx
@@ -13,7 +13,7 @@
  */
 
 import * as React from 'react';
-import * as Select from 'react-select';
+import Select, { Option } from 'react-select';
 
 interface Props {
   name: string;
@@ -27,7 +27,7 @@ export default function GroupSelect(props: Props) {
     name={props.name}
     options={mapGroups(props.groups)}
     value={props.value}
-    onChange={(sel: Select.Option) => props.onChange(sel ? sel.value as string : null)}
+    onChange={(sel: Option) => props.onChange(sel ? sel.value as string : null)}
   />;
 }
 
diff --git a/browser/components/projects/acl/ProjectAclEditor.tsx b/browser/components/projects/acl/ProjectAclEditor.tsx
@@ -161,6 +161,6 @@ function AclRow(props: AclRowProps) {
   </tr>;
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   project: state.projects.active,
 }))(ProjectAclEditor);
diff --git a/browser/components/projects/admin/PackageVerification.tsx b/browser/components/projects/admin/PackageVerification.tsx
@@ -123,6 +123,6 @@ class PackageVerification extends Component<Props, State> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   packages: state.packages.set,
 }))(PackageVerification);
diff --git a/browser/components/projects/admin/PackageVerificationQueue.tsx b/browser/components/projects/admin/PackageVerificationQueue.tsx
@@ -52,6 +52,6 @@ class PackageVerificationQueue extends Component<Props, {}> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   queue: state.packages.verificationQueue,
 }))(PackageVerificationQueue);
diff --git a/browser/components/projects/browse/Projects.tsx b/browser/components/projects/browse/Projects.tsx
@@ -50,7 +50,7 @@ class Projects extends Component<Props, {}> {
 
 }
 
-export default connect((state) => {
+export default connect((state: any) => {
   return {
     projects: state.projects.list,
   };
diff --git a/browser/components/projects/editor/AddPackageForm.tsx b/browser/components/projects/editor/AddPackageForm.tsx
@@ -41,8 +41,8 @@ interface State {
  */
 class AddPackageForm extends Component<Props, Partial<State>> {
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
 
     this.state = {
       pkg: null,
@@ -173,7 +173,7 @@ class AddPackageForm extends Component<Props, Partial<State>> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   project: state.projects.active,
   licenses: state.licenses.map,
   tags: state.licenses.tags,
diff --git a/browser/components/projects/editor/PackageFields.tsx b/browser/components/projects/editor/PackageFields.tsx
@@ -14,7 +14,7 @@
 
 import React = require('react');
 import { connect } from 'react-redux';
-import Select = require('react-select');
+import Select, { Option } from 'react-select';
 
 import { WebLicense, WebTag } from '../../../../server/api/licenses/interfaces';
 import { WebPackage } from '../../../../server/api/packages/interfaces';
@@ -41,7 +41,7 @@ interface State {
   selectedPackage: any;
 }
 
-interface LicenseOption extends Select.Option {
+interface LicenseOption extends Option {
   tags: string[];
   shortText?: string[];
   longText?: string[];
@@ -333,7 +333,7 @@ class PackageFields extends React.Component<Props, State> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   completions: state.packages.completions,
   packages: state.packages.set,
   licenses: state.licenses.list,
diff --git a/browser/components/projects/editor/ProjectOnboardingForm.tsx b/browser/components/projects/editor/ProjectOnboardingForm.tsx
@@ -152,6 +152,6 @@ class ProjectOnboardingForm extends Component<Props, State> {
   }
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   groups: state.common.info.groups ? state.common.info.groups : [],
 }))(ProjectOnboardingForm);
diff --git a/browser/components/projects/editor/ProjectPackage.tsx b/browser/components/projects/editor/ProjectPackage.tsx
@@ -45,8 +45,8 @@ interface State {
 
 class ProjectPackage extends React.Component<Props, State> {
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
 
     this.state = {
       showDelta: false,
@@ -148,7 +148,7 @@ class ProjectPackage extends React.Component<Props, State> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   project: state.projects.active,
   packages: state.packages.set,
   tags: state.licenses.tags,
diff --git a/browser/components/projects/editor/ProjectView.tsx b/browser/components/projects/editor/ProjectView.tsx
@@ -214,7 +214,7 @@ class ProjectView extends Component<Props, State> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   project: state.projects.active,
   licenses: state.licenses.list,
 }))(ProjectView);
diff --git a/browser/components/projects/packages/PackageCard.tsx b/browser/components/projects/packages/PackageCard.tsx
@@ -27,7 +27,7 @@ interface Props {
   packageId: number;
   packages: PackageSet;
   usage?: UsageProps;
-  buttons: any[];
+  buttons?: any[];
   preStyle?: React.CSSProperties;
 }
 
@@ -37,7 +37,10 @@ class PackageCard extends Component<Props, {}> {
 
   static defaultProps = {
     packages: {},
-    preStyle: {overflow: 'auto', maxHeight: '150px'},
+    // wat?
+    // https://github.com/Microsoft/TypeScript/pull/19966
+    // https://github.com/Microsoft/TypeScript/issues/11465
+    preStyle: {overflow: 'auto' as 'auto', maxHeight: '150px'},
   };
 
   componentWillMount() {
@@ -122,6 +125,6 @@ class PackageCard extends Component<Props, {}> {
 
 }
 
-export default connect((state) => ({
+export default connect((state: any) => ({
   packages: state.packages.set,
-}))(PackageCard) as React.ComponentClass<Partial<Props>>;
+}))(PackageCard);
diff --git a/browser/components/projects/render/AttributionDocBuilder.tsx b/browser/components/projects/render/AttributionDocBuilder.tsx
@@ -131,7 +131,7 @@ class AttributionDocBuilder extends Component<Props, State> {
 
 }
 
-export default connect((state) => {
+export default connect((state: any) => {
   return {
     attributionDoc: state.projects.attributionDoc,
     project: state.projects.active,
diff --git a/browser/components/util/EditableText.tsx b/browser/components/util/EditableText.tsx
@@ -28,8 +28,8 @@ interface State {
 
 export default class EditableText extends Component<Props, State> {
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
 
     this.state = {
       editing: false,
diff --git a/browser/components/util/FreeformSelect.tsx b/browser/components/util/FreeformSelect.tsx
@@ -14,7 +14,7 @@
 
 import * as React from 'react';
 import { Component } from 'react';
-import * as Select from 'react-select';
+import Select from 'react-select';
 
 interface Props {
   name: string;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class App extends React.Component<Props, {}> {`
`122`	`122`
`123`	`123`	`}`
`124`	`124`
`125`		`-export default connect((state) => ({`
	`125`	`+export default connect((state: any) => ({`
`126`	`126`	`generalError: state.common.generalError,`
`127`	`127`	`canAdmin: state.common.info.permissions && state.common.info.permissions.admin,`
`128`	`128`	`admin: state.common.admin,`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class Landing extends React.Component<Props, {}> {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-export default connect((state) => ({`
	`64`	`+export default connect((state: any) => ({`
`65`	`65`	`displayName: state.common.info.displayName,`
`66`	`66`	`admin: state.common.admin,`
`67`	`67`	`}))(Landing as any);`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ class ProjectRouter extends React.Component<Props, {}> {`
`72`	`72`
`73`	`73`	`}`
`74`	`74`
`75`		`-export default connect((state) => ({`
	`75`	`+export default connect((state: any) => ({`
`76`	`76`	`project: state.projects.active,`
`77`	`77`	`}))(ProjectRouter);`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,6 @@ function AclRow(props: AclRowProps) {`
`161`	`161`	`</tr>;`
`162`	`162`	`}`
`163`	`163`
`164`		`-export default connect((state) => ({`
	`164`	`+export default connect((state: any) => ({`
`165`	`165`	`project: state.projects.active,`
`166`	`166`	`}))(ProjectAclEditor);`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,6 @@ class PackageVerification extends Component<Props, State> {`
`123`	`123`
`124`	`124`	`}`
`125`	`125`
`126`		`-export default connect((state) => ({`
	`126`	`+export default connect((state: any) => ({`
`127`	`127`	`packages: state.packages.set,`
`128`	`128`	`}))(PackageVerification);`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ class PackageVerificationQueue extends Component<Props, {}> {`
`52`	`52`
`53`	`53`	`}`
`54`	`54`
`55`		`-export default connect((state) => ({`
	`55`	`+export default connect((state: any) => ({`
`56`	`56`	`queue: state.packages.verificationQueue,`
`57`	`57`	`}))(PackageVerificationQueue);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class Projects extends Component<Props, {}> {`
`50`	`50`
`51`	`51`	`}`
`52`	`52`
`53`		`-export default connect((state) => {`
	`53`	`+export default connect((state: any) => {`
`54`	`54`	`return {`
`55`	`55`	`projects: state.projects.list,`
`56`	`56`	`};`