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

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaspack/transformer-sass
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/plugin@2.14.21
+
 ## 2.14.20
 
 ### Patch Changes

package/lib/SassTransformer.d.ts

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

package/lib/SassTransformer.js

@@ -47,6 +47,8 @@ function _util() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS7016
+
 // E.g: ~library/file.sass
 const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
 var _default = exports.default = new (_plugin().Transformer)({
@@ -67,20 +69,31 @@ var _default = exports.default = new (_plugin().Transformer)({
     }
 
     // Resolve relative paths from config file
+    // @ts-expect-error TS18046
     if (configFile && configResult.includePaths) {
+      // @ts-expect-error TS18046
       configResult.includePaths = configResult.includePaths.map(p => _path().default.resolve(_path().default.dirname(configFile.filePath), p));
     }
+
+    // @ts-expect-error TS18046
     if (configResult.importer === undefined) {
+      // @ts-expect-error TS18046
       configResult.importer = [];
+      // @ts-expect-error TS18046
     } else if (!Array.isArray(configResult.importer)) {
+      // @ts-expect-error TS18046
       configResult.importer = [configResult.importer];
     }
 
     // Always emit sourcemap
+    // @ts-expect-error TS18046
     configResult.sourceMap = true;
     // sources are created relative to the directory of outFile
+    // @ts-expect-error TS18046
     configResult.outFile = _path().default.join(options.projectRoot, 'style.css.map');
+    // @ts-expect-error TS18046
     configResult.omitSourceMapUrl = true;
+    // @ts-expect-error TS18046
     configResult.sourceMapContents = false;
     return configResult;
   },
@@ -98,18 +111,22 @@ var _default = exports.default = new (_plugin().Transformer)({
       let result = await sassRender({
         ...rawConfig,
         file: asset.filePath,
-        // $FlowFixMe
+        // @ts-expect-error TS2339
         data: rawConfig.data ? rawConfig.data + _os().EOL + code : code,
         importer: [
-        // $FlowFixMe
+        // @ts-expect-error TS2339
         ...rawConfig.importer, resolvePathImporter({
           asset,
           resolve,
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           includePaths: rawConfig.includePaths,
           options
         })],
-        indentedSyntax: typeof rawConfig.indentedSyntax === 'boolean' ? rawConfig.indentedSyntax : asset.type === 'sass'
+        indentedSyntax:
+        // @ts-expect-error TS2339
+        typeof rawConfig.indentedSyntax === 'boolean' ?
+        // @ts-expect-error TS2339
+        rawConfig.indentedSyntax : asset.type === 'sass'
       });
       css = result.css;
       for (let included of result.stats.includedFiles) {
@@ -135,7 +152,7 @@ var _default = exports.default = new (_plugin().Transformer)({
     asset.setCode(css);
     return [asset];
   }
-});
+}); // @ts-expect-error TS7031
 function resolvePathImporter({
   asset,
   resolve,
@@ -162,7 +179,9 @@ function resolvePathImporter({
     }
     asset.invalidateOnEnvChange('SASS_PATH');
     if (options.env.SASS_PATH) {
-      paths.push(...options.env.SASS_PATH.split(process.platform === 'win32' ? ';' : ':').map(p => _path().default.resolve(options.projectRoot, p)));
+      paths.push(...options.env.SASS_PATH.split(process.platform === 'win32' ? ';' : ':'
+      // @ts-expect-error TS7006
+      ).map(p => _path().default.resolve(options.projectRoot, p)));
     }
     const urls = [url];
     const urlFileName = _path().default.basename(url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-sass",
-  "version": "2.14.5-canary.137+069de478e",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,16 +9,20 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/SassTransformer.js",
-  "source": "src/SassTransformer.js",
+  "main": "./lib/SassTransformer.js",
+  "source": "./src/SassTransformer.ts",
+  "types": "./lib/SassTransformer.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.137+069de478e",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
     "@parcel/source-map": "^2.1.1",
     "sass": "^1.38.0"
   },
   "type": "commonjs",
-  "gitHead": "069de478e64fb5889f6f2ce023eb510782767fbd"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,15 +1,15 @@
-// @flow
 import {Transformer} from '@atlaspack/plugin';
 import path from 'path';
 import {EOL} from 'os';
 import SourceMap from '@parcel/source-map';
+// @ts-expect-error TS7016
 import sass from 'sass';
 import {promisify} from 'util';
 
 // E.g: ~library/file.sass
 const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
 
-export default (new Transformer({
+export default new Transformer({
   async loadConfig({config, options}) {
     let configFile = await config.getConfig(
       ['.sassrc', '.sassrc.json', '.sassrc.js', '.sassrc.cjs', '.sassrc.mjs'],
@@ -28,23 +28,33 @@ export default (new Transformer({
     }
 
     // Resolve relative paths from config file
+    // @ts-expect-error TS18046
     if (configFile && configResult.includePaths) {
+      // @ts-expect-error TS18046
       configResult.includePaths = configResult.includePaths.map((p) =>
         path.resolve(path.dirname(configFile.filePath), p),
       );
     }
 
+    // @ts-expect-error TS18046
     if (configResult.importer === undefined) {
+      // @ts-expect-error TS18046
       configResult.importer = [];
+      // @ts-expect-error TS18046
     } else if (!Array.isArray(configResult.importer)) {
+      // @ts-expect-error TS18046
       configResult.importer = [configResult.importer];
     }
 
     // Always emit sourcemap
+    // @ts-expect-error TS18046
     configResult.sourceMap = true;
     // sources are created relative to the directory of outFile
+    // @ts-expect-error TS18046
     configResult.outFile = path.join(options.projectRoot, 'style.css.map');
+    // @ts-expect-error TS18046
     configResult.omitSourceMapUrl = true;
+    // @ts-expect-error TS18046
     configResult.sourceMapContents = false;
 
     return configResult;
@@ -59,22 +69,24 @@ export default (new Transformer({
       let result = await sassRender({
         ...rawConfig,
         file: asset.filePath,
-        // $FlowFixMe
+        // @ts-expect-error TS2339
         data: rawConfig.data ? rawConfig.data + EOL + code : code,
         importer: [
-          // $FlowFixMe
+          // @ts-expect-error TS2339
           ...rawConfig.importer,
           resolvePathImporter({
             asset,
             resolve,
-            // $FlowFixMe
+            // @ts-expect-error TS2339
             includePaths: rawConfig.includePaths,
             options,
           }),
         ],
         indentedSyntax:
+          // @ts-expect-error TS2339
           typeof rawConfig.indentedSyntax === 'boolean'
-            ? rawConfig.indentedSyntax
+            ? // @ts-expect-error TS2339
+              rawConfig.indentedSyntax
             : asset.type === 'sass',
       });
 
@@ -90,7 +102,7 @@ export default (new Transformer({
         map.addVLQMap(JSON.parse(result.map));
         asset.setMap(map);
       }
-    } catch (err) {
+    } catch (err: any) {
       // Adapt the Error object for the reporter.
       err.fileName = err.file;
       err.loc = {
@@ -105,15 +117,22 @@ export default (new Transformer({
     asset.setCode(css);
     return [asset];
   },
-}): Transformer<mixed>);
+}) as Transformer<unknown>;
 
+// @ts-expect-error TS7031
 function resolvePathImporter({asset, resolve, includePaths, options}) {
   // This is a reimplementation of the Sass resolution algorithm that uses Atlaspack's
   // FS and tracks all tried files so they are watched for creation.
   async function resolvePath(
-    url,
-    prev,
-  ): Promise<{filePath: string, contents: string, ...} | void> {
+    url: any,
+    prev: any,
+  ): Promise<
+    | {
+        filePath: string;
+        contents: string;
+      }
+    | undefined
+  > {
     /*
       Imports are resolved by trying, in order:
         * Loading a file relative to the file in which the `@import` appeared.
@@ -136,6 +155,7 @@ function resolvePathImporter({asset, resolve, includePaths, options}) {
       paths.push(
         ...options.env.SASS_PATH.split(
           process.platform === 'win32' ? ';' : ':',
+          // @ts-expect-error TS7006
         ).map((p) => path.resolve(options.projectRoot, p)),
       );
     }
@@ -156,7 +176,7 @@ function resolvePathImporter({asset, resolve, includePaths, options}) {
               filePath,
               contents,
             };
-          } catch (err) {
+          } catch (err: any) {
             asset.invalidateOnFileCreate({filePath});
           }
         }
@@ -176,13 +196,13 @@ function resolvePathImporter({asset, resolve, includePaths, options}) {
           const contents = await asset.fs.readFile(filePath, 'utf8');
           return {filePath, contents};
         }
-      } catch (err) {
+      } catch (err: any) {
         continue;
       }
     }
   }
 
-  return function (rawUrl, prev, done) {
+  return function (rawUrl: any, prev: any, done: any) {
     const url = rawUrl.replace(/^file:\/\//, '');
     resolvePath(url, prev)
       .then((resolved) => {

package/tsconfig.json

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