penrose 0.3.1 → 0.4.0

package/.github/workflows/ci.yaml

@@ -17,13 +17,18 @@ jobs:
           sudo apt-get install -y -qq graphicsmagick
 
       - name: Install Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6.4.0
         with:
           node-version: 24.15.0
-          cache: npm
+
+      - uses: pnpm/action-setup@v6.0.6
+        name: Install pnpm
+        with:
+          version: 10.33.4
+          cache: true
 
       - name: Install Node dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run Node tests
-        run: npm test
+        run: pnpm run test

package/.pre-commit-config.yaml

@@ -14,9 +14,11 @@ repos:
         language: system
         files: \.nix$
 
-      - id: format-js
-        name: Format JS
-        language: system
-        entry: npx prettier --parser babel --write
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+        alias: prettier-js
+        name: prettier (js)
+        args: [--parser, babel, --write]
         files: ^(lib)/.*\.(js|jsx|cjs|mjs)$
-        pass_filenames: true

package/Makefile

@@ -25,10 +25,10 @@ bump-version:
 		echo "Must be one of: $(CYAN)$$VALID_BUMP$(RESET)"; \
 		exit 1; \
 	fi; \
-	npm version $$BUMP;
+	pnpm version $$BUMP;
 
 create-release:
-	@VERSION=$$(npm pkg get version --browser=false | tr -d '"'); \
+	@VERSION=$$(pnpm pkg get version --browser=false | tr -d '"'); \
 	gh release create $$VERSION;
 
 # Prevent make from treating arguments to bump-version as targets

package/devenv.nix

@@ -19,7 +19,7 @@
     javascript = {
       enable = true;
       package = pkgs.nodejs_24;
-      npm = {
+      pnpm = {
         enable = true;
         install = {
           enable = true;

package/lib/__tests__/penrose.test.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Promise from 'bluebird';
 import fs from 'fs-extra';
-import globPromise from 'glob-promise';
+import {glob} from 'glob';
 import path from 'path';
 import {describe, expect, test} from 'vitest';
 import {Penrose} from '../penrose';
@@ -30,24 +30,6 @@ describe('Penrose', () => {
 
   const penrose = new Penrose(config);
 
-  /**
-   *
-   * @param   {Array} patterns
-   * @param   {Object} options
-   * @returns {Promise}
-   */
-  function multiGlob(patterns, options) {
-    let matches = [];
-
-    return Promise.mapSeries(patterns, function (pattern) {
-      return globPromise(pattern, options).then(function (files) {
-        matches = matches.concat(files);
-      });
-    }).then(() => {
-      return Promise.resolve(matches);
-    });
-  }
-
   describe('resolvePath', () => {
     test('Should return expected path if URI has scheme', () => {
       const actual = penrose.resolvePath('public://dir/file.jpg');
@@ -169,7 +151,7 @@ describe('Penrose', () => {
     test('Should create derivative images', async () => {
       await fs.remove(path.join(dir, 'data/files/styles'));
 
-      const files = await multiGlob(
+      const files = await glob(
         _.map(config.schemes, function (scheme) {
           return scheme.path + '**/*';
         }),
@@ -194,7 +176,7 @@ describe('Penrose', () => {
         return penrose.createDerivative(task.style, task.src, task.dist);
       });
 
-      const actual = await multiGlob(
+      const actual = await glob(
         _.map(config.schemes, function (scheme) {
           return scheme.path + 'styles/**/*';
         }),

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "penrose",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Build derivative images",
   "main": "lib/penrose.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/netbek/penrose.git"
   },
-  "scripts": {
-    "test": "vitest run"
-  },
   "author": {
     "name": "Hein Bekker",
     "email": "hein@netbek.co.za",
@@ -23,7 +20,6 @@
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "fs-extra": "11.3.5",
-    "glob-promise": "6.0.7",
     "lodash": "4.18.1",
     "prettier": "3.8.3",
     "replace-ext": "2.0.0",
@@ -35,8 +31,12 @@
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.2",
     "eslint-plugin-prettier": "5.5.5",
+    "glob": "13.0.6",
     "npm-check-updates": "22.1.1",
     "typescript": "6.0.3",
     "vitest": "3.2.4"
+  },
+  "scripts": {
+    "test": "vitest run"
   }
-}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+allowBuilds:
+  "esbuild@0.27.7": true
+  "sharp@0.34.5": true