feat: build the library with both es5 and es6 as a target

riccardo-forina · wtrocki · commit 1dcdad588caf · 2021-07-21T20:58:25.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -105,4 +105,6 @@ dist
 
 # Custom
 reproductions
-.idea/
+.idea/
+
+/dist
diff --git a/__tests__/AutoField.tsx b/__tests__/AutoField.tsx
@@ -9,7 +9,7 @@ import {
   RadioField,
   SelectField,
   TextField,
-} from 'uniforms-patternfly';
+} from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/AutoFields.tsx b/__tests__/AutoFields.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { AutoFields } from 'uniforms-patternfly';
+import { AutoFields } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/AutoForm.tsx b/__tests__/AutoForm.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { AutoForm } from 'uniforms-patternfly';
+import { AutoForm } from '../src';
 
 import createSchema from './_createSchema';
 import mount from './_mount';
diff --git a/__tests__/BaseForm.tsx b/__tests__/BaseForm.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { BaseForm } from 'uniforms-patternfly';
+import { BaseForm } from '../src';
 
 import createSchema from './_createSchema';
 import mount from './_mount';
diff --git a/__tests__/BoolField.tsx b/__tests__/BoolField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { BoolField } from 'uniforms-patternfly';
+import { BoolField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/DateField.tsx b/__tests__/DateField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { DateField } from 'uniforms-patternfly';
+import { DateField } from '../src';
 import createContext from './_createContext';
 import mount from './_mount';
 
diff --git a/__tests__/ErrorField.tsx b/__tests__/ErrorField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ErrorField } from 'uniforms-patternfly';
+import { ErrorField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/ErrorsField.tsx b/__tests__/ErrorsField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ErrorsField } from 'uniforms-patternfly';
+import { ErrorsField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/HiddenField.tsx b/__tests__/HiddenField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { HiddenField } from 'uniforms-patternfly';
+import { HiddenField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/ListAddField.tsx b/__tests__/ListAddField.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import merge from 'lodash/merge';
 import { Button } from '@patternfly/react-core';
-import { ListAddField } from 'uniforms-patternfly';
+import { ListAddField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/ListDelField.tsx b/__tests__/ListDelField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { merge } from 'lodash';
-import { ListDelField } from 'uniforms-patternfly';
+import { ListDelField } from '../src';
 import { Button } from '@patternfly/react-core';
 
 import createContext from './_createContext';
diff --git a/__tests__/ListField.tsx b/__tests__/ListField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ListField } from 'uniforms-patternfly';
+import { ListField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/ListItemField.tsx b/__tests__/ListItemField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { AutoField, ListItemField } from 'uniforms-patternfly';
+import { AutoField, ListItemField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/LongTextField.tsx b/__tests__/LongTextField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { LongTextField } from 'uniforms-patternfly';
+import { LongTextField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/NestField.tsx b/__tests__/NestField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Card } from '@patternfly/react-core';
-import { AutoField, NestField } from 'uniforms-patternfly';
+import { AutoField, NestField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/NumField.tsx b/__tests__/NumField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { NumField } from 'uniforms-patternfly';
+import { NumField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/QuickForm.tsx b/__tests__/QuickForm.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { QuickForm } from 'uniforms-patternfly';
+import { QuickForm } from '../src';
 
 import createSchema from './_createSchema';
 import mount from './_mount';
diff --git a/__tests__/RadioField.tsx b/__tests__/RadioField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { RadioField } from 'uniforms-patternfly';
+import { RadioField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/SelectField.tsx b/__tests__/SelectField.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Select, Radio } from '@patternfly/react-core';
 import { act } from '@testing-library/react';
-import { SelectField } from 'uniforms-patternfly';
+import { SelectField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/SubmitField.tsx b/__tests__/SubmitField.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button } from '@patternfly/react-core';
 
-import { SubmitField } from 'uniforms-patternfly';
+import { SubmitField } from '../src';
 import createContext from './_createContext';
 import mount from './_mount';
 
diff --git a/__tests__/TextField.tsx b/__tests__/TextField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { TextField } from 'uniforms-patternfly';
+import { TextField } from '../src';
 
 import createContext from './_createContext';
 import mount from './_mount';
diff --git a/__tests__/ValidatedForm.tsx b/__tests__/ValidatedForm.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ValidatedForm } from 'uniforms-patternfly';
+import { ValidatedForm } from '../src';
 
 import createSchema from './_createSchema';
 import mount from './_mount';
diff --git a/__tests__/index.ts b/__tests__/index.ts
@@ -1,4 +1,4 @@
-import * as unstyled from 'uniforms-patternfly';
+import * as unstyled from '../src';
 
 it('exports everything', () => {
   expect(unstyled).toEqual({
diff --git a/package.json b/package.json
@@ -5,16 +5,16 @@
   "repository": "git@github.com:aerogear/uniforms-patternfly.git",
   "author": "Gianluca <gzuccare@redhat.com>",
   "license": "Apache-2.0",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/es5/index.js",
+  "module": "dist/es6/index.js",
   "scripts": {
-    "build": "tsc --build --incremental",
-    "buildProd": "tsc --build",
+    "build": "tsc --build --incremental tsconfig.build.json",
+    "buildProd": "tsc --build tsconfig.build.json",
     "watch": "tsc --watch --incremental",
-    "clean": "rimraf dist coverage tsconfig.tsbuildinfo",
+    "clean": "tsc --build --clean tsconfig.build.json && rimraf dist coverage",
     "coverage": "jest --runInBand --coverage",
     "lint": "eslint --ext js,ts,tsx src",
-    "reset": "rimraf tsconfig.tsbuildinfo dist node_modules",
+    "reset": "rimraf dist node_modules",
     "release:validate": "./scripts/validateRelease.sh TAG=1.2.3",
     "release:publish": "./scripts/publishRelease.sh",
     "test": "jest --runInBand"
diff --git a/src/AutoField.tsx b/src/AutoField.tsx
@@ -1,5 +1,5 @@
 import invariant from 'invariant';
-import { createAutoField } from 'uniforms/es5';
+import { createAutoField } from 'uniforms';
 
 import BoolField from './BoolField';
 import DateField from './DateField';
diff --git a/src/AutoFields.tsx b/src/AutoFields.tsx
@@ -1,5 +1,5 @@
 import { ComponentType, createElement } from 'react';
-import { useForm } from 'uniforms/es5';
+import { useForm } from 'uniforms';
 
 import AutoField from './AutoField';
 
diff --git a/src/AutoForm.tsx b/src/AutoForm.tsx
@@ -1,4 +1,4 @@
-import { AutoForm } from 'uniforms/es5';
+import { AutoForm } from 'uniforms';
 
 import ValidatedQuickForm from './ValidatedQuickForm';
 
diff --git a/src/BaseForm.tsx b/src/BaseForm.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Form } from '@patternfly/react-core';
-import { BaseForm, context } from 'uniforms/es5';
+import { BaseForm, context } from 'uniforms';
 
 function Patternfly(parent: any): any {
   class _ extends parent {
diff --git a/src/BoolField.tsx b/src/BoolField.tsx
@@ -5,7 +5,7 @@ import {
   Switch,
   SwitchProps,
 } from '@patternfly/react-core';
-import { connectField, FieldProps } from 'uniforms/es5';
+import { connectField, FieldProps } from 'uniforms';
 
 import wrapField from './wrapField';
 
diff --git a/src/DateField.tsx b/src/DateField.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { connectField, FieldProps } from 'uniforms/es5';
+import { connectField, FieldProps } from 'uniforms';
 import {
   DatePicker,
   Flex,
diff --git a/src/ErrorField.tsx b/src/ErrorField.tsx
@@ -1,5 +1,5 @@
 import React, { HTMLProps } from 'react';
-import { connectField, filterDOMProps } from 'uniforms/es5';
+import { connectField, filterDOMProps } from 'uniforms';
 
 export type ErrorFieldProps = {
   error?: any;
diff --git a/src/ErrorsField.tsx b/src/ErrorsField.tsx
@@ -1,5 +1,5 @@
 import React, { HTMLProps } from 'react';
-import { useForm, filterDOMProps } from 'uniforms/es5';
+import { useForm, filterDOMProps } from 'uniforms';
 
 export type ErrorsFieldProps = HTMLProps<HTMLDivElement>;
 
diff --git a/src/HiddenField.tsx b/src/HiddenField.tsx
@@ -1,5 +1,5 @@
 import React, { HTMLProps, Ref, useEffect } from 'react';
-import { useField, filterDOMProps } from 'uniforms/es5';
+import { useField, filterDOMProps } from 'uniforms';
 
 export type HiddenFieldProps = {
   inputRef?: Ref<HTMLInputElement>;
diff --git a/src/ListAddField.tsx b/src/ListAddField.tsx
@@ -8,7 +8,7 @@ import {
   filterDOMProps,
   joinName,
   useField,
-} from 'uniforms/es5';
+} from 'uniforms';
 
 export type ListAddFieldProps = FieldProps<
   unknown,
diff --git a/src/ListDelField.tsx b/src/ListDelField.tsx
@@ -7,7 +7,7 @@ import {
   filterDOMProps,
   joinName,
   useField,
-} from 'uniforms/es5';
+} from 'uniforms';
 
 export type ListDelFieldProps = FieldProps<
   unknown,
diff --git a/src/ListField.tsx b/src/ListField.tsx
@@ -6,7 +6,7 @@ import React, {
 } from 'react';
 import { Split, SplitItem, Tooltip } from '@patternfly/react-core';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
-import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms/es5';
+import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
 
 import ListItemField from './ListItemField';
 import ListAddField from './ListAddField';
diff --git a/src/ListItemField.tsx b/src/ListItemField.tsx
@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { connectField } from 'uniforms/es5';
+import { connectField } from 'uniforms';
 
 import AutoField from './AutoField';
 import ListDelField from './ListDelField';
diff --git a/src/LongTextField.tsx b/src/LongTextField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextArea } from '@patternfly/react-core';
-import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms/es5';
+import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
 
 export type LongTextFieldProps = HTMLFieldProps<
   string,
diff --git a/src/NestField.tsx b/src/NestField.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms/es5';
+import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
 import { Card, CardBody } from '@patternfly/react-core';
 
 import AutoField from './AutoField';
diff --git a/src/NumField.tsx b/src/NumField.tsx
@@ -1,6 +1,6 @@
 import React, { Ref } from 'react';
 import { TextInput, TextInputProps } from '@patternfly/react-core';
-import { connectField } from 'uniforms/es5';
+import { connectField } from 'uniforms';
 
 import wrapField from './wrapField';
 
diff --git a/src/QuickForm.tsx b/src/QuickForm.tsx
@@ -1,4 +1,4 @@
-import { QuickForm } from 'uniforms/es5';
+import { QuickForm } from 'uniforms';
 
 import AutoField from './AutoField';
 import BaseForm from './BaseForm';
diff --git a/src/RadioField.tsx b/src/RadioField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Radio as RadioField, RadioProps } from '@patternfly/react-core';
-import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms/es5';
+import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
 
 import wrapField from './wrapField';
 
diff --git a/src/SelectField.tsx b/src/SelectField.tsx
@@ -10,7 +10,7 @@ import {
   SelectVariant,
   SelectOptionObject,
 } from '@patternfly/react-core';
-import { connectField, FieldProps, filterDOMProps } from 'uniforms/es5';
+import { connectField, FieldProps, filterDOMProps } from 'uniforms';
 
 import wrapField from './wrapField';
 
diff --git a/src/SubmitField.tsx b/src/SubmitField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button } from '@patternfly/react-core';
-import { filterDOMProps, HTMLFieldProps, useForm } from 'uniforms/es5';
+import { filterDOMProps, HTMLFieldProps, useForm } from 'uniforms';
 
 export type SubmitFieldProps = HTMLFieldProps<
   number | string | undefined,
diff --git a/src/TextField.tsx b/src/TextField.tsx
@@ -5,7 +5,7 @@ import {
   TextInputProps,
   TimePicker,
 } from '@patternfly/react-core';
-import { connectField, filterDOMProps } from 'uniforms/es5';
+import { connectField, filterDOMProps } from 'uniforms';
 
 import wrapField from './wrapField';
 
diff --git a/src/ValidatedForm.tsx b/src/ValidatedForm.tsx
@@ -1,4 +1,4 @@
-import { ValidatedForm } from 'uniforms/es5';
+import { ValidatedForm } from 'uniforms';
 
 import BaseForm from './BaseForm';
 
diff --git a/src/wrapField.tsx b/src/wrapField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { FormGroup, FormGroupProps } from '@patternfly/react-core';
-import { filterDOMProps } from 'uniforms/es5';
+import { filterDOMProps } from 'uniforms';
 
 declare module 'uniforms' {
   interface FilterDOMProps {
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -0,0 +1,7 @@
+{
+  "files": [],
+  "references": [
+    { "path": "tsconfig.es5.json" },
+    { "path": "tsconfig.es6.json" },
+  ]
+}
diff --git a/tsconfig.es5.json b/tsconfig.es5.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": "src",
+    "outDir": "dist/es5",
+    "rootDir": "src",
+    "target": "es5",
+  }
+}
diff --git a/tsconfig.es6.json b/tsconfig.es6.json
diff --git a/tsconfig.json b/tsconfig.json
