Merge pull request #177 from PSDTools/bump

refactor: tweak pnpm settings

Author: lishaduck

.github/workflows/ci.yaml

@@ -71,8 +71,8 @@ jobs:
         run: pnpm run build
       - name: 🕵️ Merge Checks
         run: pnpm run merge-checks --continue
-      # - name: 🧹 Check for deduped dependencies
-      #   run: pnpm exec turbo check-deduped-deps
+      - name: 🧹 Check for deduped dependencies
+        run: pnpm exec turbo check-deduped-deps
       - name: ⚙️ Upload GPA Calculator
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:

.pnpmfile.cjs

@@ -1,197 +1,2 @@
 // @ts-check
-
-/// PNPM Typedefs.
-// From <https://github.com/pnpm/pnpm/blob/eeb76cd1d0a3133d71d96de5646e305f34474652/hooks/pnpmfile/src/Hooks.ts> & <https://github.com/pnpm/pnpm/blob/d500d9f12e8819bf2659abece126938fb3a9ac87/packages/types/src/package.ts>.
-
-const VERBOSE = false;
-
-/**
- * A local `package.json` or a remote manifest from a registry as deserialized JSON.
- *
- * @typedef {Object} Pkg
- * @property {string?} name
- * @property {string?} version
- * @property {Record<string, string>?} dependencies
- */
-
-/**
- * A context object passed to hooks.
- * Currently contains naught but a logger.
- *
- * @typedef {Object} HookContext
- * @property {(message: string) => void} log
- */
-
-/// Ported code from the Yarn plugin.
-
-/**
- * A full list of nolyfilled packages.
- *
- * Based on <https://github.com/wojtekmaj/yarn-plugin-nolyfill/blob/main/src/index.ts>.
- * Keep in sync with <https://github.com/SukkaW/nolyfill/blob/master/packages/tools/cli/src/all-packages.ts>.
- * Do note that nolyfill doesn't use CD, so check that the versions listed there have been published.
- *
- * @type {string[]}
- */
-const allPackages = [
-  "abab",
-  "array-buffer-byte-length",
-  "array-flatten",
-  "array-includes",
-  "array.from",
-  "array.of",
-  "array.prototype.at",
-  "array.prototype.every",
-  "array.prototype.find",
-  "array.prototype.findlast",
-  "array.prototype.findlastindex",
-  "array.prototype.flat",
-  "array.prototype.flatmap",
-  "array.prototype.flatmap",
-  "array.prototype.foreach",
-  "array.prototype.reduce",
-  "array.prototype.toreversed",
-  "array.prototype.tosorted",
-  "arraybuffer.prototype.slice",
-  "assert",
-  "asynciterator.prototype",
-  "available-typed-arrays",
-  "deep-equal",
-  "deep-equal-json",
-  "define-properties",
-  "es-aggregate-error",
-  "es-iterator-helpers",
-  "es-set-tostringtag",
-  "es6-object-assign",
-  "function-bind",
-  "function.prototype.name",
-  "get-symbol-description",
-  "globalthis",
-  "gopd",
-  "harmony-reflect",
-  "has",
-  "has-property-descriptors",
-  "has-proto",
-  "has-symbols",
-  "has-tostringtag",
-  "hasown",
-  "internal-slot",
-  "is-arguments",
-  "is-array-buffer",
-  "is-core-module",
-  "is-date-object",
-  "is-generator-function",
-  "is-nan",
-  "is-regex",
-  "is-shared-array-buffer",
-  "is-string",
-  "is-symbol",
-  "is-typed-array",
-  "is-weakref",
-  "isarray",
-  "iterator.prototype",
-  "json-stable-stringify",
-  "jsonify",
-  "number-is-nan",
-  "object-is",
-  "object-keys",
-  "object.assign",
-  "object.entries",
-  "object.fromentries",
-  "object.getownpropertydescriptors",
-  "object.groupby",
-  "object.hasown",
-  "object.values",
-  "promise.allsettled",
-  "promise.any",
-  "reflect.getprototypeof",
-  "reflect.ownkeys",
-  "regexp.prototype.flags",
-  "safe-array-concat",
-  "safe-buffer",
-  "safe-regex-test",
-  "safer-buffer",
-  "set-function-length",
-  "side-channel",
-  "string.prototype.at",
-  "string.prototype.codepointat",
-  "string.prototype.includes",
-  "string.prototype.matchall",
-  "string.prototype.padend",
-  "string.prototype.padstart",
-  "string.prototype.repeat",
-  "string.prototype.replaceall",
-  "string.prototype.split",
-  "string.prototype.startswith",
-  "string.prototype.trim",
-  "string.prototype.trimend",
-  "string.prototype.trimleft",
-  "string.prototype.trimright",
-  "string.prototype.trimstart",
-  "typed-array-buffer",
-  "typed-array-byte-length",
-  "typed-array-byte-offset",
-  "typed-array-length",
-  "typedarray",
-  "typedarray.prototype.slice",
-  "unbox-primitive",
-  "util.promisify",
-  "which-boxed-primitive",
-  "which-typed-array",
-];
-
-/**
- * A map of all nolyfilled packages.
- * The keys are the original package names, the values are the nolyfilled package names.
- *
- * @type {Map<string, string>}
- */
-const PATCHES = new Map(allPackages.map((name) => [name, `@nolyfill/${name}`]));
-
-/// Wiring code (pnpm specific)
-
-/**
- * @param {Pkg} pkg - The package read.
- * @param {HookContext} context - The context of the hook.
- * @returns {Pkg} - The package to use.
- */
-function readPackage(pkg, context) {
-  // Not really necessary, but I prefer to keep the original package unmodified.
-  const newPkg = { ...pkg };
-
-  // If the package has dependencies, check if any of them need to be nolyfilled.
-  if (newPkg.dependencies) {
-    // Iterate over all dependencies.
-    for (const name of Object.keys(newPkg.dependencies)) {
-      // Get the possible nolyfill package name.
-      const nolyfill = PATCHES.get(name);
-
-      // Check if there is nolyfill for the package.
-      if (nolyfill !== undefined) {
-        // Replace the original package with the nolyfill.
-        newPkg.dependencies[name] = `npm:${nolyfill}@^1`;
-
-        if (VERBOSE) {
-          // Tell the user that the package has been nolyfilled.
-          context.log(`${name} => ${nolyfill}`);
-        }
-      }
-    }
-  }
-
-  // Return the (possibly modified) package.
-  return newPkg;
-}
-
-/// Exports
-
-/**
- * A pnpmfile allows you to use hooks to modify the behavior of pnpm.
- *
- * From <https://pnpm.io/pnpmfile>.
- */
-module.exports = {
-  hooks: {
-    readPackage,
-  },
-};
+module.exports = require("./node_modules/.pnpm-config/@pnpmfiles/nolyfill/.pnpmfile.cjs");

apps/petal-notes/turbo.json

@@ -53,6 +53,9 @@
       "inputs": [
         "**/*.ts",
         "**/*.svelte"
+      ],
+      "dependsOn": [
+        "prepare"
       ]
     },
     "typecheck": {

package.json

@@ -39,7 +39,7 @@
       "version": "^10.6.4"
     }
   },
-  "packageManager": "pnpm@10.6.4+sha512.da3d715bfd22a9a105e6e8088cfc7826699332ded60c423b14ec613a185f1602206702ff0fe4c438cb15c979081ce4cb02568e364b15174503a63c7a8e2a5f6c",
+  "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39",
   "manypkg": {
     "workspaceProtocol": "require"
   }

patches/eslint-config-sheriff.patch

@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index 2b83747e0517c5883b6cadc86a6bf3b78d5abfae..b8865ef3baa146e9eef1548510e15bf76ad70f66 100644
+index 2b83747e0517c5883b6cadc86a6bf3b78d5abfae..c5a0f0fe6e47899f9a30e500df4ab844e241a9e5 100644
 --- a/dist/index.js
 +++ b/dist/index.js
 @@ -16,7 +16,8 @@ var tsExtensions = "ts,mts,cts";
@@ -12,3 +12,20 @@ index 2b83747e0517c5883b6cadc86a6bf3b78d5abfae..b8865ef3baa146e9eef1548510e15bf7
  var testsFilePatterns = [
    `**/*.{test,spec}.{${allJsExtensions}}`,
    `**/tests/**/*.{${allJsExtensions}}`,
+@@ -1192,7 +1193,7 @@ var getExportableConfig = (userConfigChoices = sheriffStartingOptions, areAllRul
+ };
+ 
+ // src/index.ts
+-import {} from "@typescript-eslint/utils";
++import { TSESLint } from "@typescript-eslint/utils";
+ import { default as default2 } from "typescript-eslint";
+ var exportableAllJsExtensions = allJsExtensions;
+ var exportableAllJsxExtensions = allJsxExtensions;
+@@ -1201,6 +1202,7 @@ var exportableSheriffStartingOptions = sheriffStartingOptions;
+ var exportableSupportedFileTypes = supportedFileTypes;
+ var exportableTestsFilePatterns = testsFilePatterns;
+ export {
++  TSESLint,
+   exportableAllJsExtensions as allJsExtensions,
+   exportableAllJsxExtensions as allJsxExtensions,
+   getExportableConfig as default,