@atlaspack/transformer-css 2.14.5-canary.137 → 2.14.5-canary.139

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaspack/transformer-css
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/plugin@2.14.21
+
 ## 2.14.20
 
 ### Patch Changes

package/lib/CSSTransformer.d.ts

@@ -0,0 +1,3 @@
+import { Transformer } from '@atlaspack/plugin';
+declare const _default: Transformer<unknown>;
+export default _default;

package/lib/CSSTransformer.js

@@ -78,15 +78,27 @@ var _default = exports.default = new (_plugin().Transformer)({
       packageKey: '@atlaspack/transformer-css'
     });
     let contents = conf === null || conf === void 0 ? void 0 : conf.contents;
+    // @ts-expect-error TS2339
     if (typeof (contents === null || contents === void 0 || (_contents$cssModules = contents.cssModules) === null || _contents$cssModules === void 0 ? void 0 : _contents$cssModules.include) === 'string') {
+      // @ts-expect-error TS2339
       contents.cssModules.include = [(0, _utils().globToRegex)(contents.cssModules.include)];
+      // @ts-expect-error TS2339
     } else if (Array.isArray(contents === null || contents === void 0 || (_contents$cssModules2 = contents.cssModules) === null || _contents$cssModules2 === void 0 ? void 0 : _contents$cssModules2.include)) {
-      contents.cssModules.include = contents.cssModules.include.map(include => typeof include === 'string' ? (0, _utils().globToRegex)(include) : include);
+      // @ts-expect-error TS2339
+      contents.cssModules.include = contents.cssModules.include.map(
+      // @ts-expect-error TS7006
+      include => typeof include === 'string' ? (0, _utils().globToRegex)(include) : include);
     }
+    // @ts-expect-error TS2339
     if (typeof (contents === null || contents === void 0 || (_contents$cssModules3 = contents.cssModules) === null || _contents$cssModules3 === void 0 ? void 0 : _contents$cssModules3.exclude) === 'string') {
+      // @ts-expect-error TS2339
       contents.cssModules.exclude = [(0, _utils().globToRegex)(contents.cssModules.exclude)];
+      // @ts-expect-error TS2339
     } else if (Array.isArray(contents === null || contents === void 0 || (_contents$cssModules4 = contents.cssModules) === null || _contents$cssModules4 === void 0 ? void 0 : _contents$cssModules4.exclude)) {
-      contents.cssModules.exclude = contents.cssModules.exclude.map(exclude => typeof exclude === 'string' ? (0, _utils().globToRegex)(exclude) : exclude);
+      // @ts-expect-error TS2339
+      contents.cssModules.exclude = contents.cssModules.exclude.map(
+      // @ts-expect-error TS7006
+      exclude => typeof exclude === 'string' ? (0, _utils().globToRegex)(exclude) : exclude);
     }
     return contents;
   },
@@ -109,7 +121,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       sourceMap: asset.env.sourceMap
     });
     let [code, originalMap] = await Promise.all([asset.getBuffer(), asset.getMap(),
-    // $FlowFixMe native.default is the init function only when bundled for the browser build
+    // @ts-expect-error TS2339
     process.browser && native().default()]);
     let targets = getTargets(asset.env.engines.browsers);
     let res;
@@ -118,14 +130,14 @@ var _default = exports.default = new (_plugin().Transformer)({
         res = transformStyleAttribute({
           code,
           analyzeDependencies: true,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           errorRecovery: (config === null || config === void 0 ? void 0 : config.errorRecovery) || false,
           targets
         });
       } else {
         let cssModules = false;
         if (asset.meta.type !== 'tag' && asset.meta.cssModulesCompiled == null) {
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           let cssModulesConfig = config === null || config === void 0 ? void 0 : config.cssModules;
           let isCSSModule = /\.module\./.test(asset.filePath);
           if (asset.isSource) {
@@ -134,6 +146,7 @@ var _default = exports.default = new (_plugin().Transformer)({
             if (typeof cssModulesConfig === 'boolean') {
               isCSSModule = true;
             } else if (cssModulesConfig !== null && cssModulesConfig !== void 0 && cssModulesConfig.include) {
+              // @ts-expect-error TS7006
               isCSSModule = cssModulesConfig.include.some(include => include.test(projectRootPath));
             } else if (cssModulesConfig !== null && cssModulesConfig !== void 0 && cssModulesConfig.global) {
               isCSSModule = true;
@@ -157,11 +170,11 @@ var _default = exports.default = new (_plugin().Transformer)({
             preserveImports: true
           } : false,
           sourceMap: !!asset.env.sourceMap,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           drafts: config === null || config === void 0 ? void 0 : config.drafts,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           pseudoClasses: config === null || config === void 0 ? void 0 : config.pseudoClasses,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           errorRecovery: (config === null || config === void 0 ? void 0 : config.errorRecovery) || false,
           targets
         });
@@ -201,7 +214,10 @@ var _default = exports.default = new (_plugin().Transformer)({
         });
       }
     }
+
+    // @ts-expect-error TS2339
     if (res.map != null) {
+      // @ts-expect-error TS2339
       let vlqMap = JSON.parse(Buffer.from(res.map).toString());
       let map = new (_sourceMap().default)(options.projectRoot);
       map.addVLQMap(vlqMap);
@@ -216,6 +232,8 @@ var _default = exports.default = new (_plugin().Transformer)({
         if (originalMap) {
           loc = (0, _utils().remapSourceLocation)(loc, originalMap);
         }
+
+        // @ts-expect-error TS2339
         if (dep.type === 'import' && !res.exports) {
           asset.addDependency({
             specifier: dep.url,
@@ -241,9 +259,13 @@ var _default = exports.default = new (_plugin().Transformer)({
     }
     let assets = [asset];
     let buffer = Buffer.from(res.code);
+
+    // @ts-expect-error TS2339
     if (res.exports != null) {
+      // @ts-expect-error TS2339
       let exports = res.exports;
       asset.symbols.ensure();
+      // @ts-expect-error TS2345
       asset.symbols.set('default', 'default');
       let dependencies = new Map();
       let locals = new Map();
@@ -306,6 +328,7 @@ var _default = exports.default = new (_plugin().Transformer)({
           asset.addDependency({
             specifier: (0, _nullthrows().default)(asset.uniqueKey),
             specifierType: 'esm',
+            // @ts-expect-error TS2322
             symbols: new Map([[key, {
               local: exports[key].name,
               isWeak: false,
@@ -319,6 +342,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       // It's possible that the exports can be ordered differently between builds.
       // Sorting by key is safe as the order is irrelevant but needs to be deterministic.
       for (let key of Object.keys(exports).sort()) {
+        // @ts-expect-error TS2345
         asset.symbols.set(key, exports[key].name);
         add(key);
       }
@@ -329,11 +353,15 @@ var _default = exports.default = new (_plugin().Transformer)({
             let d = `dep_$${c++}`;
             depjs += `import * as ${d} from ${JSON.stringify(dep.url)};\n`;
             js += `for (let key in ${d}) { if (key in module.exports) module.exports[key] += ' ' + ${d}[key]; else module.exports[key] = ${d}[key]; }\n`;
+            // @ts-expect-error TS2345
             asset.symbols.set('*', '*');
           }
         }
       }
+
+      // @ts-expect-error TS2339
       if (res.references != null) {
+        // @ts-expect-error TS2339
         let references = res.references;
         for (let symbol in references) {
           let reference = references[symbol];
@@ -341,6 +369,7 @@ var _default = exports.default = new (_plugin().Transformer)({
             specifier: reference.specifier,
             specifierType: 'esm',
             packageConditions: ['style'],
+            // @ts-expect-error TS2322
             symbols: new Map([[reference.name, {
               local: symbol,
               isWeak: false,
@@ -353,6 +382,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       }
       assets.push({
         type: 'js',
+        // @ts-expect-error TS2353
         content: depjs + js,
         dependencies: jsDeps,
         env

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-css",
-  "version": "2.14.5-canary.137+069de478e",
+  "version": "2.14.5-canary.139+d2fd84977",
   "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/CSSTransformer.js",
-  "source": "src/CSSTransformer.js",
+  "main": "./lib/CSSTransformer.js",
+  "source": "./src/CSSTransformer.ts",
+  "types": "./lib/CSSTransformer.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.205+069de478e",
-    "@atlaspack/plugin": "2.14.5-canary.137+069de478e",
-    "@atlaspack/utils": "2.14.5-canary.137+069de478e",
+    "@atlaspack/diagnostic": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "@parcel/source-map": "^2.1.1",
     "browserslist": "^4.6.6",
     "lightningcss": "^1.28.2",
@@ -30,5 +31,8 @@
     "lightningcss": "lightningcss-wasm"
   },
   "type": "commonjs",
-  "gitHead": "069de478e64fb5889f6f2ce023eb510782767fbd"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import type {SourceLocation} from '@atlaspack/types';
 
 import path from 'path';
@@ -11,7 +9,7 @@ import {
   globToRegex,
   normalizeSeparators,
 } from '@atlaspack/utils';
-import {type SourceLocation as LightningSourceLocation} from 'lightningcss';
+import {SourceLocation as LightningSourceLocation} from 'lightningcss';
 import * as native from 'lightningcss';
 import browserslist from 'browserslist';
 import nullthrows from 'nullthrows';
@@ -19,24 +17,36 @@ import ThrowableDiagnostic, {errorToDiagnostic} from '@atlaspack/diagnostic';
 
 const {transform, transformStyleAttribute, browserslistToTargets} = native;
 
-export default (new Transformer({
+export default new Transformer({
   async loadConfig({config, options}) {
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey: '@atlaspack/transformer-css',
     });
     let contents = conf?.contents;
+    // @ts-expect-error TS2339
     if (typeof contents?.cssModules?.include === 'string') {
+      // @ts-expect-error TS2339
       contents.cssModules.include = [globToRegex(contents.cssModules.include)];
+      // @ts-expect-error TS2339
     } else if (Array.isArray(contents?.cssModules?.include)) {
-      contents.cssModules.include = contents.cssModules.include.map((include) =>
-        typeof include === 'string' ? globToRegex(include) : include,
+      // @ts-expect-error TS2339
+      contents.cssModules.include = contents.cssModules.include.map(
+        // @ts-expect-error TS7006
+        (include) =>
+          typeof include === 'string' ? globToRegex(include) : include,
       );
     }
+    // @ts-expect-error TS2339
     if (typeof contents?.cssModules?.exclude === 'string') {
+      // @ts-expect-error TS2339
       contents.cssModules.exclude = [globToRegex(contents.cssModules.exclude)];
+      // @ts-expect-error TS2339
     } else if (Array.isArray(contents?.cssModules?.exclude)) {
-      contents.cssModules.exclude = contents.cssModules.exclude.map((exclude) =>
-        typeof exclude === 'string' ? globToRegex(exclude) : exclude,
+      // @ts-expect-error TS2339
+      contents.cssModules.exclude = contents.cssModules.exclude.map(
+        // @ts-expect-error TS7006
+        (exclude) =>
+          typeof exclude === 'string' ? globToRegex(exclude) : exclude,
       );
     }
     return contents;
@@ -58,7 +68,7 @@ export default (new Transformer({
     let [code, originalMap] = await Promise.all([
       asset.getBuffer(),
       asset.getMap(),
-      // $FlowFixMe native.default is the init function only when bundled for the browser build
+      // @ts-expect-error TS2339
       process.browser && native.default(),
     ]);
 
@@ -69,7 +79,7 @@ export default (new Transformer({
         res = transformStyleAttribute({
           code,
           analyzeDependencies: true,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           errorRecovery: config?.errorRecovery || false,
           targets,
         });
@@ -79,7 +89,7 @@ export default (new Transformer({
           asset.meta.type !== 'tag' &&
           asset.meta.cssModulesCompiled == null
         ) {
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           let cssModulesConfig = config?.cssModules;
           let isCSSModule = /\.module\./.test(asset.filePath);
           if (asset.isSource) {
@@ -90,6 +100,7 @@ export default (new Transformer({
             if (typeof cssModulesConfig === 'boolean') {
               isCSSModule = true;
             } else if (cssModulesConfig?.include) {
+              // @ts-expect-error TS7006
               isCSSModule = cssModulesConfig.include.some((include) =>
                 include.test(projectRootPath),
               );
@@ -98,7 +109,7 @@ export default (new Transformer({
             }
 
             if (
-              cssModulesConfig?.exclude?.some((exclude) =>
+              cssModulesConfig?.exclude?.some((exclude: any) =>
                 exclude.test(projectRootPath),
               )
             ) {
@@ -128,16 +139,16 @@ export default (new Transformer({
                 }
               : false,
           sourceMap: !!asset.env.sourceMap,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           drafts: config?.drafts,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           pseudoClasses: config?.pseudoClasses,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           errorRecovery: config?.errorRecovery || false,
           targets,
         });
       }
-    } catch (err) {
+    } catch (err: any) {
       err.filePath = asset.filePath;
       let diagnostic = errorToDiagnostic(err, {
         origin: '@atlaspack/transformer-css',
@@ -185,7 +196,9 @@ export default (new Transformer({
       }
     }
 
+    // @ts-expect-error TS2339
     if (res.map != null) {
+      // @ts-expect-error TS2339
       let vlqMap = JSON.parse(Buffer.from(res.map).toString());
       let map = new SourceMap(options.projectRoot);
       map.addVLQMap(vlqMap);
@@ -204,6 +217,7 @@ export default (new Transformer({
           loc = remapSourceLocation(loc, originalMap);
         }
 
+        // @ts-expect-error TS2339
         if (dep.type === 'import' && !res.exports) {
           asset.addDependency({
             specifier: dep.url,
@@ -231,9 +245,12 @@ export default (new Transformer({
     let assets = [asset];
     let buffer = Buffer.from(res.code);
 
+    // @ts-expect-error TS2339
     if (res.exports != null) {
+      // @ts-expect-error TS2339
       let exports = res.exports;
       asset.symbols.ensure();
+      // @ts-expect-error TS2345
       asset.symbols.set('default', 'default');
 
       let dependencies = new Map();
@@ -243,7 +260,7 @@ export default (new Transformer({
       let js = '';
       let cssImports = '';
 
-      let jsDeps = [];
+      let jsDeps: Array<never> = [];
 
       for (let key in exports) {
         locals.set(exports[key].name, key);
@@ -252,7 +269,7 @@ export default (new Transformer({
       asset.uniqueKey ??= asset.id;
 
       let seen = new Set();
-      let add = (key) => {
+      let add = (key: string) => {
         if (seen.has(key)) {
           return;
         }
@@ -304,6 +321,7 @@ export default (new Transformer({
           asset.addDependency({
             specifier: nullthrows(asset.uniqueKey),
             specifierType: 'esm',
+            // @ts-expect-error TS2322
             symbols: new Map([
               [key, {local: exports[key].name, isWeak: false, loc: null}],
             ]),
@@ -316,6 +334,7 @@ export default (new Transformer({
       // It's possible that the exports can be ordered differently between builds.
       // Sorting by key is safe as the order is irrelevant but needs to be deterministic.
       for (let key of Object.keys(exports).sort()) {
+        // @ts-expect-error TS2345
         asset.symbols.set(key, exports[key].name);
         add(key);
       }
@@ -327,12 +346,15 @@ export default (new Transformer({
             let d = `dep_$${c++}`;
             depjs += `import * as ${d} from ${JSON.stringify(dep.url)};\n`;
             js += `for (let key in ${d}) { if (key in module.exports) module.exports[key] += ' ' + ${d}[key]; else module.exports[key] = ${d}[key]; }\n`;
+            // @ts-expect-error TS2345
             asset.symbols.set('*', '*');
           }
         }
       }
 
+      // @ts-expect-error TS2339
       if (res.references != null) {
+        // @ts-expect-error TS2339
         let references = res.references;
         for (let symbol in references) {
           let reference = references[symbol];
@@ -340,6 +362,7 @@ export default (new Transformer({
             specifier: reference.specifier,
             specifierType: 'esm',
             packageConditions: ['style'],
+            // @ts-expect-error TS2322
             symbols: new Map([
               [reference.name, {local: symbol, isWeak: false, loc: null}],
             ]),
@@ -352,6 +375,7 @@ export default (new Transformer({
 
       assets.push({
         type: 'js',
+        // @ts-expect-error TS2353
         content: depjs + js,
         dependencies: jsDeps,
         env,
@@ -366,11 +390,11 @@ export default (new Transformer({
     asset.setBuffer(buffer);
     return assets;
   },
-}): Transformer<mixed>);
+}) as Transformer<unknown>;
 
 let cache = new Map();
 
-function getTargets(browsers) {
+function getTargets(browsers: undefined | string | Array<string>) {
   if (browsers == null) {
     return undefined;
   }

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}