@parcel/transformer-sass 2.8.3 → 2.9.0

package/lib/SassTransformer.js

@@ -4,105 +4,79 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _plugin() {
   const data = require("@parcel/plugin");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _os() {
   const data = require("os");
-
   _os = function () {
     return data;
   };
-
   return data;
 }
-
 function _sourceMap() {
   const data = _interopRequireDefault(require("@parcel/source-map"));
-
   _sourceMap = function () {
     return data;
   };
-
   return data;
 }
-
 function _sass() {
   const data = _interopRequireDefault(require("sass"));
-
   _sass = function () {
     return data;
   };
-
   return data;
 }
-
 function _util() {
   const data = require("util");
-
   _util = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // E.g: ~library/file.sass
 const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
-
 var _default = new (_plugin().Transformer)({
   async loadConfig({
     config,
     options
   }) {
-    let configFile = await config.getConfig(['.sassrc', '.sassrc.json', '.sassrc.js', '.sassrc.cjs'], {
+    let configFile = await config.getConfig(['.sassrc', '.sassrc.json', '.sassrc.js', '.sassrc.cjs', '.sassrc.mjs'], {
       packageKey: 'sass'
     });
-    let configResult = configFile ? configFile.contents : {}; // Resolve relative paths from config file
+    let configResult = configFile ? configFile.contents : {};
 
+    // Resolve relative paths from config file
     if (configFile && configResult.includePaths) {
       configResult.includePaths = configResult.includePaths.map(p => _path().default.resolve(_path().default.dirname(configFile.filePath), p));
     }
-
-    if (configFile && _path().default.extname(configFile.filePath).endsWith('js')) {
-      config.invalidateOnStartup();
-    }
-
     if (configResult.importer === undefined) {
       configResult.importer = [];
     } else if (!Array.isArray(configResult.importer)) {
       configResult.importer = [configResult.importer];
-    } // Always emit sourcemap
-
-
-    configResult.sourceMap = true; // sources are created relative to the directory of outFile
+    }
 
+    // Always emit sourcemap
+    configResult.sourceMap = true;
+    // sources are created relative to the directory of outFile
     configResult.outFile = _path().default.join(options.projectRoot, 'style.css.map');
     configResult.omitSourceMapUrl = true;
     configResult.sourceMapContents = false;
     return configResult;
   },
-
   async transform({
     asset,
     options,
@@ -112,10 +86,10 @@ var _default = new (_plugin().Transformer)({
     let rawConfig = config !== null && config !== void 0 ? config : {};
     let sassRender = (0, _util().promisify)(_sass().default.render.bind(_sass().default));
     let css;
-
     try {
       let code = await asset.getCode();
-      let result = await sassRender({ ...rawConfig,
+      let result = await sassRender({
+        ...rawConfig,
         file: asset.filePath,
         data: rawConfig.data ? rawConfig.data + _os().EOL + code : code,
         importer: [...rawConfig.importer, resolvePathImporter({
@@ -127,13 +101,11 @@ var _default = new (_plugin().Transformer)({
         indentedSyntax: typeof rawConfig.indentedSyntax === 'boolean' ? rawConfig.indentedSyntax : asset.type === 'sass'
       });
       css = result.css;
-
       for (let included of result.stats.includedFiles) {
         if (included !== asset.filePath) {
           asset.invalidateOnFileChange(included);
         }
       }
-
       if (result.map != null) {
         let map = new (_sourceMap().default)(options.projectRoot);
         map.addVLQMap(JSON.parse(result.map));
@@ -148,16 +120,12 @@ var _default = new (_plugin().Transformer)({
       };
       throw err;
     }
-
     asset.type = 'css';
     asset.setCode(css);
     return [asset];
   }
-
 });
-
 exports.default = _default;
-
 function resolvePathImporter({
   asset,
   resolve,
@@ -177,31 +145,24 @@ function resolvePathImporter({
        See: https://sass-lang.com/documentation/js-api#importer
       See also: https://github.com/sass/dart-sass/blob/006e6aa62f2417b5267ad5cdb5ba050226fab511/lib/src/importer/node/implementation.dart
     */
-    let paths = [_path().default.dirname(prev)];
 
+    let paths = [_path().default.dirname(prev)];
     if (includePaths) {
       paths.push(...includePaths);
     }
-
     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)));
     }
-
     const urls = [url];
-
     const urlFileName = _path().default.basename(url);
-
     if (urlFileName[0] !== '_') {
       urls.push(_path().default.join(_path().default.dirname(url), `_${urlFileName}`));
     }
-
     if (url[0] !== '~') {
       for (let p of paths) {
         for (let u of urls) {
           const filePath = _path().default.resolve(p, u);
-
           try {
             const contents = await asset.fs.readFile(filePath, 'utf8');
             return {
@@ -215,17 +176,17 @@ function resolvePathImporter({
           }
         }
       }
-    } // If none of the default sass rules apply, try Parcel's resolver.
-
+    }
 
+    // If none of the default sass rules apply, try Parcel's resolver.
     for (let u of urls) {
       if (NODE_MODULE_ALIAS_RE.test(u)) {
         u = u.slice(1);
       }
-
       try {
-        const filePath = await resolve(prev, u);
-
+        const filePath = await resolve(prev, u, {
+          packageConditions: ['sass', 'style']
+        });
         if (filePath) {
           const contents = await asset.fs.readFile(filePath, 'utf8');
           return {
@@ -238,7 +199,6 @@ function resolvePathImporter({
       }
     }
   }
-
   return function (rawUrl, prev, done) {
     const url = rawUrl.replace(/^file:\/\//, '');
     resolvePath(url, prev).then(resolved => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-sass",
-  "version": "2.8.3",
+  "version": "2.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,12 @@
   "source": "src/SassTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.8.3"
+    "parcel": "^2.9.0"
   },
   "dependencies": {
-    "@parcel/plugin": "2.8.3",
+    "@parcel/plugin": "2.9.0",
     "@parcel/source-map": "^2.1.1",
     "sass": "^1.38.0"
   },
-  "gitHead": "349a6caf40ec8abb6a49fcae0765f8f8deb2073d"
+  "gitHead": "dd9435be8afed35c5ffc161cf4b586fd6c78fc1f"
 }

package/src/SassTransformer.js

@@ -12,7 +12,7 @@ const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
 export default (new Transformer({
   async loadConfig({config, options}) {
     let configFile = await config.getConfig(
-      ['.sassrc', '.sassrc.json', '.sassrc.js', '.sassrc.cjs'],
+      ['.sassrc', '.sassrc.json', '.sassrc.js', '.sassrc.cjs', '.sassrc.mjs'],
       {
         packageKey: 'sass',
       },
@@ -27,10 +27,6 @@ export default (new Transformer({
       );
     }
 
-    if (configFile && path.extname(configFile.filePath).endsWith('js')) {
-      config.invalidateOnStartup();
-    }
-
     if (configResult.importer === undefined) {
       configResult.importer = [];
     } else if (!Array.isArray(configResult.importer)) {
@@ -163,7 +159,9 @@ function resolvePathImporter({asset, resolve, includePaths, options}) {
         u = u.slice(1);
       }
       try {
-        const filePath = await resolve(prev, u);
+        const filePath = await resolve(prev, u, {
+          packageConditions: ['sass', 'style'],
+        });
         if (filePath) {
           const contents = await asset.fs.readFile(filePath, 'utf8');
           return {filePath, contents};