@atlaspack/transformer-postcss 2.14.5-canary.48 → 2.14.5-canary.481

package/src/{PostCSSTransformer.js → PostCSSTransformer.ts}

@@ -1,11 +1,9 @@
-// @flow
-
 import type {
   FilePath,
   Asset,
   MutableAsset,
   PluginOptions,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 
 import {hashString} from '@atlaspack/rust';
 import {glob} from '@atlaspack/utils';
@@ -14,7 +12,7 @@ import nullthrows from 'nullthrows';
 import path from 'path';
 import semver from 'semver';
 import valueParser from 'postcss-value-parser';
-import typeof * as Postcss from 'postcss';
+import * as Postcss from 'postcss';
 
 import {load} from './loadConfig';
 import {POSTCSS_RANGE} from './constants';
@@ -25,7 +23,7 @@ const FROM_IMPORT_RE = /.+from\s*(?:"|')(.*)(?:"|')\s*;?/;
 const LEGACY_MODULE_RE = /@value|:export|(:global|:local|:import)(?!\s*\()/i;
 const MODULE_BY_NAME_RE = /\.module\./;
 
-export default (new Transformer({
+export default new Transformer({
   loadConfig({config, options, logger}) {
     return load({config, options, logger});
   },
@@ -77,12 +75,18 @@ export default (new Transformer({
       return [asset];
     }
 
+    // @ts-expect-error TS2709
     const postcss: Postcss = await loadPostcss(options, asset.filePath);
     let ast = nullthrows(await asset.getAST());
     let program = postcss.fromJSON(ast.program);
 
     let plugins = [...config.hydrated.plugins];
-    let cssModules: ?{|[string]: string|} = null;
+    let cssModules:
+      | {
+          [key: string]: string;
+        }
+      | null
+      | undefined = null;
     if (config.hydrated.modules) {
       asset.meta.cssModulesCompiled = 'postcss';
 
@@ -172,8 +176,10 @@ export default (new Transformer({
 
       plugins.push(
         postcssModules({
+          // @ts-expect-error TS7006
           getJSON: (filename, json) => (cssModules = json),
           Loader: await createLoader(asset, resolve, options),
+          // @ts-expect-error TS7006
           generateScopedName: (name, filename) =>
             `${name}_${hashString(
               path.relative(options.projectRoot, filename),
@@ -183,6 +189,7 @@ export default (new Transformer({
       );
 
       if (code == null || COMPOSES_RE.test(code)) {
+        // @ts-expect-error TS7006
         program.walkDecls((decl) => {
           let [, importPath] = FROM_IMPORT_RE.exec(decl.value) || [];
           if (decl.prop === 'composes' && importPath != null) {
@@ -209,7 +216,6 @@ export default (new Transformer({
       }
     }
 
-    // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
     let {messages, root} = await postcss(plugins).process(
       program,
       config.hydrated,
@@ -234,10 +240,9 @@ export default (new Transformer({
 
     let assets = [asset];
     if (cssModules) {
-      // $FlowFixMe
-      let cssModulesList = (Object.entries(cssModules): Array<
-        [string, string],
-      >);
+      let cssModulesList = Object.entries(cssModules) as Array<
+        [string, string]
+      >;
       let deps = asset
         .getDependencies()
         .filter((dep) => dep.priority === 'sync');
@@ -252,7 +257,7 @@ export default (new Transformer({
         code = cssModulesList
           .map(
             // This syntax enables shaking the invidual statements, so that unused classes don't even exist in JS.
-            ([className, classNameHashed]) =>
+            ([className, classNameHashed]: [any, any]) =>
               `module.exports[${JSON.stringify(className)}] = ${JSON.stringify(
                 classNameHashed,
               )};`,
@@ -268,6 +273,7 @@ export default (new Transformer({
 
       assets.push({
         type: 'js',
+        // @ts-expect-error TS2353
         content: code,
       });
     }
@@ -275,9 +281,11 @@ export default (new Transformer({
   },
 
   async generate({asset, ast, options}) {
+    // @ts-expect-error TS2709
     const postcss: Postcss = await loadPostcss(options, asset.filePath);
 
     let code = '';
+    // @ts-expect-error TS7006
     postcss.stringify(postcss.fromJSON(ast.program), (c) => {
       code += c;
     });
@@ -286,7 +294,7 @@ export default (new Transformer({
       content: code,
     };
   },
-}): Transformer);
+}) as Transformer<unknown>;
 
 async function createLoader(
   asset: MutableAsset,
@@ -298,7 +306,7 @@ async function createLoader(
     asset.filePath,
   );
   return class AtlaspackFileSystemLoader extends FileSystemLoader {
-    async fetch(composesPath, relativeTo) {
+    async fetch(composesPath: any, relativeTo: any) {
       let importPath = composesPath.replace(/^["']|["']$/g, '');
       let resolved = await resolve(relativeTo, importPath);
       let rootRelativePath = path.resolve(path.dirname(relativeTo), resolved);
@@ -314,7 +322,6 @@ async function createLoader(
         source,
         rootRelativePath,
         undefined,
-        // $FlowFixMe[method-unbinding]
         this.fetch.bind(this),
       );
       return exportTokens;
@@ -326,6 +333,7 @@ async function createLoader(
   };
 }
 
+// @ts-expect-error TS2709
 function loadPostcss(options: PluginOptions, from: FilePath): Promise<Postcss> {
   return options.packageManager.require('postcss', from, {
     range: POSTCSS_RANGE,

package/src/{constants.js → constants.ts}

@@ -1,3 +1 @@
-// @flow
-
 export const POSTCSS_RANGE = '^8.2.1';

package/src/{loadConfig.js → loadConfig.ts}

@@ -1,28 +1,28 @@
-// @flow
 import type {
   Config,
   FilePath,
   PluginOptions,
   PluginLogger,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 import path from 'path';
 import {md, generateJSONCodeHighlights} from '@atlaspack/diagnostic';
 import nullthrows from 'nullthrows';
+// @ts-expect-error TS7016
 import clone from 'clone';
 import {POSTCSS_RANGE} from './constants';
 
 import loadExternalPlugins from './loadPlugins';
 
-type ConfigResult = {|
-  raw: any,
-  filePath: string,
-  hydrated: {|
-    plugins: Array<any>,
-    from: FilePath,
-    to: FilePath,
-    modules: any,
-  |},
-|};
+type ConfigResult = {
+  raw: any;
+  filePath: string;
+  hydrated: {
+    plugins: Array<any>;
+    from: FilePath;
+    to: FilePath;
+    modules: any;
+  };
+};
 
 async function configHydrator(
   configFile: any,
@@ -30,7 +30,7 @@ async function configHydrator(
   resolveFrom: FilePath,
   options: PluginOptions,
   logger: PluginLogger,
-): Promise<?ConfigResult> {
+): Promise<ConfigResult | null | undefined> {
   if (configFile == null) {
     return;
   }
@@ -80,7 +80,7 @@ async function configHydrator(
     let filename = path.basename(resolveFrom);
     let isPackageJson = filename === 'package.json';
     let message;
-    let hints = [];
+    let hints: Array<string> = [];
     if (!isPackageJson && redundantPlugins.length === pluginArray.length) {
       message = md`Parcel includes CSS transpilation and vendor prefixing by default. PostCSS config __${filename}__ contains only redundant plugins. Deleting it may significantly improve build performance.`;
       hints.push(md`Delete __${filename}__`);
@@ -149,11 +149,11 @@ export async function load({
   config,
   options,
   logger,
-}: {|
-  config: Config,
-  options: PluginOptions,
-  logger: PluginLogger,
-|}): Promise<?ConfigResult> {
+}: {
+  config: Config;
+  options: PluginOptions;
+  logger: PluginLogger;
+}): Promise<ConfigResult | null | undefined> {
   if (!config.isSource) {
     return;
   }

package/src/{loadPlugins.js → loadPlugins.ts}

@@ -1,13 +1,18 @@
-// @flow
-
-import type {FilePath, PluginOptions} from '@atlaspack/types';
-import type {PackageManager} from '@atlaspack/package-manager';
+import type {
+  FilePath,
+  PluginOptions,
+  PackageManager,
+} from '@atlaspack/types-internal';
 
 export default async function loadExternalPlugins(
-  plugins: Array<string> | {|+[pluginName: string]: mixed|},
+  plugins:
+    | Array<string>
+    | {
+        readonly [pluginName: string]: unknown;
+      },
   relative: FilePath,
   options: PluginOptions,
-): Promise<Array<mixed>> {
+): Promise<Array<unknown>> {
   if (Array.isArray(plugins)) {
     return Promise.all(
       plugins
@@ -42,12 +47,13 @@ export default async function loadExternalPlugins(
 }
 
 async function loadPlugin(
-  pluginArg: string | Function,
+  pluginArg: string | any,
   relative: FilePath,
-  options: mixed = {},
+  options: unknown | null | undefined = {},
   packageManager: PackageManager,
   shouldAutoInstall: boolean,
-): mixed {
+  // @ts-expect-error TS1064
+): unknown {
   if (typeof pluginArg !== 'string') {
     return pluginArg;
   }

package/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/rust/tsconfig.json"
+    },
+    {
+      "path": "../../core/types-internal/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    }
+  ]
+}