@atlaspack/packager-css 2.14.5-canary.25 → 2.14.5-canary.250

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-css",
-  "version": "2.14.5-canary.25+b8a4ae8f8",
+  "version": "2.14.5-canary.250+9cd952197",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,15 +9,17 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/CSSPackager.js",
-  "source": "src/CSSPackager.js",
+  "main": "./lib/CSSPackager.js",
+  "source": "./src/CSSPackager.ts",
+  "types": "./lib/types/CSSPackager.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.93+b8a4ae8f8",
-    "@atlaspack/plugin": "2.14.5-canary.25+b8a4ae8f8",
-    "@atlaspack/utils": "2.14.5-canary.25+b8a4ae8f8",
+    "@atlaspack/diagnostic": "2.14.1-canary.318+9cd952197",
+    "@atlaspack/plugin": "2.14.5-canary.250+9cd952197",
+    "@atlaspack/types-internal": "2.14.1-canary.318+9cd952197",
+    "@atlaspack/utils": "2.14.5-canary.250+9cd952197",
     "@parcel/source-map": "^2.1.1",
     "lightningcss": "^1.28.2",
     "nullthrows": "^1.1.1"
@@ -30,5 +32,8 @@
     "lightningcss": "lightningcss-wasm"
   },
   "type": "commonjs",
-  "gitHead": "b8a4ae8f83dc0a83d8b145c5f729936ce52080a3"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "9cd9521978f783046e2ae4ce78f2de7aeb07d073"
+}

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

@@ -1,9 +1,6 @@
-// @flow
-
 import type {Root} from 'postcss';
-import type {Asset, Dependency} from '@atlaspack/types';
-import typeof PostCSS from 'postcss';
-// $FlowFixMe - init for browser build.
+import type {Asset, Dependency} from '@atlaspack/types-internal';
+import PostCSS from 'postcss';
 import init, {bundleAsync} from 'lightningcss';
 
 import invariant from 'assert';
@@ -17,7 +14,7 @@ import {
   replaceURLReferences,
 } from '@atlaspack/utils';
 
-export default (new Packager({
+export default new Packager({
   async package({
     bundle,
     bundleGraph,
@@ -43,8 +40,10 @@ export default (new Packager({
     let queue = new PromiseQueue({
       maxConcurrent: 32,
     });
-    let hoistedImports = [];
+    // @ts-expect-error TS2304
+    let hoistedImports: Array<DependencySpecifier> = [];
     let assetsByPlaceholder = new Map();
+    // @ts-expect-error TS7034
     let entry = null;
     let entryContents = '';
 
@@ -53,6 +52,7 @@ export default (new Packager({
         if (node.type === 'asset' && !context) {
           // If there is only one entry, we'll use it directly.
           // Otherwise, we'll create a fake bundle entry with @import rules for each root asset.
+          // @ts-expect-error TS7005
           if (entry == null) {
             entry = node.value.id;
           } else {
@@ -145,23 +145,29 @@ export default (new Packager({
     });
 
     let outputs = new Map(
-      (await queue.run()).map(([asset, code, map]) => [asset, [code, map]]),
+      // @ts-expect-error TS2345
+      (await queue.run()).map(([asset, code, map]: [any, any, any]) => [
+        asset,
+        [code, map],
+      ]),
     );
     let map = new SourceMap(options.projectRoot);
 
-    // $FlowFixMe
+    // @ts-expect-error TS2339
     if (process.browser) {
+      // @ts-expect-error TS2349
       await init();
     }
 
     let res = await bundleAsync({
+      // @ts-expect-error TS2322
       filename: nullthrows(entry),
       sourceMap: !!bundle.env.sourceMap,
       resolver: {
-        resolve(specifier) {
+        resolve(specifier: string) {
           return specifier;
         },
-        async read(file) {
+        async read(file: string) {
           if (file === bundle.id) {
             return entryContents;
           }
@@ -216,14 +222,25 @@ export default (new Packager({
       getInlineBundleContents,
     );
   },
-}): Packager);
+}) as Packager<unknown, unknown>;
 
 function replaceReferences(
-  bundle,
-  bundleGraph,
-  contents,
-  map,
-  getInlineBundleContents,
+  // @ts-expect-error TS2304
+  bundle: NamedBundle,
+  // @ts-expect-error TS2304
+  bundleGraph: BundleGraph<NamedBundle>,
+  contents: string,
+  // @ts-expect-error TS2552
+  map: NodeSourceMap | null | undefined,
+  getInlineBundleContents: (
+    // @ts-expect-error TS2304
+    arg1: Bundle,
+    // @ts-expect-error TS2304
+    arg2: BundleGraph<NamedBundle>,
+    // @ts-expect-error TS2304
+  ) => Async<{
+    contents: Blob;
+  }>,
 ) {
   ({contents, map} = replaceURLReferences({
     bundle,
@@ -259,12 +276,17 @@ function escapeString(contents: string): string {
 }
 
 async function processCSSModule(
-  options,
-  logger,
-  bundleGraph,
-  bundle,
-  asset,
-): Promise<[Asset, string, ?SourceMap]> {
+  // @ts-expect-error TS2552
+  options: PluginOptions,
+  // @ts-expect-error TS2304
+  logger: PluginLogger,
+  // @ts-expect-error TS2304
+  bundleGraph: BundleGraph<NamedBundle>,
+  // @ts-expect-error TS2304
+  bundle: NamedBundle,
+  asset: Asset,
+): Promise<[Asset, string, SourceMap | null | undefined]> {
+  // @ts-expect-error TS2709
   let postcss: PostCSS = await options.packageManager.require(
     'postcss',
     options.projectRoot + '/index',
@@ -280,12 +302,13 @@ async function processCSSModule(
   let usedSymbols = bundleGraph.getUsedSymbols(asset);
   if (usedSymbols != null) {
     let localSymbols = new Set(
-      [...asset.symbols].map(([, {local}]) => `.${local}`),
+      [...asset.symbols].map(([, {local}]: [any, any]) => `.${local}`),
     );
 
     let defaultImport = null;
     if (usedSymbols.has('default')) {
       let incoming = bundleGraph.getIncomingDependencies(asset);
+      // @ts-expect-error TS7006
       defaultImport = incoming.find((d) =>
         d.symbols.hasExportSymbol('default'),
       );
@@ -349,9 +372,10 @@ async function processCSSModule(
   return [asset, content, sourceMap];
 }
 
-function escapeDashedIdent(name) {
+function escapeDashedIdent(name: symbol | string) {
   // https://drafts.csswg.org/cssom/#serialize-an-identifier
   let res = '';
+  // @ts-expect-error TS2488
   for (let c of name) {
     let code = c.codePointAt(0);
     if (code === 0) {

package/tsconfig.json

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