lucid-package 0.0.127 → 0.0.129

package/src/package.d.ts

@@ -1,11 +1,13 @@
+import { PackageManagerOptions } from './installationutil';
 import { PackageManifest } from './packagemanifest';
-export declare function createEmptyPackage(root: string): Promise<void>;
+export declare function createEmptyPackage(root: string, packageManagerOptions: PackageManagerOptions): Promise<void>;
 export declare function currentlyInPackage(): boolean;
 export declare function readJson(path: string): Promise<any>;
 export declare function modifyManifest(callback: (manifest: PackageManifest) => void | Promise<void>, manifestOverrideEnv?: string): Promise<void>;
-export declare function updateAllExtensionSDK(): Promise<void>;
+export declare function updateAllExtensionSDK(packageManagerOptions: PackageManagerOptions): Promise<void>;
 /**
  *
+ * @param packageManagerOptions Options for which package manager to use (npm or pnpm)
  * @param manifestOverrideEnv The environment definine what manifest to read from. `manifest.env.json`
  */
-export declare function writePackage(quiet?: boolean, manifestOverrideEnv?: string, skipSdkDependency?: boolean): Promise<void>;
+export declare function writePackage(packageManagerOptions: PackageManagerOptions, quiet?: boolean, manifestOverrideEnv?: string, skipSdkDependency?: boolean): Promise<void>;

package/src/package.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePackage = exports.updateAllExtensionSDK = exports.modifyManifest = exports.readJson = exports.currentlyInPackage = exports.createEmptyPackage = void 0;
+exports.createEmptyPackage = createEmptyPackage;
+exports.currentlyInPackage = currentlyInPackage;
+exports.readJson = readJson;
+exports.modifyManifest = modifyManifest;
+exports.updateAllExtensionSDK = updateAllExtensionSDK;
+exports.writePackage = writePackage;
 const fsOld = require("fs");
 const fs = require("fs/promises");
 const JSZip = require("jszip");
@@ -8,26 +13,31 @@ const lucid_extension_sdk_1 = require("lucid-extension-sdk");
 const path = require("path");
 const editorextension_1 = require("./editorextension");
 const filesystemutil_1 = require("./filesystemutil");
+const installationutil_1 = require("./installationutil");
 const packagemanifest_1 = require("./packagemanifest");
 const shapelibrary_1 = require("./shapelibrary");
 const shellutil_1 = require("./shellutil");
 const theme_1 = require("./theme");
 const ziputil_1 = require("./ziputil");
-async function createEmptyPackage(root) {
+async function createEmptyPackage(root, packageManagerOptions) {
     console.log((0, theme_1.success)('Creating Lucid Suite package in ' + root));
     const source = path.join(__dirname, '..', 'templates', 'package');
-    (0, filesystemutil_1.copyFolderRecursiveSync)(source, root);
+    (0, filesystemutil_1.copyFolderRecursiveSync)(source, root, (0, filesystemutil_1.getPackageManagerExcludePaths)(source, packageManagerOptions.mode));
+    // For npm mode, modify package.json to use npm exec instead of pnpm dlx
+    if (packageManagerOptions.mode === installationutil_1.PackageManagerMode.Npm) {
+        const packageJsonPath = path.join(root, 'package.json');
+        let content = fsOld.readFileSync(packageJsonPath, 'utf8');
+        content = content.replace(/pnpm dlx/g, 'npm exec --');
+        fsOld.writeFileSync(packageJsonPath, content);
+    }
 }
-exports.createEmptyPackage = createEmptyPackage;
 function currentlyInPackage() {
     return ((fsOld.existsSync('editorextensions') || fsOld.existsSync('shapelibraries')) &&
         fsOld.existsSync('manifest.json'));
 }
-exports.currentlyInPackage = currentlyInPackage;
 async function readJson(path) {
     return JSON.parse(await fs.readFile(path, 'utf8'));
 }
-exports.readJson = readJson;
 const allScopes = new Set([
     'DOWNLOAD',
     'NETWORK',
@@ -45,22 +55,22 @@ async function modifyManifest(callback, manifestOverrideEnv) {
     await callback(manifest);
     await fs.writeFile('manifest.json', JSON.stringify(manifest, undefined, 2));
 }
-exports.modifyManifest = modifyManifest;
-async function updateAllExtensionSDK() {
+async function updateAllExtensionSDK(packageManagerOptions) {
     const manifest = await (0, packagemanifest_1.readManifest)();
     for (const extension of manifest['extensions'] || []) {
-        const parts = extension['codePath'].split(path.sep);
+        const codePath = (0, filesystemutil_1.getNormalizedZipPath)(extension['codePath']);
+        const parts = codePath.split(path.posix.sep);
         if (parts[0] === 'editorextensions') {
-            await (0, editorextension_1.updateExtensionSDK)(parts[1]);
+            await (0, editorextension_1.updateExtensionSDK)(parts[1], packageManagerOptions);
         }
     }
 }
-exports.updateAllExtensionSDK = updateAllExtensionSDK;
 /**
  *
+ * @param packageManagerOptions Options for which package manager to use (npm or pnpm)
  * @param manifestOverrideEnv The environment definine what manifest to read from. `manifest.env.json`
  */
-async function writePackage(quiet = false, manifestOverrideEnv, skipSdkDependency = false) {
+async function writePackage(packageManagerOptions, quiet = false, manifestOverrideEnv, skipSdkDependency = false) {
     const zip = new JSZip();
     const quietableConsoleLog = (...data) => {
         if (!quiet) {
@@ -86,7 +96,9 @@ async function writePackage(quiet = false, manifestOverrideEnv, skipSdkDependenc
                     .join(', ')}`);
                 process.exit(1);
             }
-            const parts = extension['codePath'].split(path.sep);
+            const codePath = (0, filesystemutil_1.getNormalizedZipPath)(extension['codePath']);
+            extension['codePath'] = codePath;
+            const parts = codePath.split(path.posix.sep);
             if (parts[0] === 'editorextensions') {
                 //Can't just call the method, as the WebpackCLI class does process.exit(2) :facepalm:
                 quietableConsoleLog((0, theme_1.success)(`Compiling editor extension ${parts[1]}`));
@@ -95,7 +107,12 @@ async function writePackage(quiet = false, manifestOverrideEnv, skipSdkDependenc
                     process.argv[0] +
                     '" "' +
                     process.argv[1] +
-                    '" build-editor-extension ' +
+                    '" ' +
+                    // --mode and --package-manager-path are global args, so they need to go before
+                    // build-editor-extension (but after the script path)
+                    `--mode ${packageManagerOptions.mode} ` +
+                    `--package-manager-path "${packageManagerOptions.packageManagerPath}" ` +
+                    'build-editor-extension ' +
                     (quiet ? '--quiet ' : '') +
                     (skipSdkDependency ? '--skip-sdk ' : '') +
                     '"' +
@@ -104,16 +121,18 @@ async function writePackage(quiet = false, manifestOverrideEnv, skipSdkDependenc
                 quietableConsoleLog(cmd);
                 quietableConsoleLog((0, shellutil_1.execSyncLoggingOutputOnError)(cmd, (quiet = quiet)).toString());
             }
-            (0, ziputil_1.jsZipFileDeterministic)(zip, extension['codePath'], await fs.readFile(extension['codePath']));
+            (0, ziputil_1.jsZipFileDeterministic)(zip, codePath, await fs.readFile(codePath));
         }
         //Do the same for each shape library
         for (const library of manifest['shapeLibraries'] || []) {
-            const parts = library['lcszPath'].split(path.sep);
+            const lcszPath = (0, filesystemutil_1.getNormalizedZipPath)(library['lcszPath']);
+            library['lcszPath'] = lcszPath;
+            const parts = lcszPath.split(path.posix.sep);
             if (parts[0] === 'shapelibraries') {
                 quietableConsoleLog((0, theme_1.success)(`Building shape library ${parts[1]}`));
                 await (0, shapelibrary_1.buildShapeLibrary)(parts[1].replace('.lcsz', ''), quiet);
             }
-            (0, ziputil_1.jsZipFileDeterministic)(zip, library['lcszPath'], await fs.readFile(library['lcszPath']));
+            (0, ziputil_1.jsZipFileDeterministic)(zip, lcszPath, await fs.readFile(lcszPath));
         }
         //Add any static resources
         const checkDirForResources = async (directory, zipDirectory) => {
@@ -157,4 +176,3 @@ async function writePackage(quiet = false, manifestOverrideEnv, skipSdkDependenc
         await fs.writeFile(fileName, zipBytes);
     }, manifestOverrideEnv);
 }
-exports.writePackage = writePackage;

package/src/packagemanifest.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readManifest = exports.SettingType = void 0;
+exports.SettingType = void 0;
+exports.readManifest = readManifest;
 const fs = require("fs");
 const fsPromises = require("fs/promises");
 const lucid_extension_sdk_1 = require("lucid-extension-sdk");
@@ -258,4 +259,3 @@ async function readManifest(manifestOverrideEnv, basePath = '.') {
     validateManifestOrThrow(raw);
     return raw;
 }
-exports.readManifest = readManifest;

package/src/reactframeworkutils.d.ts

@@ -1 +1,2 @@
-export declare function createReactEditorExtension(name: string, flavor: string, isInternal: boolean, skipSDKDependency: boolean): Promise<void>;
+import { PackageManagerOptions } from './installationutil';
+export declare function createReactEditorExtension(name: string, flavor: string, isInternal: boolean, packageManagerOptions: PackageManagerOptions, skipSDKDependency: boolean): Promise<void>;

package/src/reactframeworkutils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReactEditorExtension = void 0;
+exports.createReactEditorExtension = createReactEditorExtension;
 const fs = require("fs/promises");
 const path = require("path");
 const editorextension_1 = require("./editorextension");
@@ -8,8 +8,8 @@ const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
 const theme_1 = require("./theme");
 const REACT_PROJECT_NAME = 'react-app';
-async function createReactEditorExtension(name, flavor, isInternal, skipSDKDependency) {
-    await (0, editorextension_1.createEditorExtension)(name, isInternal, skipSDKDependency, path.join('react', 'skeleton'), [
+async function createReactEditorExtension(name, flavor, isInternal, packageManagerOptions, skipSDKDependency) {
+    await (0, editorextension_1.createEditorExtension)(name, isInternal, packageManagerOptions, skipSDKDependency, path.join('react', 'skeleton'), [
         'webpack-shell-plugin-next',
     ]);
     let typescript = false;
@@ -26,7 +26,7 @@ async function createReactEditorExtension(name, flavor, isInternal, skipSDKDepen
     const reactEditorExtensionTargetFolder = path.join(process.cwd(), REACT_PROJECT_NAME);
     const publicTargetFolder = path.join(process.cwd(), '..', '..', 'public');
     console.log((0, theme_1.success)('Creating React project in ' + reactEditorExtensionTargetFolder));
-    (0, installationutil_1.installReactProject)(REACT_PROJECT_NAME, typescript);
+    (0, installationutil_1.installReactProject)(REACT_PROJECT_NAME, typescript, packageManagerOptions);
     await fs.mkdir(path.join(publicTargetFolder, name));
     await copyFilesTo(path.join(reactEditorExtensionTargetFolder, 'public'), path.join(publicTargetFolder, name), [
         '.png',
@@ -38,7 +38,10 @@ async function createReactEditorExtension(name, flavor, isInternal, skipSDKDepen
         '.svg',
         '.ico',
     ]);
-    const webpackConfig = (await fs.readFile('webpack.config.js', 'utf8')).replace('<<dynamicname>>', REACT_PROJECT_NAME);
+    const reactBuildCommand = `${packageManagerOptions.packageManagerPath} exec -- react-scripts build`;
+    const webpackConfig = (await fs.readFile('webpack.config.js', 'utf8'))
+        .replace('<<dynamicname>>', REACT_PROJECT_NAME)
+        .replace('<<reactbuildcommand>>', reactBuildCommand);
     const extensionTemplateCode = (await fs.readFile(path.join('src', 'extension.ts'), 'utf8')).replace('<<dynamicname>>', REACT_PROJECT_NAME);
     await fs.writeFile(path.join(process.cwd(), 'webpack.config.js'), webpackConfig);
     await fs.writeFile(path.join('src', 'extension.ts'), extensionTemplateCode);
@@ -56,9 +59,8 @@ async function createReactEditorExtension(name, flavor, isInternal, skipSDKDepen
     const apptsx = (await fs.readFile(path.join('src', appName), 'utf8')).replace('{logo}', '"logo.svg"');
     await fs.writeFile(path.join('src', appName), apptsx);
     console.log('Installing React dependencies');
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, skipSDKDependency);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, packageManagerOptions, skipSDKDependency);
 }
-exports.createReactEditorExtension = createReactEditorExtension;
 async function copyFilesTo(sourceFolder, destFolder, endingWith) {
     (await fs.readdir(sourceFolder))
         .filter((filename) => endingWith.some((ext) => filename.endsWith(ext)))

package/src/shapelibrary.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugShapeLibraries = exports.buildShapeLibrary = exports.getShapeListJson = exports.createImageShapeLibrary = exports.createEmptyShapeLibrary = void 0;
+exports.createEmptyShapeLibrary = createEmptyShapeLibrary;
+exports.createImageShapeLibrary = createImageShapeLibrary;
+exports.getShapeListJson = getShapeListJson;
+exports.buildShapeLibrary = buildShapeLibrary;
+exports.debugShapeLibraries = debugShapeLibraries;
 const express = require("express");
 const fsSync = require("fs");
 const fs = require("fs/promises");
@@ -28,11 +32,10 @@ async function createEmptyShapeLibrary(name) {
         manifest['shapeLibraries'].push({
             'name': name,
             'product': 'chart',
-            'lcszPath': path.join('shapelibraries', `${name}.lcsz`),
+            'lcszPath': path.posix.join('shapelibraries', `${name}.lcsz`),
         });
     });
 }
-exports.createEmptyShapeLibrary = createEmptyShapeLibrary;
 async function createImageShapeLibrary(name, imagePath, config) {
     console.log((0, theme_1.success)('Creating image shape library in ' + path.join('shapelibraries', name)));
     if (!fsSync.lstatSync(imagePath).isDirectory()) {
@@ -119,12 +122,11 @@ async function createImageShapeLibrary(name, imagePath, config) {
             manifest['shapeLibraries'].push({
                 'name': name,
                 'product': 'chart',
-                'lcszPath': path.join('shapelibraries', `${name}.lcsz`),
+                'lcszPath': path.posix.join('shapelibraries', `${name}.lcsz`),
             });
         }
     });
 }
-exports.createImageShapeLibrary = createImageShapeLibrary;
 const defaultNameMap = new Map([
     ['rounding', 'Rounding'],
     ['fillColor', 'FillColor'],
@@ -172,7 +174,7 @@ async function getShapeListJson(nameInPackageManifest, packagePath, port = 9901)
             'Stencil': {
                 'lcszVersion': '1',
                 'name': shapeName,
-                'i18n': {},
+                'i18n': {}, //TODO?
                 'locked': shapeData['locked'],
                 'sourcePackage': {
                     'packageId': packageManifest['id'] ?? '__local__',
@@ -219,7 +221,7 @@ async function getShapeListJson(nameInPackageManifest, packagePath, port = 9901)
         }
         if (shapeData['locked']?.includes('aspectRatio') && !properties['AspectRatio']) {
             properties['AspectRatio'] =
-                shapeManifest['defaults']['width'] / shapeManifest['defaults']['height'] ?? 1;
+                shapeManifest['defaults']['width'] / shapeManifest['defaults']['height'];
         }
         return {
             'class': 'CustomBlock',
@@ -232,7 +234,6 @@ async function getShapeListJson(nameInPackageManifest, packagePath, port = 9901)
         };
     })));
 }
-exports.getShapeListJson = getShapeListJson;
 async function buildShapeLibrary(name, quiet) {
     const zip = new JSZip();
     const addToZip = async (source) => {
@@ -259,7 +260,6 @@ async function buildShapeLibrary(name, quiet) {
     }
     await fs.writeFile(`shapelibraries/${name}.lcsz`, zipBytes);
 }
-exports.buildShapeLibrary = buildShapeLibrary;
 async function debugShapeLibraries(packagePath = '.', pickAnyPort = false) {
     let port = 9901;
     const app = express();
@@ -349,4 +349,3 @@ async function debugShapeLibraries(packagePath = '.', pickAnyPort = false) {
     };
     listen();
 }
-exports.debugShapeLibraries = debugShapeLibraries;

package/src/shellutil.d.ts

@@ -1,2 +1 @@
-/// <reference types="node" />
-export declare function execSyncLoggingOutputOnError(cmd: string, quiet?: boolean): Buffer;
+export declare function execSyncLoggingOutputOnError(cmd: string, quiet?: boolean): Buffer<ArrayBufferLike>;

package/src/shellutil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execSyncLoggingOutputOnError = void 0;
+exports.execSyncLoggingOutputOnError = execSyncLoggingOutputOnError;
 const child_process = require("child_process");
 const theme_1 = require("./theme");
 function execSyncLoggingOutputOnError(cmd, quiet = false) {
@@ -13,4 +13,3 @@ function execSyncLoggingOutputOnError(cmd, quiet = false) {
         throw e;
     }
 }
-exports.execSyncLoggingOutputOnError = execSyncLoggingOutputOnError;

package/src/ziputil.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as JSZip from 'jszip';
 import { Buffer } from 'buffer';
 type JSZipInputType = string | Buffer | Uint8Array | ArrayBuffer | Blob | number[];

package/src/ziputil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsZipFileDeterministic = void 0;
+exports.jsZipFileDeterministic = jsZipFileDeterministic;
 const filesystemutil_1 = require("./filesystemutil");
 // Use a fixed date for deterministic files and directories inside the zip
 const DETERMINISTIC_DATE = new Date('2000-01-01T00:00:00Z');
@@ -38,4 +38,3 @@ function jsZipFileDeterministic(zip, filePath, data, options) {
     ;
     return zip.file(normalizedPath, data, { ...options, date: fileDate });
 }
-exports.jsZipFileDeterministic = jsZipFileDeterministic;

package/templates/dataconnector/package-lock.json

@@ -258,6 +258,22 @@
             "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
             "license": "MIT"
         },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "license": "MIT"
+        },
+        "node_modules/axios": {
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+            "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+            "license": "MIT",
+            "dependencies": {
+                "follow-redirects": "^1.14.9",
+                "form-data": "^4.0.0"
+            }
+        },
         "node_modules/balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -389,6 +405,18 @@
                 "fsevents": "~2.3.2"
             }
         },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "license": "MIT",
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -448,6 +476,15 @@
                 "ms": "2.0.0"
             }
         },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
         "node_modules/depd": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -536,6 +573,21 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/es-set-tostringtag": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.6",
+                "has-tostringtag": "^1.0.2",
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/escape-html": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -628,6 +680,42 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/follow-redirects": {
+            "version": "1.15.11",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+            "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/form-data": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+            "license": "MIT",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "es-set-tostringtag": "^2.1.0",
+                "hasown": "^2.0.2",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/forwarded": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -646,21 +734,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/fsevents": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
         "node_modules/function-bind": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -754,6 +827,21 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/has-tostringtag": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+            "license": "MIT",
+            "dependencies": {
+                "has-symbols": "^1.0.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/hasown": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",