remove flow from the codebase

robinweser · robinweser · commit b9a8c6b22bfb · 2022-11-16T11:07:49.000+01:00
diff --git a/.eslintrc b/.eslintrc
@@ -6,9 +6,6 @@
     "node": true,
     "jest": true
   },
-  "plugins": [
-    "flowtype"
-  ],
   "rules": {
     "semi": [ 2, "never" ],
     "object-curly-newline": [ 0 ],
diff --git a/modules/generator/generatePluginList.js b/modules/generator/generatePluginList.js
@@ -1,9 +1,6 @@
-/* @flow */
 import pluginMap from './maps/pluginMap'
 
-export default function getRecommendedPlugins(
-  browserList: Object
-): Array<string> {
+export default function getRecommendedPlugins(browserList) {
   const recommendedPlugins = {}
 
   for (const plugin in pluginMap) {
diff --git a/modules/generator/generatePrefixMap.js b/modules/generator/generatePrefixMap.js
@@ -1,4 +1,3 @@
-/* @flow */
 import { getSupport } from 'caniuse-api'
 
 import propertyMap from './maps/propertyMap'
@@ -29,11 +28,7 @@ const flexPropsIE = [
   'flexBasis',
 ]
 
-function filterAndRemoveIfEmpty(
-  map: Object,
-  property: string,
-  filter: Function
-): void {
+function filterAndRemoveIfEmpty(map, property, filter) {
   if (map[property]) {
     map[property] = map[property].filter(filter)
 
@@ -43,7 +38,7 @@ function filterAndRemoveIfEmpty(
   }
 }
 
-export default function generatePrefixMap(browserList: Object): Object {
+export default function generatePrefixMap(browserList) {
   const prefixMap = {}
 
   for (const browser in prefixBrowserMap) {
@@ -54,15 +49,16 @@ export default function generatePrefixMap(browserList: Object): Object {
       const versions = getSupport(keyword)
 
       for (let i = 0, len = keywordProperties.length; i < len; ++i) {
-        if (versions[browser]){
+        if (versions[browser]) {
           if (versions[browser].x >= browserList[browser]) {
-            var property = keywordProperties[i];
+            const property = keywordProperties[i]
+
             if (!prefixMap[property]) {
-              prefixMap[property] = [];
+              prefixMap[property] = []
             }
 
             if (prefixMap[property].indexOf(prefix) === -1) {
-              prefixMap[property].push(prefix);
+              prefixMap[property].push(prefix)
             }
           }
         }
diff --git a/modules/generator/index.js b/modules/generator/index.js
@@ -1,4 +1,3 @@
-/* @flow */
 import generatePrefixMap from './generatePrefixMap'
 import generatePluginList from './generatePluginList'
 
@@ -9,11 +8,7 @@ function generateImportString(plugin, compatibility) {
   return `import ${plugin} from 'inline-style-prefixer/lib/plugins/${plugin}'`
 }
 
-export function generateFile(
-  prefixMap: Object,
-  pluginList: Array<string>,
-  compatibility?: boolean
-) {
+export function generateFile(prefixMap, pluginList, compatibility) {
   const pluginImports = pluginList
     .map((plugin) => generateImportString(plugin, compatibility))
     .join('\n')
@@ -46,7 +41,7 @@ ${moduleExporter} {
 }`
 }
 
-function saveFile(fileContent: string, path: string): void {
+function saveFile(fileContent, path) {
   /* eslint-disable global-require */
   const fs = require('fs')
   /* eslint-enable global-require */
@@ -60,23 +55,13 @@ function saveFile(fileContent: string, path: string): void {
   })
 }
 
-type GenerationOption = {
-  path?: string,
-  compatibility?: boolean,
-  plugins?: boolean,
-  prefixMap?: boolean,
-}
-
 const defaultOptions = {
   prefixMap: true,
   plugins: true,
   compatibility: false,
 }
 
-export default function generateData(
-  browserList: Object,
-  userOptions: GenerationOption = {}
-) {
+export default function generateData(browserList, userOptions = {}) {
   const options = {
     ...defaultOptions,
     ...userOptions,
diff --git a/modules/plugins/filter.js b/modules/plugins/filter.js
@@ -4,7 +4,7 @@ const FILTER_REGEX = /filter\(/g
 // http://caniuse.com/#feat=css-filter-function
 const prefixes = ['-webkit-', '']
 
-export default function filter(property: string, value: any): ?Array<string> {
+export default function filter(property, value) {
   if (
     typeof value === 'string' &&
     !isPrefixedValue(value) &&
diff --git a/modules/plugins/flexboxOld.js b/modules/plugins/flexboxOld.js
@@ -1,4 +1,3 @@
-/* @flow */
 const alternativeValues = {
   'space-around': 'justify',
   'space-between': 'justify',
@@ -15,11 +14,7 @@ const alternativeProps = {
   flexGrow: 'WebkitBoxFlex',
 }
 
-export default function flexboxOld(
-  property: string,
-  value: any,
-  style: Object
-): void {
+export default function flexboxOld(property, value, style) {
   if (property === 'flexDirection' && typeof value === 'string') {
     if (value.indexOf('column') > -1) {
       style.WebkitBoxOrient = 'vertical'
diff --git a/modules/plugins/gradient.js b/modules/plugins/gradient.js
@@ -1,10 +1,9 @@
-/* @flow */
 import isPrefixedValue from 'css-in-js-utils/lib/isPrefixedValue'
 
 const prefixes = ['-webkit-', '-moz-', '']
 const values = /linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/gi
 
-export default function gradient(property: string, value: any): ?Array<string> {
+export default function gradient(property, value) {
   if (
     typeof value === 'string' &&
     !isPrefixedValue(value) &&
diff --git a/modules/plugins/grid.js b/modules/plugins/grid.js
@@ -1,10 +1,8 @@
-/* @flow */
-
-function isSimplePositionValue(value: any) {
+function isSimplePositionValue(value) {
   return typeof value === 'number' && !isNaN(value)
 }
 
-function isComplexSpanValue(value: string) {
+function isComplexSpanValue(value) {
   return typeof value === 'string' && value.includes('/')
 }
 
@@ -16,13 +14,13 @@ const displayValues = {
 }
 
 const propertyConverters = {
-  alignSelf: (value: any, style: Object) => {
+  alignSelf: (value, style) => {
     if (alignmentValues.indexOf(value) > -1) {
       style.msGridRowAlign = value
     }
   },
 
-  gridColumn: (value: any, style: Object) => {
+  gridColumn: (value, style) => {
     if (isSimplePositionValue(value)) {
       style.msGridColumn = value
     } else if (isComplexSpanValue(value)) {
@@ -40,20 +38,20 @@ const propertyConverters = {
     }
   },
 
-  gridColumnEnd: (value: any, style: Object) => {
+  gridColumnEnd: (value, style) => {
     const { msGridColumn } = style
     if (isSimplePositionValue(value) && isSimplePositionValue(msGridColumn)) {
       style.msGridColumnSpan = value - msGridColumn
     }
   },
 
-  gridColumnStart: (value: any, style: Object) => {
+  gridColumnStart: (value, style) => {
     if (isSimplePositionValue(value)) {
       style.msGridColumn = value
     }
   },
 
-  gridRow: (value: any, style: Object) => {
+  gridRow: (value, style) => {
     if (isSimplePositionValue(value)) {
       style.msGridRow = value
     } else if (isComplexSpanValue(value)) {
@@ -71,39 +69,35 @@ const propertyConverters = {
     }
   },
 
-  gridRowEnd: (value: any, style: Object) => {
+  gridRowEnd: (value, style) => {
     const { msGridRow } = style
     if (isSimplePositionValue(value) && isSimplePositionValue(msGridRow)) {
       style.msGridRowSpan = value - msGridRow
     }
   },
 
-  gridRowStart: (value: any, style: Object) => {
+  gridRowStart: (value, style) => {
     if (isSimplePositionValue(value)) {
       style.msGridRow = value
     }
   },
 
-  gridTemplateColumns: (value: any, style: Object) => {
+  gridTemplateColumns: (value, style) => {
     style.msGridColumns = value
   },
 
-  gridTemplateRows: (value: any, style: Object) => {
+  gridTemplateRows: (value, style) => {
     style.msGridRows = value
   },
 
-  justifySelf: (value: any, style: Object) => {
+  justifySelf: (value, style) => {
     if (alignmentValues.indexOf(value) > -1) {
       style.msGridColumnAlign = value
     }
   },
 }
 
-export default function grid(
-  property: string,
-  value: any,
-  style: Object
-): ?Array<string> {
+export default function grid(property, value, style) {
   if (property === 'display' && value in displayValues) {
     return displayValues[value]
   }
diff --git a/modules/plugins/imageSet.js b/modules/plugins/imageSet.js
@@ -1,10 +1,9 @@
-/* @flow */
 import isPrefixedValue from 'css-in-js-utils/lib/isPrefixedValue'
 
 // http://caniuse.com/#feat=css-image-set
 const prefixes = ['-webkit-', '']
 
-export default function imageSet(property: string, value: any): ?Array<string> {
+export default function imageSet(property, value) {
   if (
     typeof value === 'string' &&
     !isPrefixedValue(value) &&
diff --git a/modules/plugins/logical.js b/modules/plugins/logical.js
@@ -1,4 +1,3 @@
-/* @flow */
 const alternativeProps = {
   marginBlockStart: ['WebkitMarginBefore'],
   marginBlockEnd: ['WebkitMarginAfter'],
@@ -26,11 +25,7 @@ const alternativeProps = {
   borderInlineEndWidth: ['WebkitBorderEndWidth', 'MozBorderEndWidth'],
 }
 
-export default function logical(
-  property: string,
-  value: any,
-  style: Object
-): void {
+export default function logical(property, value, style) {
   if (Object.prototype.hasOwnProperty.call(alternativeProps, property)) {
     const alternativePropList = alternativeProps[property]
     for (let i = 0, len = alternativePropList.length; i < len; ++i) {
diff --git a/modules/plugins/position.js b/modules/plugins/position.js
@@ -1,5 +1,4 @@
-/* @flow */
-export default function position(property: string, value: any): ?Array<string> {
+export default function position(property, value) {
   if (property === 'position' && value === 'sticky') {
     return ['-webkit-sticky', 'sticky']
   }
diff --git a/modules/plugins/sizing.js b/modules/plugins/sizing.js
@@ -1,4 +1,3 @@
-/* @flow */
 const prefixes = ['-webkit-', '-moz-', '']
 
 const properties = {
@@ -18,7 +17,7 @@ const values = {
   'contain-floats': true,
 }
 
-export default function sizing(property: string, value: any): ?Array<any> {
+export default function sizing(property, value) {
   if (properties.hasOwnProperty(property) && values.hasOwnProperty(value)) {
     return prefixes.map((prefix) => prefix + value)
   }
diff --git a/modules/plugins/transition.js b/modules/plugins/transition.js
@@ -1,4 +1,3 @@
-/* @flow */
 import hyphenateProperty from 'css-in-js-utils/lib/hyphenateProperty'
 import isPrefixedValue from 'css-in-js-utils/lib/isPrefixedValue'
 
@@ -19,7 +18,7 @@ const prefixMapping = {
   ms: '-ms-',
 }
 
-function prefixValue(value: string, propertyPrefixMap: Object): string {
+function prefixValue(value, propertyPrefixMap) {
   if (isPrefixedValue(value)) {
     return value
   }
@@ -56,12 +55,7 @@ function prefixValue(value: string, propertyPrefixMap: Object): string {
   return multipleValues.join(',')
 }
 
-export default function transition(
-  property: string,
-  value: any,
-  style: Object,
-  propertyPrefixMap: Object
-): ?string {
+export default function transition(property, value, style, propertyPrefixMap) {
   // also check for already prefixed transitions
   if (typeof value === 'string' && properties.hasOwnProperty(property)) {
     const outputValue = prefixValue(value, propertyPrefixMap)
diff --git a/modules/utils/prefixProperty.js b/modules/utils/prefixProperty.js
@@ -13,8 +13,6 @@ export default function prefixProperty(prefixProperties, property, style) {
         style[prefixedProperty] = style[property]
       }
     }
-
-    style[property] = style[property]
   }
 
   return style
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "babel:lib": "cross-env BABEL_ENV=commonjs babel -d lib modules --ignore __tests__",
     "babel": "yarn babel:es && yarn babel:lib",
     "build": "yarn run check && yarn generate && yarn babel",
-    "check": "yarn clear && yarn format && yarn lint && yarn coverage && yarn flow",
+    "check": "yarn clear && yarn format && yarn lint && yarn coverage",
     "clear": "rimraf lib es coverage _book",
     "docs": "gitbook install && gitbook build && gh-pages -d _book",
     "flow": "flow",
@@ -58,13 +58,11 @@
     "babel-preset-stage-0": "^6.5.0",
     "caniuse-api": "^3.0.0",
     "cross-env": "^5.2.0",
-    "eslint": "^3.14.0",
+    "eslint": "^5.0.0",
     "eslint-config-airbnb": "^14.0.0",
-    "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^3.0.2",
     "eslint-plugin-react": "^6.9.0",
-    "flow-bin": "^0.80.0",
     "gh-pages": "^1.2.0",
     "gitbook": "^3.2.2",
     "gitbook-cli": "^2.3.0",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* @flow */`
`2`	`1`	`import { getSupport } from 'caniuse-api'`
`3`	`2`
`4`	`3`	`import propertyMap from './maps/propertyMap'`
`@@ -29,11 +28,7 @@ const flexPropsIE = [`
`29`	`28`	`'flexBasis',`
`30`	`29`	`]`
`31`	`30`
`32`		`-function filterAndRemoveIfEmpty(`
`33`		`- map: Object,`
`34`		`- property: string,`
`35`		`- filter: Function`
`36`		`-): void {`
	`31`	`+function filterAndRemoveIfEmpty(map, property, filter) {`
`37`	`32`	`if (map[property]) {`
`38`	`33`	`map[property] = map[property].filter(filter)`
`39`	`34`
`@@ -43,7 +38,7 @@ function filterAndRemoveIfEmpty(`
`43`	`38`	`}`
`44`	`39`	`}`
`45`	`40`
`46`		`-export default function generatePrefixMap(browserList: Object): Object {`
	`41`	`+export default function generatePrefixMap(browserList) {`
`47`	`42`	`const prefixMap = {}`
`48`	`43`
`49`	`44`	`for (const browser in prefixBrowserMap) {`
`@@ -54,15 +49,16 @@ export default function generatePrefixMap(browserList: Object): Object {`
`54`	`49`	`const versions = getSupport(keyword)`
`55`	`50`
`56`	`51`	`for (let i = 0, len = keywordProperties.length; i < len; ++i) {`
`57`		`- if (versions[browser]){`
	`52`	`+ if (versions[browser]) {`
`58`	`53`	`if (versions[browser].x >= browserList[browser]) {`
`59`		`- var property = keywordProperties[i];`
	`54`	`+ const property = keywordProperties[i]`
	`55`	`+`
`60`	`56`	`if (!prefixMap[property]) {`
`61`		`- prefixMap[property] = [];`
	`57`	`+ prefixMap[property] = []`
`62`	`58`	`}`
`63`	`59`
`64`	`60`	`if (prefixMap[property].indexOf(prefix) === -1) {`
`65`		`- prefixMap[property].push(prefix);`
	`61`	`+ prefixMap[property].push(prefix)`
`66`	`62`	`}`
`67`	`63`	`}`
`68`	`64`	`}`