@parcel/transformer-less 2.0.0-beta.3.1 → 2.0.0-dev.1510

package/lib/LessTransformer.js

@@ -4,71 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _plugin() {
   const data = require("@parcel/plugin");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _sourceMap() {
   const data = _interopRequireDefault(require("@parcel/source-map"));
-
   _sourceMap = function () {
     return data;
   };
-
   return data;
 }
-
 function _less() {
   const data = _interopRequireDefault(require("less"));
-
   _less = function () {
     return data;
   };
-
   return data;
 }
-
-function _loadConfig() {
-  const data = require("./loadConfig");
-
-  _loadConfig = function () {
-    return data;
-  };
-
-  return data;
-}
-
+var _loadConfig = require("./loadConfig");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // E.g: ~library/file.less
 const WEBPACK_ALIAS_RE = /^~[^/]/;
-
-var _default = new (_plugin().Transformer)({
+var _default = exports.default = new (_plugin().Transformer)({
   loadConfig({
     config
   }) {
-    return (0, _loadConfig().load)({
+    return (0, _loadConfig.load)({
       config
     });
   },
-
   async transform({
     asset,
     options,
@@ -79,15 +54,13 @@ var _default = new (_plugin().Transformer)({
     asset.meta.hasDependencies = false;
     let code = await asset.getCode();
     let result;
-
     try {
-      let lessConfig = config ? { ...config.config
+      let lessConfig = config ? {
+        ...config.config
       } : {};
-
       if (asset.env.sourceMap) {
         lessConfig.sourceMap = {};
       }
-
       lessConfig.filename = asset.filePath;
       lessConfig.plugins = [...(lessConfig.plugins || []), urlPlugin({
         asset
@@ -105,51 +78,44 @@ var _default = new (_plugin().Transformer)({
       };
       throw err;
     }
-
     if (result.map != null) {
       let map = new (_sourceMap().default)(options.projectRoot);
       let rawMap = JSON.parse(result.map);
-      map.addVLQMap({ ...rawMap,
+      map.addVLQMap({
+        ...rawMap,
         sources: rawMap.sources.map(s => _path().default.relative(options.projectRoot, s))
       });
       asset.setMap(map);
     }
-
     asset.setCode(result.css);
     return [asset];
   }
-
 });
-
-exports.default = _default;
-
 function urlPlugin({
   asset
 }) {
   return {
     install(less, pluginManager) {
       // This is a hack; no such interface exists, even conceptually, in Less.
+
       const visitor = new less.visitors.Visitor({
         visitUrl(node) {
           const valueNode = node.value;
           const stringValue = valueNode.value;
-
           if (!stringValue.startsWith('#') // IE's `behavior: url(#default#VML)`)
           ) {
-              valueNode.value = asset.addURLDependency(stringValue, {});
-            }
-
+            valueNode.value = asset.addURLDependency(stringValue, {});
+          }
           return node;
         }
-
       });
+
+      // $FlowFixMe[method-unbinding]
       visitor.run = visitor.visit;
       pluginManager.addVisitor(visitor);
     }
-
   };
 }
-
 function resolvePathPlugin({
   asset,
   resolve
@@ -160,45 +126,36 @@ function resolvePathPlugin({
         supports() {
           return true;
         }
-
         supportsSync() {
           return false;
         }
-
         async loadFile(rawFilename, currentDirectory, options) {
           let filename = rawFilename;
-
           if (WEBPACK_ALIAS_RE.test(filename)) {
             let correctPath = filename.replace(/^~/, '');
             throw new Error(`The @import path "${filename}" is using webpack specific syntax, which isn't supported by Parcel.\n\nTo @import files from node_modules, use "${correctPath}"`);
-          } // Based on https://github.com/less/less.js/blob/master/packages/less/src/less-node/file-manager.js
-
+          }
 
+          // Based on https://github.com/less/less.js/blob/master/packages/less/src/less-node/file-manager.js
           let isAbsoluteFilename = this.isPathAbsolute(filename);
           let paths = isAbsoluteFilename ? [''] : [currentDirectory];
-
           if (options.paths) {
             paths.push(...options.paths);
           }
-
           let prefixes = options.prefixes || [''];
           let fileParts = this.extractUrlParts(filename);
           let filePath;
           let contents;
-
           if (filename[0] !== '~') {
             outer: for (let p of paths) {
               for (let prefix of prefixes) {
                 filePath = fileParts.rawPath + prefix + fileParts.filename;
-
                 if (p) {
                   filePath = _path().default.join(p, filePath);
                 }
-
                 if (options.ext) {
                   filePath = this.tryAppendExtension(filePath, options.ext);
                 }
-
                 try {
                   contents = await asset.fs.readFile(filePath, 'utf8');
                   break outer;
@@ -210,26 +167,22 @@ function resolvePathPlugin({
               }
             }
           }
-
           if (!contents) {
-            filePath = await resolve(asset.filePath, filename);
+            filePath = await resolve(asset.filePath, filename, {
+              packageConditions: ['less', 'style']
+            });
             contents = await asset.fs.readFile(filePath, 'utf8');
           }
-
           if (filePath) {
-            asset.addIncludedFile(filePath);
+            asset.invalidateOnFileChange(filePath);
           }
-
           return {
             contents,
             filename: filePath
           };
         }
-
       }
-
       pluginManager.addFileManager(new LessFileManager());
     }
-
   };
 }

package/lib/loadConfig.js

@@ -4,47 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.load = load;
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function load({
   config
 }) {
-  let configFile = await config.getConfig(['.lessrc', '.lessrc.js'], {
+  let configFile = await config.getConfig(['.lessrc', '.lessrc.js', '.lessrc.cjs', '.lessrc.mjs'], {
     packageKey: 'less'
   });
   let configContents = {};
-
   if (configFile != null) {
-    configContents = configFile.contents; // Resolve relative paths from config file
+    configContents = configFile.contents;
 
+    // Resolve relative paths from config file
     if (configContents.paths) {
       configContents.paths = configContents.paths.map(p => _path().default.resolve(_path().default.dirname(configFile.filePath), p));
     }
-  } // Rewrites urls to be relative to the provided filename
-
-
-  configContents.rewriteUrls = 'all';
-  configContents.plugins = configContents.plugins || []; // This should enforce the config to be reloaded on every run as it's JS
-
-  let isDynamic = configFile && _path().default.extname(configFile.filePath) === '.js';
-
-  if (isDynamic) {
-    config.shouldInvalidateOnStartup();
   }
 
-  return config.setResult({
-    isStatic: !isDynamic,
+  // Rewrites urls to be relative to the provided filename
+  configContents.rewriteUrls = 'all';
+  configContents.plugins = configContents.plugins || [];
+  return {
     config: configContents
-  });
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-less",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-dev.1510+a9bb85adf",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,12 @@
   "source": "src/LessTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "^2.0.0-dev.1508+a9bb85adf"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/source-map": "2.0.0-rc.1.0",
-    "less": "^3.9.0"
+    "@parcel/plugin": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/source-map": "^2.1.1",
+    "less": "^4.1.1"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "a9bb85adf8f3b38631e178b3aacaa30c78696e36"
 }

package/src/LessTransformer.js

@@ -88,6 +88,7 @@ function urlPlugin({asset}) {
         },
       });
 
+      // $FlowFixMe[method-unbinding]
       visitor.run = visitor.visit;
       pluginManager.addVisitor(visitor);
     },
@@ -151,12 +152,14 @@ function resolvePathPlugin({asset, resolve}) {
           }
 
           if (!contents) {
-            filePath = await resolve(asset.filePath, filename);
+            filePath = await resolve(asset.filePath, filename, {
+              packageConditions: ['less', 'style'],
+            });
             contents = await asset.fs.readFile(filePath, 'utf8');
           }
 
           if (filePath) {
-            asset.addIncludedFile(filePath);
+            asset.invalidateOnFileChange(filePath);
           }
 
           return {

package/src/loadConfig.js

@@ -2,10 +2,21 @@
 import type {Config} from '@parcel/types';
 import path from 'path';
 
-export async function load({config}: {|config: Config|}): Promise<void> {
-  let configFile = await config.getConfig(['.lessrc', '.lessrc.js'], {
-    packageKey: 'less',
-  });
+type ConfigResult = {|
+  config: any,
+|};
+
+export async function load({
+  config,
+}: {|
+  config: Config,
+|}): Promise<ConfigResult> {
+  let configFile = await config.getConfig(
+    ['.lessrc', '.lessrc.js', '.lessrc.cjs', '.lessrc.mjs'],
+    {
+      packageKey: 'less',
+    },
+  );
 
   let configContents = {};
   if (configFile != null) {
@@ -23,11 +34,5 @@ export async function load({config}: {|config: Config|}): Promise<void> {
   configContents.rewriteUrls = 'all';
   configContents.plugins = configContents.plugins || [];
 
-  // This should enforce the config to be reloaded on every run as it's JS
-  let isDynamic = configFile && path.extname(configFile.filePath) === '.js';
-  if (isDynamic) {
-    config.shouldInvalidateOnStartup();
-  }
-
-  return config.setResult({isStatic: !isDynamic, config: configContents});
+  return {config: configContents};
 }