@atlaspack/packager-css 2.14.5-canary.14 → 2.14.5-canary.141

package/CHANGELOG.md

@@ -1,5 +1,135 @@
 # @atlaspack/packager-css
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/plugin@2.14.21
+
+## 2.14.20
+
+### Patch Changes
+
+- [#702](https://github.com/atlassian-labs/atlaspack/pull/702) [`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa) Thanks [@alshdavid](https://github.com/alshdavid)! - Fixes to Flow types
+
+- Updated dependencies [[`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa)]:
+  - @atlaspack/plugin@2.14.20
+  - @atlaspack/utils@2.17.2
+
+## 2.14.19
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.17.1
+  - @atlaspack/plugin@2.14.19
+
+## 2.14.18
+
+### Patch Changes
+
+- Updated dependencies [[`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d), [`de23e0c`](https://github.com/atlassian-labs/atlaspack/commit/de23e0ce49d5504fe3947ac26640a3d951087da3), [`18a57cf`](https://github.com/atlassian-labs/atlaspack/commit/18a57cf8a4789b2de5ad8e2676f317a26cc91417), [`a5ed1b4`](https://github.com/atlassian-labs/atlaspack/commit/a5ed1b414498560f393ff491af4da25b6e8dde56)]:
+  - @atlaspack/utils@2.17.0
+  - @atlaspack/plugin@2.14.18
+
+## 2.14.17
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.16.1
+  - @atlaspack/plugin@2.14.17
+
+## 2.14.16
+
+### Patch Changes
+
+- Updated dependencies [[`30ee2cf`](https://github.com/atlassian-labs/atlaspack/commit/30ee2cfcd34cf2646ded0eda13fdb80a2a5de529)]:
+  - @atlaspack/utils@2.16.0
+  - @atlaspack/plugin@2.14.16
+
+## 2.14.15
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.15.3
+  - @atlaspack/plugin@2.14.15
+
+## 2.14.14
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.15.2
+  - @atlaspack/plugin@2.14.14
+
+## 2.14.13
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/plugin@2.14.13
+
+## 2.14.12
+
+### Patch Changes
+
+- Updated dependencies [[`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
+  - @atlaspack/utils@2.15.0
+  - @atlaspack/plugin@2.14.12
+
+## 2.14.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.11
+  - @atlaspack/plugin@2.14.11
+
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/plugin@2.14.10
+  - @atlaspack/utils@2.14.10
+
+## 2.14.9
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.9
+  - @atlaspack/plugin@2.14.9
+
+## 2.14.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.8
+  - @atlaspack/plugin@2.14.8
+
+## 2.14.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.7
+  - @atlaspack/plugin@2.14.7
+
+## 2.14.6
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.6
+  - @atlaspack/plugin@2.14.6
+
 ## 2.14.5
 
 ### Patch Changes

package/lib/CSSPackager.d.ts

@@ -0,0 +1,5 @@
+import type { Dependency } from '@atlaspack/types';
+import { Packager } from '@atlaspack/plugin';
+declare const _default: Packager<unknown, unknown>;
+export default _default;
+export declare function getSpecifier(dep: Dependency): string;

package/lib/CSSPackager.js

@@ -57,7 +57,6 @@ function _utils() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// $FlowFixMe - init for browser build.
 var _default = exports.default = new (_plugin().Packager)({
   async package({
     bundle,
@@ -77,8 +76,10 @@ var _default = exports.default = new (_plugin().Packager)({
     let queue = new (_utils().PromiseQueue)({
       maxConcurrent: 32
     });
+    // @ts-expect-error TS2304
     let hoistedImports = [];
     let assetsByPlaceholder = new Map();
+    // @ts-expect-error TS7034
     let entry = null;
     let entryContents = '';
     bundle.traverse({
@@ -86,6 +87,7 @@ var _default = exports.default = new (_plugin().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 {
@@ -144,14 +146,18 @@ var _default = exports.default = new (_plugin().Packager)({
         });
       }
     });
-    let outputs = new Map((await queue.run()).map(([asset, code, map]) => [asset, [code, map]]));
+    let outputs = new Map(
+    // @ts-expect-error TS2345
+    (await queue.run()).map(([asset, code, map]) => [asset, [code, map]]));
     let map = new (_sourceMap().default)(options.projectRoot);
 
-    // $FlowFixMe
+    // @ts-expect-error TS2339
     if (process.browser) {
+      // @ts-expect-error TS2349
       await (0, _lightningcss().default)();
     }
     let res = await (0, _lightningcss().bundleAsync)({
+      // @ts-expect-error TS2322
       filename: (0, _nullthrows().default)(entry),
       sourceMap: !!bundle.env.sourceMap,
       resolver: {
@@ -204,7 +210,13 @@ var _default = exports.default = new (_plugin().Packager)({
     return replaceReferences(bundle, bundleGraph, contents, map, getInlineBundleContents);
   }
 });
-function replaceReferences(bundle, bundleGraph, contents, map, getInlineBundleContents) {
+function replaceReferences(
+// @ts-expect-error TS2304
+bundle,
+// @ts-expect-error TS2304
+bundleGraph, contents,
+// @ts-expect-error TS2552
+map, getInlineBundleContents) {
   ({
     contents,
     map
@@ -236,8 +248,17 @@ function getSpecifier(dep) {
 function escapeString(contents) {
   return contents.replace(/(["\\])/g, '\\$1');
 }
-async function processCSSModule(options, logger, bundleGraph, bundle, asset) {
+async function processCSSModule(
+// @ts-expect-error TS2552
+options,
+// @ts-expect-error TS2304
+logger,
+// @ts-expect-error TS2304
+bundleGraph,
+// @ts-expect-error TS2304
+bundle, asset) {
   var _await$asset$getAST;
+  // @ts-expect-error TS2709
   let postcss = await options.packageManager.require('postcss', options.projectRoot + '/index', {
     range: '^8.4.5',
     saveDev: true,
@@ -252,6 +273,7 @@ async function processCSSModule(options, logger, bundleGraph, bundle, asset) {
     let defaultImport = null;
     if (usedSymbols.has('default')) {
       let incoming = bundleGraph.getIncomingDependencies(asset);
+      // @ts-expect-error TS7006
       defaultImport = incoming.find(d => d.symbols.hasExportSymbol('default'));
       if (defaultImport) {
         var _defaultImport$symbol;
@@ -270,7 +292,9 @@ async function processCSSModule(options, logger, bundleGraph, bundle, asset) {
       }
     }
     if (!defaultImport && !usedSymbols.has('*')) {
-      let usedLocalSymbols = new Set([...usedSymbols].map(exportSymbol => `.${(0, _nullthrows().default)(asset.symbols.get(exportSymbol)).local}`));
+      let usedLocalSymbols = new Set([...usedSymbols].map(exportSymbol =>
+      // @ts-expect-error TS2731
+      `.${(0, _nullthrows().default)(asset.symbols.get(exportSymbol)).local}`));
       ast.walkRules(rule => {
         if (localSymbols.has(rule.selector) && !usedLocalSymbols.has(rule.selector)) {
           rule.remove();
@@ -302,6 +326,7 @@ async function processCSSModule(options, logger, bundleGraph, bundle, asset) {
 function escapeDashedIdent(name) {
   // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-css",
-  "version": "2.14.5-canary.14+267b0d591",
+  "version": "2.14.5-canary.141+2f29297bd",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,15 +9,16 @@
     "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/CSSPackager.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.82+267b0d591",
-    "@atlaspack/plugin": "2.14.5-canary.14+267b0d591",
-    "@atlaspack/utils": "2.14.5-canary.14+267b0d591",
+    "@atlaspack/diagnostic": "2.14.1-canary.209+2f29297bd",
+    "@atlaspack/plugin": "2.14.5-canary.141+2f29297bd",
+    "@atlaspack/utils": "2.14.5-canary.141+2f29297bd",
     "@parcel/source-map": "^2.1.1",
     "lightningcss": "^1.28.2",
     "nullthrows": "^1.1.1"
@@ -30,5 +31,8 @@
     "lightningcss": "lightningcss-wasm"
   },
   "type": "commonjs",
-  "gitHead": "267b0d59131c00e4cd1526bbf87aa84b9c8fd411"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "2f29297bd550840c9840871559349ef773bcbf6d"
+}

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 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'),
       );
@@ -314,6 +337,7 @@ async function processCSSModule(
       let usedLocalSymbols = new Set(
         [...usedSymbols].map(
           (exportSymbol) =>
+            // @ts-expect-error TS2731
             `.${nullthrows(asset.symbols.get(exportSymbol)).local}`,
         ),
       );
@@ -349,9 +373,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,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}