From 53ad01e3d0b5522b365b83cf5d4ae775a86049f6 Mon Sep 17 00:00:00 2001 From: Adam Skoufis Date: Fri, 19 Apr 2024 15:15:04 +1000 Subject: [PATCH] Replace `memoizee` with `nano-memoize` --- .changeset/olive-humans-repair.md | 5 + .../webpack/plugins/createHtmlRenderPlugin.js | 2 +- .../config/webpack/utils/resolvePackage.js | 3 +- packages/sku/package.json | 2 +- pnpm-lock.yaml | 115 ++---------------- 5 files changed, 16 insertions(+), 111 deletions(-) create mode 100644 .changeset/olive-humans-repair.md diff --git a/.changeset/olive-humans-repair.md b/.changeset/olive-humans-repair.md new file mode 100644 index 000000000..e1cbc89e7 --- /dev/null +++ b/.changeset/olive-humans-repair.md @@ -0,0 +1,5 @@ +--- +'sku': patch +--- + +Replace `memoizee` dependency with `nano-memoize` diff --git a/packages/sku/config/webpack/plugins/createHtmlRenderPlugin.js b/packages/sku/config/webpack/plugins/createHtmlRenderPlugin.js index 780f25b8c..12c8c7912 100644 --- a/packages/sku/config/webpack/plugins/createHtmlRenderPlugin.js +++ b/packages/sku/config/webpack/plugins/createHtmlRenderPlugin.js @@ -1,5 +1,5 @@ const { HtmlRenderPlugin } = require('html-render-webpack-plugin'); -const memoize = require('memoizee/weak'); +const { default: memoize } = require('nano-memoize'); const debug = require('debug'); const { diff --git a/packages/sku/config/webpack/utils/resolvePackage.js b/packages/sku/config/webpack/utils/resolvePackage.js index 31ab0a869..60e8bcf66 100644 --- a/packages/sku/config/webpack/utils/resolvePackage.js +++ b/packages/sku/config/webpack/utils/resolvePackage.js @@ -1,5 +1,5 @@ const path = require('node:path'); -const memoize = require('memoizee'); +const { default: memoize } = require('nano-memoize'); const debug = require('debug')('sku:resolvePackage'); const { cwd } = require('../../../lib/cwd'); @@ -37,6 +37,7 @@ const createPackageResolver = (fs, resolve) => { * * Throws if a package is listed in the project's dependencies and cannot be resolved. */ + /** @param {string} packageName */ function resolvePackage(packageName) { try { // First, try to use require.resolve to find the package. diff --git a/packages/sku/package.json b/packages/sku/package.json index 3b197a993..a466b79f9 100644 --- a/packages/sku/package.json +++ b/packages/sku/package.json @@ -98,9 +98,9 @@ "less": "^4.1.0", "less-loader": "^12.0.0", "lint-staged": "^11.1.1", - "memoizee": "^0.4.15", "mini-css-extract-plugin": "^2.6.1", "minimist": "^1.2.8", + "nano-memoize": "^3.0.16", "node-html-parser": "^6.1.1", "open": "^7.3.1", "path-to-regexp": "^6.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9c316884..b57e69100 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -704,15 +704,15 @@ importers: lint-staged: specifier: ^11.1.1 version: 11.2.6 - memoizee: - specifier: ^0.4.15 - version: 0.4.15 mini-css-extract-plugin: specifier: ^2.6.1 version: 2.8.1(webpack@5.91.0) minimist: specifier: ^1.2.8 version: 1.2.8 + nano-memoize: + specifier: ^3.0.16 + version: 3.0.16 node-html-parser: specifier: ^6.1.1 version: 6.1.13 @@ -7746,14 +7746,6 @@ packages: fs-exists-sync: 0.1.0 dev: true - /d@1.0.2: - resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} - engines: {node: '>=0.12'} - dependencies: - es5-ext: 0.10.64 - type: 2.7.2 - dev: false - /data-uri-to-buffer@6.0.2: resolution: {integrity: sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==} engines: {node: '>= 14'} @@ -8541,42 +8533,6 @@ packages: is-date-object: 1.0.5 is-symbol: 1.0.4 - /es5-ext@0.10.64: - resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==} - engines: {node: '>=0.10'} - requiresBuild: true - dependencies: - es6-iterator: 2.0.3 - es6-symbol: 3.1.4 - esniff: 2.0.1 - next-tick: 1.1.0 - dev: false - - /es6-iterator@2.0.3: - resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==} - dependencies: - d: 1.0.2 - es5-ext: 0.10.64 - es6-symbol: 3.1.4 - dev: false - - /es6-symbol@3.1.4: - resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==} - engines: {node: '>=0.12'} - dependencies: - d: 1.0.2 - ext: 1.7.0 - dev: false - - /es6-weak-map@2.0.3: - resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==} - dependencies: - d: 1.0.2 - es5-ext: 0.10.64 - es6-iterator: 2.0.3 - es6-symbol: 3.1.4 - dev: false - /esbuild-plugin-alias@0.2.1: resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==} dev: false @@ -9033,16 +8989,6 @@ packages: transitivePeerDependencies: - supports-color - /esniff@2.0.1: - resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==} - engines: {node: '>=0.10'} - dependencies: - d: 1.0.2 - es5-ext: 0.10.64 - event-emitter: 0.3.5 - type: 2.7.2 - dev: false - /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -9092,13 +9038,6 @@ packages: require-like: 0.1.2 dev: false - /event-emitter@0.3.5: - resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==} - dependencies: - d: 1.0.2 - es5-ext: 0.10.64 - dev: false - /eventemitter3@4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} @@ -9206,12 +9145,6 @@ packages: transitivePeerDependencies: - supports-color - /ext@1.7.0: - resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==} - dependencies: - type: 2.7.2 - dev: false - /extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} dev: true @@ -10650,10 +10583,6 @@ packages: /is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} - /is-promise@2.2.2: - resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==} - dev: false - /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -11859,12 +11788,6 @@ packages: engines: {node: '>=12'} dev: true - /lru-queue@0.1.0: - resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} - dependencies: - es5-ext: 0.10.64 - dev: false - /lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true @@ -11964,19 +11887,6 @@ packages: dependencies: tslib: 2.6.2 - /memoizee@0.4.15: - resolution: {integrity: sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==} - dependencies: - d: 1.0.2 - es5-ext: 0.10.64 - es6-weak-map: 2.0.3 - event-emitter: 0.3.5 - is-promise: 2.2.2 - lru-queue: 0.1.0 - next-tick: 1.1.0 - timers-ext: 0.1.7 - dev: false - /memoizerific@1.11.3: resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==} dependencies: @@ -12207,6 +12117,10 @@ packages: dns-packet: 5.6.1 thunky: 1.1.0 + /nano-memoize@3.0.16: + resolution: {integrity: sha512-JyK96AKVGAwVeMj3MoMhaSXaUNqgMbCRSQB3trUV8tYZfWEzqUBKdK1qJpfuNXgKeHOx1jv/IEYTM659ly7zUA==} + dev: false + /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -12243,10 +12157,6 @@ packages: engines: {node: '>= 0.4.0'} dev: true - /next-tick@1.1.0: - resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - dev: false - /no-case@3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} dependencies: @@ -15073,13 +14983,6 @@ packages: /thunky@1.1.0: resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} - /timers-ext@0.1.7: - resolution: {integrity: sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==} - dependencies: - es5-ext: 0.10.64 - next-tick: 1.1.0 - dev: false - /tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} @@ -15260,10 +15163,6 @@ packages: media-typer: 0.3.0 mime-types: 2.1.35 - /type@2.7.2: - resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==} - dev: false - /typed-array-buffer@1.0.2: resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'}