Convert $FlowFixMe for untyped imports to flowlint off

parcel-bundler · Apr 7, 2020 · 68a6867 · 68a6867
1 parent 68b5050
commit 68a6867
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/flow-libs/postcss.js.flow b/flow-libs/postcss.js.flow
@@ -4,7 +4,8 @@
 // Derived from the PostCSS docs available at
 // http://api.postcss.org/postcss.html.
 
-import type {SourceMapGenerator} from 'source-map';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import typeof {SourceMapGenerator} from 'source-map';
 
 declare module 'postcss' {
   declare type NodeCallback = (Node, number) => false | void;

diff --git a/packages/core/cache/src/Cache.js b/packages/core/cache/src/Cache.js
@@ -8,7 +8,7 @@ import type {FileSystem} from '@parcel/fs';
 import path from 'path';
 import logger from '@parcel/logger';
 import {serialize, deserialize, registerSerializableClass} from '@parcel/core';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import packageJson from '../package.json';
 
 export default class Cache {

diff --git a/packages/core/core/src/utils.js b/packages/core/core/src/utils.js
@@ -10,7 +10,7 @@ import Graph from './Graph';
 import ParcelConfig from './ParcelConfig';
 import {RequestGraph} from './RequestTracker';
 import Config from './public/Config';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import packageJson from '../package.json';
 
 export function getBundleGroupId(bundleGroup: BundleGroup): string {

diff --git a/packages/core/register/src/register.js b/packages/core/register/src/register.js
@@ -4,12 +4,12 @@ import type {IDisposable, InitialParcelOptions} from '@parcel/types';
 
 import {NodePackageManager} from '@parcel/package-manager';
 import {NodeFS} from '@parcel/fs';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import defaultConfigContents from '@parcel/config-default';
-// $FlowFixMe this is untyped
+// $FlowFixMe Flow can't resolve this
 import Module from 'module';
 import path from 'path';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import {addHook} from 'pirates';
 import Parcel, {INTERNAL_RESOLVE, INTERNAL_TRANSFORM} from '@parcel/core';
 

diff --git a/packages/core/utils/src/index.js b/packages/core/utils/src/index.js
@@ -12,7 +12,7 @@ export {default as objectHash} from './objectHash';
 export {default as prettifyTime} from './prettifyTime';
 export {default as prettyDiagnostic} from './prettyDiagnostic';
 export {default as PromiseQueue} from './PromiseQueue';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 export {default as promisify} from './promisify';
 export {default as validateSchema} from './schema';
 export {default as TapStream} from './TapStream';

diff --git a/packages/core/utils/src/schema.js b/packages/core/utils/src/schema.js
@@ -2,7 +2,7 @@
 import ThrowableDiagnostic, {
   generateJSONCodeHighlights,
 } from '@parcel/diagnostic';
-// $FlowFixMe untyped
+// flowlint-next-line untyped-import:off
 import levenshteinDistance from 'js-levenshtein';
 
 export type SchemaEntity =

diff --git a/packages/optimizers/cssnano/src/CSSNanoOptimizer.js b/packages/optimizers/cssnano/src/CSSNanoOptimizer.js
@@ -2,7 +2,7 @@
 
 import {Optimizer} from '@parcel/plugin';
 import postcss from 'postcss';
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import cssnano from 'cssnano';
 
 export default new Optimizer({
@@ -17,8 +17,16 @@ export default new Optimizer({
       );
     }
 
+    const results = await postcss([cssnano]).process(contents, {
+      from: bundle.filePath,
+      map: {inline: false},
+    });
+
+    console.log('MAP', results.map.constructor);
+
     return {
-      contents: (await postcss([cssnano]).process(contents)).css,
+      contents: results.css,
+      map: results.map,
     };
   },
 });
diff --git a/packages/optimizers/htmlnano/src/HTMLNanoOptimizer.js b/packages/optimizers/htmlnano/src/HTMLNanoOptimizer.js
@@ -1,6 +1,6 @@
 // @flow strict-local
 
-// $FlowFixMe this is untyped
+// flowlint-next-line untyped-import:off
 import htmlnano from 'htmlnano';
 import {loadConfig} from '@parcel/utils';
 import {Optimizer} from '@parcel/plugin';