diff --git a/.github/actions/setup-maker/action.yml b/.github/actions/setup-maker/action.yml new file mode 100644 index 0000000000..dd8c05fb1f --- /dev/null +++ b/.github/actions/setup-maker/action.yml @@ -0,0 +1,11 @@ +name: Setup maker +description: 'Setup maker dmg for electron' +runs: + using: 'composite' + steps: + - name: 'Install create-dmg from brew' + shell: bash + run: brew install create-dmg + - name: 'Build @affine/makder-dmg' + shell: bash + run: yarn nx build @affine/maker-dmg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c58881e5..4e7a3e803b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -386,6 +386,9 @@ jobs: with: playwright-install: true hard-link-nm: false + - name: Setup Maker + uses: ./.github/actions/setup-maker + if: ${{ matrix.spec.platform == 'macos' }} - name: Build AFFiNE native uses: ./.github/actions/build-rust with: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 1e809f171b..3441b309f1 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -111,6 +111,9 @@ jobs: - uses: actions/checkout@v3 - name: Setup Node.js uses: ./.github/actions/setup-node + - name: Setup Maker + uses: ./.github/actions/setup-maker + if: ${{ matrix.spec.platform == 'macos' }} - name: Build AFFiNE native uses: ./.github/actions/build-rust with: diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index c2b37d261a..d12a05b46e 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -113,6 +113,9 @@ jobs: - uses: actions/checkout@v3 - name: Setup Node.js uses: ./.github/actions/setup-node + - name: Setup Maker + uses: ./.github/actions/setup-maker + if: ${{ matrix.spec.platform == 'macos' }} - name: Build AFFiNE native uses: ./.github/actions/build-rust with: diff --git a/apps/electron/forge.config.js b/apps/electron/forge.config.js index bfb7a1a51b..bd974f38ef 100644 --- a/apps/electron/forge.config.js +++ b/apps/electron/forge.config.js @@ -59,28 +59,23 @@ module.exports = { }, makers: [ { - name: '@electron-forge/maker-dmg', + name: '@affine/maker-dmg', config: { format: 'ULFO', icon: icnsPath, name: 'AFFiNE', 'icon-size': 128, - background: './resources/icons/dmg-background.png', - contents: [ - { - x: 176, - y: 192, - type: 'file', - path: path.resolve( - __dirname, - 'out', - buildType, - `${productName}-darwin-${arch}`, - `${productName}.app` - ), - }, - { x: 432, y: 192, type: 'link', path: '/Applications' }, - ], + background: path.resolve( + __dirname, + './resources/icons/dmg-background.png' + ), + file: path.resolve( + __dirname, + 'out', + buildType, + `${productName}-darwin-${arch}`, + `${productName}.app` + ), }, }, { diff --git a/apps/electron/package.json b/apps/electron/package.json index 81578e381f..e9e0093018 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -25,6 +25,7 @@ "devDependencies": { "@affine-test/kit": "workspace:*", "@affine/env": "workspace:*", + "@affine/maker-dmg": "workspace:*", "@affine/native": "workspace:*", "@blocksuite/blocks": "0.0.0-20230731152415-fdd3d9b0-nightly", "@blocksuite/editor": "0.0.0-20230731152415-fdd3d9b0-nightly", @@ -34,7 +35,6 @@ "@electron-forge/core": "^6.2.1", "@electron-forge/core-utils": "^6.2.1", "@electron-forge/maker-deb": "^6.2.1", - "@electron-forge/maker-dmg": "^6.2.1", "@electron-forge/maker-squirrel": "^6.2.1", "@electron-forge/maker-zip": "^6.2.1", "@electron-forge/shared-types": "^6.2.1", diff --git a/packages/maker-dmg/README.md b/packages/maker-dmg/README.md new file mode 100644 index 0000000000..21a4633ca0 --- /dev/null +++ b/packages/maker-dmg/README.md @@ -0,0 +1,7 @@ +# @affine/maker-dmg + +## Pre-requisites + +```shell +brew install create-dmg +``` diff --git a/packages/maker-dmg/package.json b/packages/maker-dmg/package.json new file mode 100644 index 0000000000..6e55d02e50 --- /dev/null +++ b/packages/maker-dmg/package.json @@ -0,0 +1,18 @@ +{ + "name": "@affine/maker-dmg", + "version": "1.0.0", + "main": "dist/maker.js", + "scripts": { + "build": "vite build", + "dev": "vite build --watch" + }, + "dependencies": { + "@electron-forge/maker-base": "^6.2.1", + "@electron-forge/shared-types": "^6.2.1", + "fs-extra": "^11.1.1" + }, + "devDependencies": { + "typescript": "^5.1.6", + "vite": "^4.4.7" + } +} diff --git a/packages/maker-dmg/project.json b/packages/maker-dmg/project.json new file mode 100644 index 0000000000..44298f5dff --- /dev/null +++ b/packages/maker-dmg/project.json @@ -0,0 +1,21 @@ +{ + "name": "@affine/maker-dmg", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "projectType": "library", + "sourceRoot": "packages/maker-dmg/src", + "targets": { + "build": { + "executor": "@nx/vite:build", + "options": { + "outputPath": "packages/maker-dmg/dist" + } + }, + "serve": { + "executor": "@nx/vite:build", + "options": { + "outputPath": "packages/maker-dmg/dist", + "watch": true + } + } + } +} diff --git a/packages/maker-dmg/src/config.ts b/packages/maker-dmg/src/config.ts new file mode 100644 index 0000000000..708053d539 --- /dev/null +++ b/packages/maker-dmg/src/config.ts @@ -0,0 +1,74 @@ +export interface CodeSignOptions { + 'signing-identity': string; + identifier?: string; +} + +export interface DMGContents { + x: number; + y: number; + type: 'link' | 'file' | 'position'; + path: string; + name: string; +} + +export interface WindowPositionOptions { + x: number; + y: number; +} + +export interface WindowSizeOptions { + width: number; + height: number; +} + +export interface WindowOptions { + position?: WindowPositionOptions; + size?: WindowSizeOptions; +} + +export interface AdditionalDMGOptions { + 'background-color'?: string; + 'icon-size'?: number; + window?: WindowOptions; + 'code-sign'?: CodeSignOptions; +} + +export interface MakerDMGConfig { + /** + * The application name + */ + name?: string; + /** + * Path to the background for the DMG window + */ + background: string; + /** + * Path to the icon to use for the app in the DMG window + */ + icon: string; + /** + * Overwrite an existing DMG file if if already exists + */ + overwrite?: boolean; + /** + * Enable debug message output + */ + debug?: boolean; + /** + * How big to make the icon for the app in the DMG + */ + iconSize?: number; + /** + * Disk image format + * + * Default: UDZO + */ + format?: 'UDRW' | 'UDRO' | 'UDCO' | 'UDZO' | 'UDBZ' | 'ULFO'; + file: string; + /** + * Additional options to pass through to node-appdmng + * + * All available options are available in the [`appdmg` docs](https://github.com/LinusU/node-appdmg) + */ + additionalDMGOptions?: AdditionalDMGOptions; +} diff --git a/packages/maker-dmg/src/maker.ts b/packages/maker-dmg/src/maker.ts new file mode 100644 index 0000000000..197e287286 --- /dev/null +++ b/packages/maker-dmg/src/maker.ts @@ -0,0 +1,77 @@ +import { execFileSync } from 'node:child_process'; +import { cp, mkdtemp } from 'node:fs/promises'; +import os from 'node:os'; +import { join, resolve } from 'node:path'; + +import type { MakerOptions } from '@electron-forge/maker-base'; +import { MakerBase } from '@electron-forge/maker-base'; +import type { ForgePlatform } from '@electron-forge/shared-types'; + +import type { MakerDMGConfig } from './config'; + +export default class MakerDMG extends MakerBase { + name = 'dmg'; + + defaultPlatforms: ForgePlatform[] = ['darwin', 'mas']; + + override isSupportedOnCurrentPlatform(): boolean { + return process.platform === 'darwin'; + } + + override async make({ + dir, + makeDir, + appName, + packageJSON, + targetArch, + }: MakerOptions): Promise { + const outPath = resolve(makeDir, `${this.config.name || appName}.dmg`); + const forgeDefaultOutPath = resolve( + makeDir, + `${appName}-${packageJSON.version}-${targetArch}.dmg` + ); + + await this.ensureFile(outPath); + + const args = [ + '--volname', + appName, + '--window-size', + '610', + '365', + '--background', + this.config.background, + '--icon-size', + '128', + '--icon', + `${appName}.app`, + '176', + '192', + '--hide-extension', + `${appName}.app`, + '--app-drop-link', + '423', + '192', + ]; + + const tempDir = await mkdtemp(join(os.tmpdir(), 'electron-forge-dmg-')); + const filePath = join(tempDir, `${appName}.app`); + try { + await cp(this.config.file, filePath, { + recursive: true, + }); + args.push(outPath, filePath); + + execFileSync('create-dmg', args, { + cwd: dir, + env: process.env, + stdio: 'inherit', + shell: true, + }); + } finally { + // await rm(filePath, { force: true }); + } + + return [forgeDefaultOutPath]; + } +} diff --git a/packages/maker-dmg/tsconfig.json b/packages/maker-dmg/tsconfig.json new file mode 100644 index 0000000000..8034f93ce4 --- /dev/null +++ b/packages/maker-dmg/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "include": ["./src"], + "compilerOptions": { + "composite": true, + "noEmit": false, + "outDir": "lib" + } +} diff --git a/packages/maker-dmg/vite.config.ts b/packages/maker-dmg/vite.config.ts new file mode 100644 index 0000000000..72208ed283 --- /dev/null +++ b/packages/maker-dmg/vite.config.ts @@ -0,0 +1,29 @@ +import { resolve } from 'node:path'; + +import { fileURLToPath } from 'url'; +import { defineConfig } from 'vite'; + +const root = fileURLToPath(new URL('.', import.meta.url)); + +export default defineConfig({ + build: { + emptyOutDir: true, + minify: false, + lib: { + entry: { + maker: resolve(root, 'src/maker.ts'), + }, + formats: ['cjs'], + }, + rollupOptions: { + output: { + exports: 'named', + }, + external: [ + '@electron-forge/maker-base', + '@electron-forge/shared-types', + /^node:/, + ], + }, + }, +}); diff --git a/tsconfig.json b/tsconfig.json index 197c7eb833..d001e001c4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -148,6 +148,9 @@ { "path": "./packages/y-indexeddb" }, + { + "path": "./packages/maker-dmg" + }, // Tests { "path": "./tests/kit" diff --git a/yarn.lock b/yarn.lock index 23dfcf254f..d86835dbc9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -304,6 +304,7 @@ __metadata: dependencies: "@affine-test/kit": "workspace:*" "@affine/env": "workspace:*" + "@affine/maker-dmg": "workspace:*" "@affine/native": "workspace:*" "@blocksuite/blocks": 0.0.0-20230731152415-fdd3d9b0-nightly "@blocksuite/editor": 0.0.0-20230731152415-fdd3d9b0-nightly @@ -313,7 +314,6 @@ __metadata: "@electron-forge/core": ^6.2.1 "@electron-forge/core-utils": ^6.2.1 "@electron-forge/maker-deb": ^6.2.1 - "@electron-forge/maker-dmg": ^6.2.1 "@electron-forge/maker-squirrel": ^6.2.1 "@electron-forge/maker-zip": ^6.2.1 "@electron-forge/shared-types": ^6.2.1 @@ -444,6 +444,18 @@ __metadata: languageName: unknown linkType: soft +"@affine/maker-dmg@workspace:*, @affine/maker-dmg@workspace:packages/maker-dmg": + version: 0.0.0-use.local + resolution: "@affine/maker-dmg@workspace:packages/maker-dmg" + dependencies: + "@electron-forge/maker-base": ^6.2.1 + "@electron-forge/shared-types": ^6.2.1 + fs-extra: ^11.1.1 + typescript: ^5.1.6 + vite: ^4.4.7 + languageName: unknown + linkType: soft + "@affine/monorepo@workspace:.": version: 0.0.0-use.local resolution: "@affine/monorepo@workspace:." @@ -3875,7 +3887,7 @@ __metadata: languageName: node linkType: hard -"@electron-forge/maker-base@npm:6.2.1, @electron-forge/maker-base@npm:^6.0.4": +"@electron-forge/maker-base@npm:6.2.1, @electron-forge/maker-base@npm:^6.0.4, @electron-forge/maker-base@npm:^6.2.1": version: 6.2.1 resolution: "@electron-forge/maker-base@npm:6.2.1" dependencies: @@ -3900,21 +3912,6 @@ __metadata: languageName: node linkType: hard -"@electron-forge/maker-dmg@npm:^6.2.1": - version: 6.2.1 - resolution: "@electron-forge/maker-dmg@npm:6.2.1" - dependencies: - "@electron-forge/maker-base": 6.2.1 - "@electron-forge/shared-types": 6.2.1 - electron-installer-dmg: ^4.0.0 - fs-extra: ^10.0.0 - dependenciesMeta: - electron-installer-dmg: - optional: true - checksum: 7e00dfa17ac5045f7163bef8836869abc0940e6588641756a5ffea5d93b5c477d93ccb42ef223c2b4a018406466e4a8230663591fff48f1688acf54314e5e366 - languageName: node - linkType: hard - "@electron-forge/maker-squirrel@npm:^6.2.1": version: 6.2.1 resolution: "@electron-forge/maker-squirrel@npm:6.2.1" @@ -13586,27 +13583,6 @@ __metadata: languageName: node linkType: hard -"appdmg@npm:^0.6.4": - version: 0.6.6 - resolution: "appdmg@npm:0.6.6" - dependencies: - async: ^1.4.2 - ds-store: ^0.1.5 - execa: ^1.0.0 - fs-temp: ^1.0.0 - fs-xattr: ^0.3.0 - image-size: ^0.7.4 - is-my-json-valid: ^2.20.0 - minimist: ^1.1.3 - parse-color: ^1.0.0 - path-exists: ^4.0.0 - repeat-string: ^1.5.4 - bin: - appdmg: bin/appdmg.js - conditions: os=darwin - languageName: node - linkType: hard - "append-field@npm:^1.0.0": version: 1.0.0 resolution: "append-field@npm:1.0.0" @@ -13962,13 +13938,6 @@ __metadata: languageName: node linkType: hard -"async@npm:^1.4.2": - version: 1.5.2 - resolution: "async@npm:1.5.2" - checksum: fe5d6214d8f15bd51eee5ae8ec5079b228b86d2d595f47b16369dec2e11b3ff75a567bb5f70d12d79006665fbbb7ee0a7ec0e388524eefd454ecbe651c124ebd - languageName: node - linkType: hard - "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -14316,15 +14285,6 @@ __metadata: languageName: node linkType: hard -"base32-encode@npm:^0.1.0 || ^1.0.0": - version: 1.2.0 - resolution: "base32-encode@npm:1.2.0" - dependencies: - to-data-view: ^1.1.0 - checksum: b8df667599d50b2c9fca206fcab9bf6500d2e980b14da204eb7de5ce978c99e4874e8138d109bd88d5bca1bfb5ae83926bca37b084d2c9842f8acb12b4b839d9 - languageName: node - linkType: hard - "base64-arraybuffer-es6@npm:^0.7.0": version: 0.7.0 resolution: "base64-arraybuffer-es6@npm:0.7.0" @@ -14531,15 +14491,6 @@ __metadata: languageName: node linkType: hard -"bplist-creator@npm:~0.0.3": - version: 0.0.8 - resolution: "bplist-creator@npm:0.0.8" - dependencies: - stream-buffers: ~2.2.0 - checksum: 7a98c7fb3c1b505a0667abd0f8c976bc01c4437fbb52cb902076a3aea3523e8d44111e21a4228c4c3b307d1c4a727968ed02bd91daf0aea7efed5081db92fb95 - languageName: node - linkType: hard - "bplist-parser@npm:^0.2.0": version: 0.2.0 resolution: "bplist-parser@npm:0.2.0" @@ -15468,13 +15419,6 @@ __metadata: languageName: node linkType: hard -"color-convert@npm:~0.5.0": - version: 0.5.3 - resolution: "color-convert@npm:0.5.3" - checksum: 1074989a2c216d0171a397b870a0d698ef802ab3f9ece72b35bd92c4d20aeab31f222ea525dd5d3fad175a3f256a750eadd14ab882caed0089efc1cb7ba74086 - languageName: node - linkType: hard - "color-name@npm:1.1.3": version: 1.1.3 resolution: "color-name@npm:1.1.3" @@ -17219,17 +17163,6 @@ __metadata: languageName: node linkType: hard -"ds-store@npm:^0.1.5": - version: 0.1.6 - resolution: "ds-store@npm:0.1.6" - dependencies: - bplist-creator: ~0.0.3 - macos-alias: ~0.2.5 - tn1150: ^0.1.0 - checksum: b574fdd92d8008e6e089ca958a9d186e4cca2b69131004ccc958a06fcea0a1079b6efd0693a74ad7f85b1f5df69edbfb81896eaef1644e1d23c506f9740c0945 - languageName: node - linkType: hard - "dset@npm:^3.1.2": version: 3.1.2 resolution: "dset@npm:3.1.2" @@ -17329,22 +17262,6 @@ __metadata: languageName: node linkType: hard -"electron-installer-dmg@npm:^4.0.0": - version: 4.0.0 - resolution: "electron-installer-dmg@npm:4.0.0" - dependencies: - appdmg: ^0.6.4 - debug: ^4.3.2 - minimist: ^1.1.1 - dependenciesMeta: - appdmg: - optional: true - bin: - electron-installer-dmg: bin/electron-installer-dmg.js - checksum: 59006b5a560bf08096d970a44b429c218cb3b0c99144d8f276a354af66312c6cb215b177e4411a833013754a0033c28b2c2dadf5cd2b1dfee7c8b6b6dbdc9dae - languageName: node - linkType: hard - "electron-log@npm:^5.0.0-beta.24": version: 5.0.0-beta.25 resolution: "electron-log@npm:5.0.0-beta.25" @@ -17490,13 +17407,6 @@ __metadata: languageName: node linkType: hard -"encode-utf8@npm:^1.0.3": - version: 1.0.3 - resolution: "encode-utf8@npm:1.0.3" - checksum: 550224bf2a104b1d355458c8a82e9b4ea07f9fc78387bc3a49c151b940ad26473de8dc9e121eefc4e84561cb0b46de1e4cd2bc766f72ee145e9ea9541482817f - languageName: node - linkType: hard - "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -19189,15 +19099,6 @@ __metadata: languageName: node linkType: hard -"fmix@npm:^0.1.0": - version: 0.1.0 - resolution: "fmix@npm:0.1.0" - dependencies: - imul: ^1.0.0 - checksum: c465344d4f169eaf10d45c33949a1e7a633f09dba2ac7063ce8ae8be743df5979d708f7f24900163589f047f5194ac5fc2476177ce31175e8805adfa7b8fb7a4 - languageName: node - linkType: hard - "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" @@ -19474,24 +19375,6 @@ __metadata: languageName: node linkType: hard -"fs-temp@npm:^1.0.0": - version: 1.2.1 - resolution: "fs-temp@npm:1.2.1" - dependencies: - random-path: ^0.1.0 - checksum: 64d1b96c7adc172a0fbe6116f425f3588ac585dc7011524174e539df7794a4ca81874bb1c8ee74a47991cc35b7dc036f5bf880074844b2165027042b346b38d9 - languageName: node - linkType: hard - -"fs-xattr@npm:^0.3.0": - version: 0.3.1 - resolution: "fs-xattr@npm:0.3.1" - dependencies: - node-gyp: latest - conditions: "!os=win32" - languageName: node - linkType: hard - "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -19587,24 +19470,6 @@ __metadata: languageName: node linkType: hard -"generate-function@npm:^2.0.0": - version: 2.3.1 - resolution: "generate-function@npm:2.3.1" - dependencies: - is-property: ^1.0.2 - checksum: 652f083de206ead2bae4caf9c7eeb465e8d98c0b8ed2a29c6afc538cef0785b5c6eea10548f1e13cc586d3afd796c13c830c2cb3dc612ec2457b2aadda5f57c9 - languageName: node - linkType: hard - -"generate-object-property@npm:^1.1.0": - version: 1.2.0 - resolution: "generate-object-property@npm:1.2.0" - dependencies: - is-property: ^1.0.0 - checksum: 5141ca5fd545f0aabd24fd13f9f3ecf9cfea2255db00d46e282d65141d691d560c70b6361c3c0c4982f86f600361925bfd4773e0350c66d0210e6129ae553a09 - languageName: node - linkType: hard - "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -20866,15 +20731,6 @@ __metadata: languageName: node linkType: hard -"image-size@npm:^0.7.4": - version: 0.7.5 - resolution: "image-size@npm:0.7.5" - bin: - image-size: bin/image-size.js - checksum: f88860c9d9b5c8ad00d3de9d6f5ba105bda5a5024bfb6b90559a075a4b838ed4f5d3cba14edf0f18fe5d75df596a172b52feca43848e11c34f31f4df2c88a011 - languageName: node - linkType: hard - "immediate@npm:~3.0.5": version: 3.0.6 resolution: "immediate@npm:3.0.6" @@ -20932,13 +20788,6 @@ __metadata: languageName: node linkType: hard -"imul@npm:^1.0.0": - version: 1.0.1 - resolution: "imul@npm:1.0.1" - checksum: 6c2af3d5f09e2135e14d565a2c108412b825b221eb2c881f9130467f2adccf7ae201773ae8bcf1be169e2d090567a1fdfa9cf20d3b7da7b9cecb95b920ff3e52 - languageName: node - linkType: hard - "imurmurhash@npm:^0.1.4": version: 0.1.4 resolution: "imurmurhash@npm:0.1.4" @@ -21363,26 +21212,6 @@ __metadata: languageName: node linkType: hard -"is-my-ip-valid@npm:^1.0.0": - version: 1.0.1 - resolution: "is-my-ip-valid@npm:1.0.1" - checksum: 0a50180a9c0842503a2199ca0ba03888069e7c093f71236c65632e9b0f496ea57536856e1ad3d1635010cb5959c551496ea84cfc56088a8e7879fe30b9d71943 - languageName: node - linkType: hard - -"is-my-json-valid@npm:^2.20.0": - version: 2.20.6 - resolution: "is-my-json-valid@npm:2.20.6" - dependencies: - generate-function: ^2.0.0 - generate-object-property: ^1.1.0 - is-my-ip-valid: ^1.0.0 - jsonpointer: ^5.0.0 - xtend: ^4.0.0 - checksum: d3519e18e6a0f4c777d5a2027b5c80d05abd0949179b94795bd2aa6c54e8f44c23b8789cb7d44332015b86cfd73dca57331e7fa53202b28e40aa4620e7f61166 - languageName: node - linkType: hard - "is-nan@npm:^1.2.1": version: 1.3.2 resolution: "is-nan@npm:1.3.2" @@ -21488,13 +21317,6 @@ __metadata: languageName: node linkType: hard -"is-property@npm:^1.0.0, is-property@npm:^1.0.2": - version: 1.0.2 - resolution: "is-property@npm:1.0.2" - checksum: 33b661a3690bcc88f7e47bb0a21b9e3187e76a317541ea7ec5e8096d954f441b77a46d8930c785f7fbf4ef8dfd624c25495221e026e50f74c9048fe501773be5 - languageName: node - linkType: hard - "is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" @@ -22895,7 +22717,7 @@ __metadata: languageName: node linkType: hard -"jsonpointer@npm:^5.0.0, jsonpointer@npm:^5.0.1": +"jsonpointer@npm:^5.0.1": version: 5.0.1 resolution: "jsonpointer@npm:5.0.1" checksum: 0b40f712900ad0c846681ea2db23b6684b9d5eedf55807b4708c656f5894b63507d0e28ae10aa1bddbea551241035afe62b6df0800fc94c2e2806a7f3adecd7c @@ -23799,16 +23621,6 @@ __metadata: languageName: node linkType: hard -"macos-alias@npm:~0.2.5": - version: 0.2.11 - resolution: "macos-alias@npm:0.2.11" - dependencies: - nan: ^2.4.0 - node-gyp: latest - conditions: os=darwin - languageName: node - linkType: hard - "madge@npm:^6.1.0": version: 6.1.0 resolution: "madge@npm:6.1.0" @@ -24403,7 +24215,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:^1.2.8, minimist@npm:~1.2.5": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:^1.2.8, minimist@npm:~1.2.5": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 @@ -24745,17 +24557,6 @@ __metadata: languageName: node linkType: hard -"murmur-32@npm:^0.1.0 || ^0.2.0": - version: 0.2.0 - resolution: "murmur-32@npm:0.2.0" - dependencies: - encode-utf8: ^1.0.3 - fmix: ^0.1.0 - imul: ^1.0.0 - checksum: 664f19319c23b2910bd6b4d79e072c910168b157c26bf4507c78f0c7a259cb6f6233fb04eca7d02b271491a8f87660d5c4619f35f7411d9ab10fca715fa93f7c - languageName: node - linkType: hard - "mustache@npm:^4.2.0": version: 4.2.0 resolution: "mustache@npm:4.2.0" @@ -24790,15 +24591,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.4.0": - version: 2.17.0 - resolution: "nan@npm:2.17.0" - dependencies: - node-gyp: latest - checksum: ec609aeaf7e68b76592a3ba96b372aa7f5df5b056c1e37410b0f1deefbab5a57a922061e2c5b369bae9c7c6b5e6eecf4ad2dac8833a1a7d3a751e0a7c7f849ed - languageName: node - linkType: hard - "nanoid@npm:^3.3.3, nanoid@npm:^3.3.6": version: 3.3.6 resolution: "nanoid@npm:3.3.6" @@ -25915,15 +25707,6 @@ __metadata: languageName: node linkType: hard -"parse-color@npm:^1.0.0": - version: 1.0.0 - resolution: "parse-color@npm:1.0.0" - dependencies: - color-convert: ~0.5.0 - checksum: 0e6e1821eacb4cd21dff380eceafa229052fe22b9951a891c7cac6080a681f29cb2ac50050398ae6cba089cde87f640bcaf8439bf16d468de029691275c175ef - languageName: node - linkType: hard - "parse-duration@npm:^1.1.0": version: 1.1.0 resolution: "parse-duration@npm:1.1.0" @@ -27361,16 +27144,6 @@ __metadata: languageName: node linkType: hard -"random-path@npm:^0.1.0": - version: 0.1.2 - resolution: "random-path@npm:0.1.2" - dependencies: - base32-encode: ^0.1.0 || ^1.0.0 - murmur-32: ^0.1.0 || ^0.2.0 - checksum: 9fe83df7705e7c7707feba280433f1dd3937dfd6feccc85e1f5fad1e5f84930777a64faa871f4ced4c7825fdfeb5f727f70fc808d81914c02e4c914bac177a34 - languageName: node - linkType: hard - "randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" @@ -28290,13 +28063,6 @@ __metadata: languageName: node linkType: hard -"repeat-string@npm:^1.5.4": - version: 1.6.1 - resolution: "repeat-string@npm:1.6.1" - checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 - languageName: node - linkType: hard - "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -29733,13 +29499,6 @@ __metadata: languageName: node linkType: hard -"stream-buffers@npm:~2.2.0": - version: 2.2.0 - resolution: "stream-buffers@npm:2.2.0" - checksum: 4587d9e8f050d689fb38b4295e73408401b16de8edecc12026c6f4ae92956705ecfd995ae3845d7fa3ebf19502d5754df9143d91447fd881d86e518f43882c1c - languageName: node - linkType: hard - "stream-combiner@npm:~0.0.4": version: 0.0.4 resolution: "stream-combiner@npm:0.0.4" @@ -30713,22 +30472,6 @@ __metadata: languageName: node linkType: hard -"tn1150@npm:^0.1.0": - version: 0.1.0 - resolution: "tn1150@npm:0.1.0" - dependencies: - unorm: ^1.4.1 - checksum: 525b996bd02aacb77db951c6cedc59262fc737749a9a26b6ec2c120426196f92fe796ba161382499401f9ffc2652455a21467e8d8142cb352a5017c3f1292e97 - languageName: node - linkType: hard - -"to-data-view@npm:^1.1.0": - version: 1.1.0 - resolution: "to-data-view@npm:1.1.0" - checksum: 53bf818cf7ed4b481568085cfed5528b268efe1e95d0b90c2a45031de9cf40de91600771c046924348fdedbedb54f655f98e7bf1c51041ba06f0ec3f2fd53dc6 - languageName: node - linkType: hard - "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -31453,13 +31196,6 @@ __metadata: languageName: node linkType: hard -"unorm@npm:^1.4.1": - version: 1.6.0 - resolution: "unorm@npm:1.6.0" - checksum: 9a86546256a45f855b6cfe719086785d6aada94f63778cecdecece8d814ac26af76cb6da70130da0a08b8803bbf0986e56c7ec4249038198f3de02607fffd811 - languageName: node - linkType: hard - "unpipe@npm:1.0.0, unpipe@npm:~1.0.0": version: 1.0.0 resolution: "unpipe@npm:1.0.0"