@localnerve/sass-asset-functions 4.0.0 → 4.1.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Sass Asset Functions Change Log
 
+## 4.1.1
+  * Package test code cleanup
+
+## 4.1.0
+  * sass 1.63.4
+  * Fix esm loading after unexpected sass api change
+  * Add module loading package tests
+  * Dev dependencies updates
+
 ## 4.0.0
   * Node 16+ (Drop Node 14 Support)
   * Dev dependencies updates

package/cjs/index.cjs

@@ -4,9 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = sassFunctions;
-var _sass = _interopRequireDefault(require("sass"));
+var defaultSass = _interopRequireWildcard(require("sass"));
 var _processor = _interopRequireDefault(require("./lib/processor.cjs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Sass asset function suite.
  * 
@@ -16,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function sassFunctions(options = {}) {
   const {
-    sass = _sass.default
+    sass = defaultSass
   } = options;
   const processor = new _processor.default(options);
   return {

package/cjs/lib/processor.cjs

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _url = _interopRequireDefault(require("url"));
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _nodePath = _interopRequireDefault(require("node:path"));
+var _nodeUrl = _interopRequireDefault(require("node:url"));
 var _mime = _interopRequireDefault(require("mime"));
 var _imageSize = _interopRequireDefault(require("image-size"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -56,11 +56,11 @@ class Processor {
     if (typeof buster !== 'function') {
       throw new Error('asset_cache_buster should be a function');
     }
-    const http_path_url = _url.default.parse(http_path);
+    const http_path_url = _nodeUrl.default.parse(http_path);
     buster(http_path, real_path, value => {
       let new_url;
       if (typeof value == 'object') {
-        const parsed_path = _url.default.parse(value.path);
+        const parsed_path = _nodeUrl.default.parse(value.path);
         new_url = {
           pathname: parsed_path.pathname,
           search: value.query || http_path_url.search
@@ -71,7 +71,7 @@ class Processor {
           search: value
         };
       }
-      done(_url.default.format(new_url));
+      done(_nodeUrl.default.format(new_url));
     });
   }
   asset_host(filepath, done) {
@@ -82,15 +82,15 @@ class Processor {
       throw new Error('asset_host should be a function');
     }
     ahost(filepath, host => {
-      done(_url.default.resolve(host, filepath));
+      done(_nodeUrl.default.resolve(host, filepath));
     });
   }
   real_path(filepath, segment) {
     const sanitized_filepath = filepath.replace(/(#|\?).+$/, '');
-    return _path.default.resolve(this.paths[`${segment}_path`], sanitized_filepath);
+    return _nodePath.default.resolve(this.paths[`${segment}_path`], sanitized_filepath);
   }
   http_path(filepath, segment) {
-    return _path.default.join(this.paths[`http_${segment}_path`], filepath).replace(/\\/g, '/');
+    return _nodePath.default.join(this.paths[`http_${segment}_path`], filepath).replace(/\\/g, '/');
   }
   image_width(filepath, done) {
     done((0, _imageSize.default)(this.real_path(filepath, 'images')).width);
@@ -101,7 +101,7 @@ class Processor {
   inline_image(filepath, mime_type, done) {
     const src = this.real_path(filepath, 'images');
     mime_type = mime_type || _mime.default.getType(src);
-    _fs.default.readFile(src, (err, data) => {
+    _nodeFs.default.readFile(src, (err, data) => {
       if (err) {
         throw new Error(`inline_image failed to read ${src}: ${err}`);
       }
@@ -160,11 +160,11 @@ class Processor {
     for (; i < files.length; ++i) {
       file = files[i];
       next = files[i + 1];
-      parts = _url.default.parse(file);
+      parts = _nodeUrl.default.parse(file);
       if (FONT_TYPES[next]) {
         type = files.splice(i + 1, 1);
       } else {
-        ext = _path.default.extname(parts.path);
+        ext = _nodePath.default.extname(parts.path);
         type = ext.substring(1);
       }
       type = FONT_TYPES[type];

package/index.js

@@ -4,7 +4,7 @@
  * Copyright (c) 2023 Alex Grant (@localnerve), LocalNerve LLC
  * Licensed under the MIT license.
  */
-import defaultSass from 'sass';
+import * as defaultSass from 'sass';
 import Processor from './lib/processor.js';
 
 export default function sassFunctions (options = {}) {

package/lib/processor.js

@@ -4,9 +4,9 @@
  * Copyright (c) 2023 Alex Grant (@localnerve), LocalNerve LLC
  * Licensed under the MIT license.
  */
-import fs from 'fs';
-import path from 'path';
-import url from 'url';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 import mime from 'mime';
 import sizeOf from 'image-size';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localnerve/sass-asset-functions",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "compass-style asset functions for dart-sass or other sass compilers",
   "main": "index.js",
   "exports": {
@@ -10,7 +10,8 @@
   },
   "type": "module",
   "scripts": {
-    "test": "jest",
+    "test-package": "node ./test-package/index.js",
+    "test": "jest && npm run test-package",
     "lint": "eslint .",
     "pretranspile": "rimraf ./cjs",
     "transpile": "babel index.js -o ./cjs/index.cjs && babel ./lib/processor.js -o ./cjs/lib/processor.cjs",
@@ -49,15 +50,17 @@
   "dependencies": {
     "image-size": "^1.0.2",
     "mime": "^3.0.0",
-    "sass": "^1.62.1"
+    "sass": "^1.63.4"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-env": "^7.22.4",
     "rimraf": "^5.0.1",
     "jest": "^29.5.0",
-    "eslint": "^8.41.0",
-    "node-sass": "^9.0.0"
+    "eslint": "^8.42.0",
+    "node-sass": "^9.0.0",
+    "tar": "^6.1.15",
+    "glob": "^10.2.7"
   },
   "engines": {
     "node": ">= 16"