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

package/lib/StylusTransformer.js

@@ -121,7 +121,7 @@ var _default = new (_plugin().Transformer)({
       let isJavascript = _path().default.extname(configFile.filePath) === '.js';
 
       if (isJavascript) {
-        config.shouldInvalidateOnStartup();
+        config.invalidateOnStartup();
       } // Resolve relative paths from config file
 
 
@@ -129,7 +129,7 @@ var _default = new (_plugin().Transformer)({
         configFile.contents.paths = configFile.contents.paths.map(p => _path().default.resolve(_path().default.dirname(configFile.filePath), p));
       }
 
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
 
@@ -170,32 +170,43 @@ var _default = new (_plugin().Transformer)({
 
 exports.default = _default;
 
-async function getDependencies(code, filepath, asset, resolve, options, parcelOptions, nativeGlob, seen = new Set()) {
+function attemptResolve(importedPath, filepath, asset, resolve, deps) {
+  if (deps.has(importedPath)) {
+    return;
+  }
+
+  if ((0, _utils().isGlob)(importedPath)) {
+    // Invalidate when new files are created that match the glob pattern.
+    let absoluteGlob = _path().default.resolve(_path().default.dirname(filepath), importedPath);
+
+    asset.invalidateOnFileCreate({
+      glob: absoluteGlob
+    });
+    deps.set(importedPath, (0, _utils().glob)(absoluteGlob, asset.fs, {
+      onlyFiles: true
+    }).then(entries => Promise.all(entries.map(entry => resolve(filepath, './' + _path().default.relative(_path().default.dirname(filepath), entry))))));
+  } else {
+    deps.set(importedPath, resolve(filepath, importedPath));
+  }
+}
+
+async function getDependencies(code, filepath, asset, resolve, options, parcelOptions, nativeGlob, seen = new Set(), includeImports = true) {
   seen.add(filepath);
   _nodes().default.filename = asset.filePath;
   let parser = new (_parser().default)(code, options);
   let ast = parser.parse();
   let deps = new Map();
 
+  if (includeImports && options.imports) {
+    for (let importedPath of options.imports) {
+      attemptResolve(importedPath, filepath, asset, resolve, deps);
+    }
+  }
+
   class ImportVisitor extends _depsResolver().default {
     visitImport(imported) {
       let importedPath = imported.path.first.string;
-
-      if (!deps.has(importedPath)) {
-        if ((0, _utils().isGlob)(importedPath)) {
-          // Invalidate when new files are created that match the glob pattern.
-          let absoluteGlob = _path().default.resolve(_path().default.dirname(filepath), importedPath);
-
-          asset.invalidateOnFileCreate({
-            glob: absoluteGlob
-          });
-          deps.set(importedPath, (0, _utils().glob)(absoluteGlob, asset.fs, {
-            onlyFiles: true
-          }).then(entries => Promise.all(entries.map(entry => resolve(filepath, './' + _path().default.relative(_path().default.dirname(filepath), entry))))));
-        } else {
-          deps.set(importedPath, resolve(filepath, importedPath));
-        }
-      }
+      attemptResolve(importedPath, filepath, asset, resolve, deps);
     }
 
   }
@@ -247,10 +258,10 @@ async function getDependencies(code, filepath, asset, resolve, options, parcelOp
 
     for (let resolved of found) {
       if (!seen.has(resolved)) {
-        await asset.addIncludedFile(resolved);
+        await asset.invalidateOnFileChange(resolved);
         let code = await asset.fs.readFile(resolved, 'utf8');
 
-        for (let [path, resolvedPath] of await getDependencies(code, resolved, asset, resolve, options, parcelOptions, nativeGlob, seen)) {
+        for (let [path, resolvedPath] of await getDependencies(code, resolved, asset, resolve, options, parcelOptions, nativeGlob, seen, false)) {
           res.set(path, resolvedPath);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-stylus",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-nightly.1004+47379bf8",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,12 @@
   "source": "src/StylusTransformer.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/utils": "2.0.0-beta.2",
-    "stylus": "^0.54.5"
+    "@parcel/plugin": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/utils": "2.0.0-nightly.1004+47379bf8",
+    "stylus": "^0.55.0"
   },
-  "gitHead": "a3aa86815e098c90fda72a08d29646ff059ab74d"
+  "gitHead": "47379bf8fabeb2cfe03ade8802d942388b153e5b"
 }

package/src/StylusTransformer.js

@@ -22,7 +22,7 @@ export default (new Transformer({
     if (configFile) {
       let isJavascript = path.extname(configFile.filePath) === '.js';
       if (isJavascript) {
-        config.shouldInvalidateOnStartup();
+        config.invalidateOnStartup();
       }
 
       // Resolve relative paths from config file
@@ -32,7 +32,7 @@ export default (new Transformer({
         );
       }
 
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
 
@@ -78,6 +78,36 @@ export default (new Transformer({
   },
 }): Transformer);
 
+function attemptResolve(importedPath, filepath, asset, resolve, deps) {
+  if (deps.has(importedPath)) {
+    return;
+  }
+
+  if (isGlob(importedPath)) {
+    // Invalidate when new files are created that match the glob pattern.
+    let absoluteGlob = path.resolve(path.dirname(filepath), importedPath);
+    asset.invalidateOnFileCreate({glob: absoluteGlob});
+
+    deps.set(
+      importedPath,
+      glob(absoluteGlob, asset.fs, {
+        onlyFiles: true,
+      }).then(entries =>
+        Promise.all(
+          entries.map(entry =>
+            resolve(
+              filepath,
+              './' + path.relative(path.dirname(filepath), entry),
+            ),
+          ),
+        ),
+      ),
+    );
+  } else {
+    deps.set(importedPath, resolve(filepath, importedPath));
+  }
+}
+
 async function getDependencies(
   code,
   filepath,
@@ -87,6 +117,7 @@ async function getDependencies(
   parcelOptions,
   nativeGlob,
   seen = new Set(),
+  includeImports = true,
 ) {
   seen.add(filepath);
 
@@ -96,35 +127,16 @@ async function getDependencies(
   let ast = parser.parse();
   let deps = new Map();
 
+  if (includeImports && options.imports) {
+    for (let importedPath of options.imports) {
+      attemptResolve(importedPath, filepath, asset, resolve, deps);
+    }
+  }
+
   class ImportVisitor extends DepsResolver {
     visitImport(imported) {
       let importedPath = imported.path.first.string;
-
-      if (!deps.has(importedPath)) {
-        if (isGlob(importedPath)) {
-          // Invalidate when new files are created that match the glob pattern.
-          let absoluteGlob = path.resolve(path.dirname(filepath), importedPath);
-          asset.invalidateOnFileCreate({glob: absoluteGlob});
-
-          deps.set(
-            importedPath,
-            glob(absoluteGlob, asset.fs, {
-              onlyFiles: true,
-            }).then(entries =>
-              Promise.all(
-                entries.map(entry =>
-                  resolve(
-                    filepath,
-                    './' + path.relative(path.dirname(filepath), entry),
-                  ),
-                ),
-              ),
-            ),
-          );
-        } else {
-          deps.set(importedPath, resolve(filepath, importedPath));
-        }
-      }
+      attemptResolve(importedPath, filepath, asset, resolve, deps);
     }
   }
 
@@ -180,7 +192,7 @@ async function getDependencies(
       // Recursively process resolved files as well to get nested deps
       for (let resolved of found) {
         if (!seen.has(resolved)) {
-          await asset.addIncludedFile(resolved);
+          await asset.invalidateOnFileChange(resolved);
 
           let code = await asset.fs.readFile(resolved, 'utf8');
           for (let [path, resolvedPath] of await getDependencies(
@@ -192,6 +204,7 @@ async function getDependencies(
             parcelOptions,
             nativeGlob,
             seen,
+            false,
           )) {
             res.set(path, resolvedPath);
           }