@parcel/transformer-sass 2.0.0-beta.2 → 2.0.0-nightly.1004

package/lib/SassTransformer.js

@@ -55,16 +55,6 @@ function _sass() {
   return data;
 }
 
-function _url() {
-  const data = require("url");
-
-  _url = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _util() {
   const data = require("util");
 
@@ -78,14 +68,14 @@ function _util() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // E.g: ~library/file.sass
-const WEBPACK_ALIAS_RE = /^~[^/]/;
+const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
 
 var _default = new (_plugin().Transformer)({
   async loadConfig({
     config,
     options
   }) {
-    let configFile = await config.getConfig(['.sassrc', '.sassrc.js'], {
+    let configFile = await config.getConfig(['.sassrc', '.sassrc.json', '.sassrc.js'], {
       packageKey: 'sass'
     });
     let configResult = configFile ? configFile.contents : {}; // Resolve relative paths from config file
@@ -95,7 +85,7 @@ var _default = new (_plugin().Transformer)({
     }
 
     if (configFile && _path().default.extname(configFile.filePath) === '.js') {
-      config.shouldInvalidateOnStartup();
+      config.invalidateOnStartup();
     }
 
     if (configResult.importer === undefined) {
@@ -110,7 +100,7 @@ var _default = new (_plugin().Transformer)({
     configResult.outFile = _path().default.join(options.projectRoot, 'style.css.map');
     configResult.omitSourceMapUrl = true;
     configResult.sourceMapContents = false;
-    config.setResult(configResult);
+    return configResult;
   },
 
   async transform({
@@ -140,13 +130,13 @@ var _default = new (_plugin().Transformer)({
 
       for (let included of result.stats.includedFiles) {
         if (included !== asset.filePath) {
-          asset.addIncludedFile(included);
+          asset.invalidateOnFileChange(included);
         }
       }
 
       if (result.map != null) {
         let map = new (_sourceMap().default)(options.projectRoot);
-        map.addRawMappings(JSON.parse(result.map));
+        map.addVLQMap(JSON.parse(result.map));
         asset.setMap(map);
       }
     } catch (err) {
@@ -196,51 +186,70 @@ function resolvePathImporter({
     asset.invalidateOnEnvChange('SASS_PATH');
 
     if (options.env.SASS_PATH) {
-      paths.push(...options.env.SASS_PATH.split(process.platform === 'win32' ? ';' : ':'));
+      paths.push(...options.env.SASS_PATH.split(process.platform === 'win32' ? ';' : ':').map(p => _path().default.resolve(options.projectRoot, p)));
     }
 
-    let filePath;
-    let contents;
+    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) {
-        filePath = _path().default.resolve(p, url);
-
-        try {
-          contents = await asset.fs.readFile(filePath, 'utf8');
-          break;
-        } catch (err) {
-          asset.invalidateOnFileCreate({
-            filePath
-          });
+        for (let u of urls) {
+          const filePath = _path().default.resolve(p, u);
+
+          try {
+            const contents = await asset.fs.readFile(filePath, 'utf8');
+            return {
+              filePath,
+              contents
+            };
+          } catch (err) {
+            asset.invalidateOnFileCreate({
+              filePath
+            });
+          }
         }
       }
     } // If none of the default sass rules apply, try Parcel's resolver.
 
 
-    if (!contents) {
-      filePath = await resolve(prev, url);
-      contents = await asset.fs.readFile(filePath, 'utf8');
-    }
+    for (let u of urls) {
+      if (NODE_MODULE_ALIAS_RE.test(u)) {
+        u = u.slice(1);
+      }
 
-    if (filePath) {
-      return {
-        file: (0, _url().pathToFileURL)(filePath).toString(),
-        contents
-      };
+      try {
+        const filePath = await resolve(prev, u);
+
+        if (filePath) {
+          const contents = await asset.fs.readFile(filePath, 'utf8');
+          return {
+            filePath,
+            contents
+          };
+        }
+      } catch (err) {
+        continue;
+      }
     }
   }
 
   return function (rawUrl, prev, done) {
-    let url = rawUrl.replace(/^file:\/\//, '');
-
-    if (WEBPACK_ALIAS_RE.test(url)) {
-      const correctPath = url.replace(/^~/, '');
-      const error = new Error(`The @import path "${url}" is using webpack specific syntax, which isn't supported by Parcel.\n\nTo @import files from node_modules, use "${correctPath}"`);
-      done(error);
-      return;
-    }
-
-    resolvePath(url, prev).then(done, done);
+    const url = rawUrl.replace(/^file:\/\//, '');
+    resolvePath(url, prev).then(resolved => {
+      if (resolved) {
+        done({
+          file: resolved.filePath,
+          contents: resolved.contents
+        });
+      } else {
+        done();
+      }
+    }).catch(done);
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-sass",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-nightly.1004+47379bf8",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,12 @@
   "source": "src/SassTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "2.0.0-nightly.1002+47379bf8"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-beta.2",
-    "@parcel/source-map": "2.0.0-alpha.4.21",
-    "sass": "^1.32.4"
+    "@parcel/plugin": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/source-map": "^2.0.0",
+    "sass": "^1.38.0"
   },
-  "gitHead": "a3aa86815e098c90fda72a08d29646ff059ab74d"
+  "gitHead": "47379bf8fabeb2cfe03ade8802d942388b153e5b"
 }

package/src/SassTransformer.js

@@ -4,17 +4,19 @@ import path from 'path';
 import {EOL} from 'os';
 import SourceMap from '@parcel/source-map';
 import sass from 'sass';
-import {pathToFileURL} from 'url';
 import {promisify} from 'util';
 
 // E.g: ~library/file.sass
-const WEBPACK_ALIAS_RE = /^~[^/]/;
+const NODE_MODULE_ALIAS_RE = /^~[^/\\]/;
 
 export default (new Transformer({
   async loadConfig({config, options}) {
-    let configFile = await config.getConfig(['.sassrc', '.sassrc.js'], {
-      packageKey: 'sass',
-    });
+    let configFile = await config.getConfig(
+      ['.sassrc', '.sassrc.json', '.sassrc.js'],
+      {
+        packageKey: 'sass',
+      },
+    );
 
     let configResult = configFile ? configFile.contents : {};
 
@@ -26,7 +28,7 @@ export default (new Transformer({
     }
 
     if (configFile && path.extname(configFile.filePath) === '.js') {
-      config.shouldInvalidateOnStartup();
+      config.invalidateOnStartup();
     }
 
     if (configResult.importer === undefined) {
@@ -42,7 +44,7 @@ export default (new Transformer({
     configResult.omitSourceMapUrl = true;
     configResult.sourceMapContents = false;
 
-    config.setResult(configResult);
+    return configResult;
   },
 
   async transform({asset, options, config, resolve}) {
@@ -73,13 +75,13 @@ export default (new Transformer({
       css = result.css;
       for (let included of result.stats.includedFiles) {
         if (included !== asset.filePath) {
-          asset.addIncludedFile(included);
+          asset.invalidateOnFileChange(included);
         }
       }
 
       if (result.map != null) {
         let map = new SourceMap(options.projectRoot);
-        map.addRawMappings(JSON.parse(result.map));
+        map.addVLQMap(JSON.parse(result.map));
         asset.setMap(map);
       }
     } catch (err) {
@@ -102,7 +104,10 @@ export default (new Transformer({
 function resolvePathImporter({asset, resolve, includePaths, options}) {
   // This is a reimplementation of the Sass resolution algorithm that uses Parcel's
   // FS and tracks all tried files so they are watched for creation.
-  async function resolvePath(url, prev) {
+  async function resolvePath(
+    url,
+    prev,
+  ): Promise<{filePath: string, contents: string, ...} | void> {
     /*
       Imports are resolved by trying, in order:
         * Loading a file relative to the file in which the `@import` appeared.
@@ -125,51 +130,63 @@ function resolvePathImporter({asset, resolve, includePaths, options}) {
       paths.push(
         ...options.env.SASS_PATH.split(
           process.platform === 'win32' ? ';' : ':',
-        ),
+        ).map(p => path.resolve(options.projectRoot, p)),
       );
     }
 
-    let filePath;
-    let contents;
+    const urls = [url];
+    const urlFileName = path.basename(url);
+    if (urlFileName[0] !== '_') {
+      urls.push(path.join(path.dirname(url), `_${urlFileName}`));
+    }
 
     if (url[0] !== '~') {
       for (let p of paths) {
-        filePath = path.resolve(p, url);
-        try {
-          contents = await asset.fs.readFile(filePath, 'utf8');
-          break;
-        } catch (err) {
-          asset.invalidateOnFileCreate({filePath});
+        for (let u of urls) {
+          const filePath = path.resolve(p, u);
+          try {
+            const contents = await asset.fs.readFile(filePath, 'utf8');
+            return {
+              filePath,
+              contents,
+            };
+          } catch (err) {
+            asset.invalidateOnFileCreate({filePath});
+          }
         }
       }
     }
 
     // If none of the default sass rules apply, try Parcel's resolver.
-    if (!contents) {
-      filePath = await resolve(prev, url);
-      contents = await asset.fs.readFile(filePath, 'utf8');
-    }
-
-    if (filePath) {
-      return {
-        file: pathToFileURL(filePath).toString(),
-        contents,
-      };
+    for (let u of urls) {
+      if (NODE_MODULE_ALIAS_RE.test(u)) {
+        u = u.slice(1);
+      }
+      try {
+        const filePath = await resolve(prev, u);
+        if (filePath) {
+          const contents = await asset.fs.readFile(filePath, 'utf8');
+          return {filePath, contents};
+        }
+      } catch (err) {
+        continue;
+      }
     }
   }
 
-  return function(rawUrl, prev, done) {
-    let url = rawUrl.replace(/^file:\/\//, '');
-
-    if (WEBPACK_ALIAS_RE.test(url)) {
-      const correctPath = url.replace(/^~/, '');
-      const error = new Error(
-        `The @import path "${url}" is using webpack specific syntax, which isn't supported by Parcel.\n\nTo @import files from node_modules, use "${correctPath}"`,
-      );
-      done(error);
-      return;
-    }
-
-    resolvePath(url, prev).then(done, done);
+  return function (rawUrl, prev, done) {
+    const url = rawUrl.replace(/^file:\/\//, '');
+    resolvePath(url, prev)
+      .then(resolved => {
+        if (resolved) {
+          done({
+            file: resolved.filePath,
+            contents: resolved.contents,
+          });
+        } else {
+          done();
+        }
+      })
+      .catch(done);
   };
 }