From 1159e8615fca3a1dbef57fe5da74040c72b11347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:20:01 -0500 Subject: [PATCH 1/9] chore(deps-dev): bump nanoid from 3.3.7 to 3.3.8 (#414) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .changeset/khaki-falcons-sleep.md | 4 ++++ package-lock.json | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .changeset/khaki-falcons-sleep.md diff --git a/.changeset/khaki-falcons-sleep.md b/.changeset/khaki-falcons-sleep.md new file mode 100644 index 000000000..960d9e55b --- /dev/null +++ b/.changeset/khaki-falcons-sleep.md @@ -0,0 +1,4 @@ +--- +--- + +chore(deps-dev): bump nanoid from 3.3.7 to 3.3.8 diff --git a/package-lock.json b/package-lock.json index c2148e13e..5a6198c41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15658,9 +15658,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { From 8d513782230ffdc4824f8db8a5d609d6a18c8e16 Mon Sep 17 00:00:00 2001 From: aws-amplify-bot Date: Wed, 18 Dec 2024 16:16:41 +0000 Subject: [PATCH 2/9] release: publish [ci skip] --- .changeset/khaki-falcons-sleep.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .changeset/khaki-falcons-sleep.md diff --git a/.changeset/khaki-falcons-sleep.md b/.changeset/khaki-falcons-sleep.md deleted file mode 100644 index 960d9e55b..000000000 --- a/.changeset/khaki-falcons-sleep.md +++ /dev/null @@ -1,4 +0,0 @@ ---- ---- - -chore(deps-dev): bump nanoid from 3.3.7 to 3.3.8 From 8f8a6b66fcc2cb21c3c9dfa2a030430c22a2baad Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:58:57 -0500 Subject: [PATCH 3/9] chore: rename amplify-api-next refs to amplify-data (#416) --- .changeset/six-zoos-fly.md | 2 ++ .../action.yml | 6 +++--- .github/actions/node-and-build/action.yml | 6 +++--- .github/actions/npm-publish/action.yml | 2 +- .github/actions/setup-samples-staging/action.yml | 2 +- .github/workflows/callable-check-api.yml | 6 +++--- .github/workflows/callable-check-changeset.yml | 6 +++--- .github/workflows/callable-check-package-lock.yml | 6 +++--- .github/workflows/callable-check-type-perf.yml | 6 +++--- .github/workflows/callable-e2e-test-detox.yml | 14 +++++++------- .github/workflows/callable-e2e-test.yml | 14 +++++++------- .github/workflows/callable-e2e-tests.yml | 4 ++-- .github/workflows/callable-local-e2e-tests.yml | 10 +++++----- .github/workflows/callable-npm-publish-preid.yml | 6 +++--- .github/workflows/callable-npm-publish-release.yml | 10 +++++----- ...next.yml => callable-prebuild-amplify-data.yml} | 6 +++--- .../callable-prebuild-samples-staging.yml | 4 ++-- .../workflows/callable-release-verification.yml | 2 +- .../workflows/callable-ts-version-unit-test.yml | 8 ++++---- .github/workflows/callable-unit-tests.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/prepare-revert-pr.yml | 6 +++--- .github/workflows/push-main-release.yml | 12 ++++++------ .github/workflows/push-preid-release.yml | 4 ++-- package-lock.json | 4 ++-- package.json | 4 ++-- packages/data-schema/package.json | 2 +- packages/data-schema/src/ModelField.ts | 13 ++++++++----- packages/e2e-tests/README.md | 4 ++-- 29 files changed, 92 insertions(+), 87 deletions(-) create mode 100644 .changeset/six-zoos-fly.md rename .github/actions/{load-verdaccio-with-amplify-api-next => load-verdaccio-with-amplify-data}/action.yml (82%) rename .github/workflows/{callable-prebuild-amplify-api-next.yml => callable-prebuild-amplify-data.yml} (79%) diff --git a/.changeset/six-zoos-fly.md b/.changeset/six-zoos-fly.md new file mode 100644 index 000000000..a845151cc --- /dev/null +++ b/.changeset/six-zoos-fly.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/.github/actions/load-verdaccio-with-amplify-api-next/action.yml b/.github/actions/load-verdaccio-with-amplify-data/action.yml similarity index 82% rename from .github/actions/load-verdaccio-with-amplify-api-next/action.yml rename to .github/actions/load-verdaccio-with-amplify-data/action.yml index cf4a403db..4727bff76 100644 --- a/.github/actions/load-verdaccio-with-amplify-api-next/action.yml +++ b/.github/actions/load-verdaccio-with-amplify-data/action.yml @@ -1,5 +1,5 @@ -name: Load Verdaccio with amplify-api-next -description: Turn on Verdaccio and load up all of the amplify-api-next build artifacts +name: Load Verdaccio with amplify-data +description: Turn on Verdaccio and load up all of the amplify-data build artifacts runs: using: 'composite' @@ -16,7 +16,7 @@ runs: # Run your commands after verdaccio is up and running echo "Verdaccio is up and running, proceeding with the script..." shell: bash - working-directory: ./amplify-api-next + working-directory: ./amplify-data - name: Upload artifact uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce if: failure() diff --git a/.github/actions/node-and-build/action.yml b/.github/actions/node-and-build/action.yml index 5de8fd33a..4db657a01 100644 --- a/.github/actions/node-and-build/action.yml +++ b/.github/actions/node-and-build/action.yml @@ -31,15 +31,15 @@ runs: if: inputs.force == 'true' run: npm i --force shell: bash - working-directory: ./amplify-api-next + working-directory: ./amplify-data # TODO We should be able to skip yarn / bootstrap if we cache enough things. Leaving because skipping causes issues. - name: Install if: inputs.force != 'true' && (inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true') run: npm i shell: bash - working-directory: ./amplify-api-next + working-directory: ./amplify-data - name: Build packages if: steps.cache-build-artifacts.outputs.cache-hit != 'true' run: npm run build shell: bash - working-directory: ./amplify-api-next + working-directory: ./amplify-data diff --git a/.github/actions/npm-publish/action.yml b/.github/actions/npm-publish/action.yml index 7d9eb1b46..fc5b65bdc 100644 --- a/.github/actions/npm-publish/action.yml +++ b/.github/actions/npm-publish/action.yml @@ -33,7 +33,7 @@ runs: - name: Run npm publish if: github.repository_owner == 'aws-amplify' shell: bash - working-directory: ./amplify-api-next + working-directory: ./amplify-data env: NPM_TOKEN: ${{ inputs.npm_token }} GH_SHA: ${{ github.sha }} diff --git a/.github/actions/setup-samples-staging/action.yml b/.github/actions/setup-samples-staging/action.yml index 8973e1232..c454de50e 100644 --- a/.github/actions/setup-samples-staging/action.yml +++ b/.github/actions/setup-samples-staging/action.yml @@ -27,7 +27,7 @@ runs: token: ${{ inputs.AMPLIFY_JS_SAMPLES_STAGING_READ }} # We test on the staging branch that corresponds to the current - # `amplify-api-next` branch (when it exists), and otherwise test on the + # `amplify-data` branch (when it exists), and otherwise test on the # default branch (`main`) - name: Staging repo branch selection shell: bash diff --git a/.github/workflows/callable-check-api.yml b/.github/workflows/callable-check-api.yml index 457d71046..8697f8613 100644 --- a/.github/workflows/callable-check-api.yml +++ b/.github/workflows/callable-check-api.yml @@ -10,11 +10,11 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run checks - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run check:api - name: API Check Instructions if: failure() diff --git a/.github/workflows/callable-check-changeset.yml b/.github/workflows/callable-check-changeset.yml index 928dc64b3..747d67b02 100644 --- a/.github/workflows/callable-check-changeset.yml +++ b/.github/workflows/callable-check-changeset.yml @@ -11,13 +11,13 @@ jobs: uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: path: - amplify-api-next + amplify-data # check out full history fetch-depth: 0 - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run checks - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npx changeset status --since origin/main - name: API Check Instructions if: failure() diff --git a/.github/workflows/callable-check-package-lock.yml b/.github/workflows/callable-check-package-lock.yml index b8450f8d7..028b7e1a8 100644 --- a/.github/workflows/callable-check-package-lock.yml +++ b/.github/workflows/callable-check-package-lock.yml @@ -10,11 +10,11 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run checks - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run check:package-lock - name: API Check Instructions if: failure() diff --git a/.github/workflows/callable-check-type-perf.yml b/.github/workflows/callable-check-type-perf.yml index 14e2bfae2..3f5a673d3 100644 --- a/.github/workflows/callable-check-type-perf.yml +++ b/.github/workflows/callable-check-type-perf.yml @@ -10,11 +10,11 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run checks - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run check:type-perf - name: Type Perf Check Instructions if: failure() diff --git a/.github/workflows/callable-e2e-test-detox.yml b/.github/workflows/callable-e2e-test-detox.yml index e81d79369..3b0181ae7 100644 --- a/.github/workflows/callable-e2e-test-detox.yml +++ b/.github/workflows/callable-e2e-test-detox.yml @@ -24,20 +24,20 @@ jobs: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Setup samples staging repository - uses: ./amplify-api-next/.github/actions/setup-samples-staging + uses: ./amplify-data/.github/actions/setup-samples-staging with: AMPLIFY_JS_SAMPLES_STAGING_READ: ${{ secrets.AMPLIFY_JS_SAMPLES_STAGING_READ }} - - name: Load Verdaccio with amplify-api-next - uses: ./amplify-api-next/.github/actions/load-verdaccio-with-amplify-api-next + - name: Load Verdaccio with amplify-data + uses: ./amplify-data/.github/actions/load-verdaccio-with-amplify-data - name: Yarn Install working-directory: ${{ inputs.working_directory }} run: | echo "Current NPM registry: " $(yarn config get registry) - $GITHUB_WORKSPACE/amplify-api-next/scripts/retry-yarn-script.sh -s 'install --frozen-lockfile --non-interactive' -n 3 + $GITHUB_WORKSPACE/amplify-data/scripts/retry-yarn-script.sh -s 'install --frozen-lockfile --non-interactive' -n 3 shell: bash - name: Install CocoaPods run: | @@ -72,6 +72,6 @@ jobs: shell: bash - name: Detox run run: | - $GITHUB_WORKSPACE/amplify-api-next/scripts/retry-yarn-script.sh -s 'detox test -c ios.sim.debug -u' -n 3 + $GITHUB_WORKSPACE/amplify-data/scripts/retry-yarn-script.sh -s 'detox test -c ios.sim.debug -u' -n 3 working-directory: ${{ inputs.working_directory }} shell: bash diff --git a/.github/workflows/callable-e2e-test.yml b/.github/workflows/callable-e2e-test.yml index b56825a31..4267e2361 100644 --- a/.github/workflows/callable-e2e-test.yml +++ b/.github/workflows/callable-e2e-test.yml @@ -38,7 +38,7 @@ on: required: false type: string env: - AMPLIFY_DIR: /home/runner/work/amplify-api-next/amplify-api-next/amplify-api-next + AMPLIFY_DIR: /home/runner/work/amplify-data/amplify-data/amplify-data jobs: e2e-test: @@ -57,15 +57,15 @@ jobs: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Setup samples staging repository - uses: ./amplify-api-next/.github/actions/setup-samples-staging + uses: ./amplify-data/.github/actions/setup-samples-staging with: AMPLIFY_JS_SAMPLES_STAGING_READ: ${{ secrets.AMPLIFY_JS_SAMPLES_STAGING_READ }} - name: Load Verdaccio with AmplifyApiNext - uses: ./amplify-api-next/.github/actions/load-verdaccio-with-amplify-api-next + uses: ./amplify-data/.github/actions/load-verdaccio-with-amplify-data - name: Run cypress tests for ${{ inputs.test_name }} dev shell: bash working-directory: amplify-js-samples-staging @@ -82,7 +82,7 @@ jobs: E2E_YARN_SCRIPT: ${{ inputs.yarn_script }} run: | if [ -z "$E2E_YARN_SCRIPT" ]; then - ../amplify-api-next/scripts/retry-yarn-script.sh -s \ + ../amplify-data/scripts/retry-yarn-script.sh -s \ "ci:test \ $E2E_FRAMEWORK \ $E2E_CATEGORY \ @@ -113,7 +113,7 @@ jobs: E2E_YARN_SCRIPT: ${{ inputs.yarn_script }} run: | if [ -z "$E2E_YARN_SCRIPT" ]; then - ../amplify-api-next/scripts/retry-yarn-script.sh -s \ + ../amplify-data/scripts/retry-yarn-script.sh -s \ "ci:test \ $E2E_FRAMEWORK \ $E2E_CATEGORY \ diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml index 7b36b338b..0b1348a86 100644 --- a/.github/workflows/callable-e2e-tests.yml +++ b/.github/workflows/callable-e2e-tests.yml @@ -10,13 +10,13 @@ jobs: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - path: amplify-api-next + path: amplify-data - name: Read integ config files id: load_config run: | echo "INTEG_CONFIG=$(cat .github/integ-config/integ-all.yml | yq '.tests' -o=json | jq -c .)" >> $GITHUB_OUTPUT echo "DETOX_INTEG_CONFIG=$(cat .github/integ-config/detox-integ-all.yml | yq -o=json | jq -c .)" >> $GITHUB_OUTPUT - working-directory: ./amplify-api-next + working-directory: ./amplify-data outputs: integ-config: ${{ steps.load_config.outputs.INTEG_CONFIG }} detox-integ-config: ${{ steps.load_config.outputs.DETOX_INTEG_CONFIG }} diff --git a/.github/workflows/callable-local-e2e-tests.yml b/.github/workflows/callable-local-e2e-tests.yml index 3e5aca256..0d9d94e2f 100644 --- a/.github/workflows/callable-local-e2e-tests.yml +++ b/.github/workflows/callable-local-e2e-tests.yml @@ -11,18 +11,18 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Write Amplify outputs - working-directory: ./amplify-api-next + working-directory: ./amplify-data env: AMPLIFY_OUTPUTS_BASE64: ${{ secrets.E2E_NODE_AMPLIFY_OUTPUTS_BASE64 }} run: | echo $AMPLIFY_OUTPUTS_BASE64 | base64 --decode > ./packages/e2e-tests/node/amplify_outputs.json - name: Install Node Sample Dependencies - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run e2e-node:install - name: Run tests - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run e2e-node:test diff --git a/.github/workflows/callable-npm-publish-preid.yml b/.github/workflows/callable-npm-publish-preid.yml index 864ac7106..be3d9da63 100644 --- a/.github/workflows/callable-npm-publish-preid.yml +++ b/.github/workflows/callable-npm-publish-preid.yml @@ -33,14 +33,14 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data token: ${{ secrets.GH_TOKEN_AMPLIFY_WRITE }} - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run npm publish - uses: ./amplify-api-next/.github/actions/npm-publish + uses: ./amplify-data/.github/actions/npm-publish with: target: preid preid: ${{ inputs.preid }} diff --git a/.github/workflows/callable-npm-publish-release.yml b/.github/workflows/callable-npm-publish-release.yml index 045bf1c02..24a848f09 100644 --- a/.github/workflows/callable-npm-publish-release.yml +++ b/.github/workflows/callable-npm-publish-release.yml @@ -10,14 +10,14 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data token: ${{ secrets.GH_TOKEN_AMPLIFY_WRITE }} - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run npm publish - uses: ./amplify-api-next/.github/actions/npm-publish + uses: ./amplify-data/.github/actions/npm-publish with: target: release npm_token: ${{ secrets.NPM_TOKEN }} @@ -33,11 +33,11 @@ jobs: git config --global user.name $GITHUB_USER - name: Update lockfile with newly published version - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm i - name: Commit version and changelog - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: | git add . git commit -m "release: publish [ci skip]" diff --git a/.github/workflows/callable-prebuild-amplify-api-next.yml b/.github/workflows/callable-prebuild-amplify-data.yml similarity index 79% rename from .github/workflows/callable-prebuild-amplify-api-next.yml rename to .github/workflows/callable-prebuild-amplify-data.yml index 41a37dd97..e83ec68f0 100644 --- a/.github/workflows/callable-prebuild-amplify-api-next.yml +++ b/.github/workflows/callable-prebuild-amplify-data.yml @@ -1,4 +1,4 @@ -name: Prebuild amplify-api-next +name: Prebuild amplify-data on: workflow_call: @@ -15,8 +15,8 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build with: is-prebuild: true diff --git a/.github/workflows/callable-prebuild-samples-staging.yml b/.github/workflows/callable-prebuild-samples-staging.yml index 1befd7f9a..8b8de3157 100644 --- a/.github/workflows/callable-prebuild-samples-staging.yml +++ b/.github/workflows/callable-prebuild-samples-staging.yml @@ -13,8 +13,8 @@ jobs: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - path: amplify-api-next + path: amplify-data - name: Setup samples staging - uses: ./amplify-api-next/.github/actions/setup-samples-staging + uses: ./amplify-data/.github/actions/setup-samples-staging with: AMPLIFY_JS_SAMPLES_STAGING_READ: ${{ secrets.AMPLIFY_JS_SAMPLES_STAGING_READ }} diff --git a/.github/workflows/callable-release-verification.yml b/.github/workflows/callable-release-verification.yml index 5b265dd06..52104ad42 100644 --- a/.github/workflows/callable-release-verification.yml +++ b/.github/workflows/callable-release-verification.yml @@ -4,7 +4,7 @@ on: workflow_call jobs: prebuild-ubuntu: - uses: ./.github/workflows/callable-prebuild-amplify-api-next.yml + uses: ./.github/workflows/callable-prebuild-amplify-data.yml with: runs_on: ubuntu-latest prebuild-samples-staging: diff --git a/.github/workflows/callable-ts-version-unit-test.yml b/.github/workflows/callable-ts-version-unit-test.yml index b7d853b7f..1e7adee6f 100644 --- a/.github/workflows/callable-ts-version-unit-test.yml +++ b/.github/workflows/callable-ts-version-unit-test.yml @@ -14,16 +14,16 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Install specific typescript version env: VERSION: ${{ inputs.tsVersion }} - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm i typescript@$VERSION - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build with: force: true - name: Run tests - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run lint && npm run test diff --git a/.github/workflows/callable-unit-tests.yml b/.github/workflows/callable-unit-tests.yml index ce36a517b..2b69a5b87 100644 --- a/.github/workflows/callable-unit-tests.yml +++ b/.github/workflows/callable-unit-tests.yml @@ -10,9 +10,9 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Run tests - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run lint && npm run test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2cb7a3749..bca6f76eb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,9 +15,9 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build with: is-prebuild: true check-dependencies: diff --git a/.github/workflows/prepare-revert-pr.yml b/.github/workflows/prepare-revert-pr.yml index 9882f3369..e5ec3f04a 100644 --- a/.github/workflows/prepare-revert-pr.yml +++ b/.github/workflows/prepare-revert-pr.yml @@ -25,14 +25,14 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data token: ${{ secrets.GITHUB_TOKEN }} # fetch full history so that we can properly lookup past releases fetch-depth: 0 - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build with: is-prebuild: true - name: Generate Revert PR - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npx tsx ./scripts/prepare-revert-pr.ts diff --git a/.github/workflows/push-main-release.yml b/.github/workflows/push-main-release.yml index e4edced7a..cd2deda77 100644 --- a/.github/workflows/push-main-release.yml +++ b/.github/workflows/push-main-release.yml @@ -8,7 +8,7 @@ concurrency: on: push: branches: - # NOTE: to run E2E tests against an `amplify-api-next` branch, add the name + # NOTE: to run E2E tests against an `amplify-data` branch, add the name # of that branch (and corresponding `amplify-js-samples-staging` branch, if # testing sample / test changes) here. # Must disable publishing to NPM prior to adding this branch to avoid @@ -17,7 +17,7 @@ on: jobs: prebuild-ubuntu: - uses: ./.github/workflows/callable-prebuild-amplify-api-next.yml + uses: ./.github/workflows/callable-prebuild-amplify-data.yml with: runs_on: ubuntu-latest # This step is included at the top level as a workround (i.e. not in a @@ -38,19 +38,19 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build - name: Configure AWS test execution credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # version 4.0.2 with: role-to-assume: ${{ secrets.SANDBOX_E2E_RUNNER_ROLE_ARN }} aws-region: us-west-2 - name: Install Sandbox E2E Dependencies - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run e2e-sandbox:install - name: Run E2E sandbox tests - working-directory: ./amplify-api-next + working-directory: ./amplify-data run: npm run e2e-sandbox:test release-verification-testing: secrets: inherit diff --git a/.github/workflows/push-preid-release.yml b/.github/workflows/push-preid-release.yml index 5e886af9c..c16361127 100644 --- a/.github/workflows/push-preid-release.yml +++ b/.github/workflows/push-preid-release.yml @@ -17,9 +17,9 @@ jobs: - name: Checkout repository uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f with: - path: amplify-api-next + path: amplify-data - name: Setup node and build the repository - uses: ./amplify-api-next/.github/actions/node-and-build + uses: ./amplify-data/.github/actions/node-and-build with: is-prebuild: true e2e: diff --git a/package-lock.json b/package-lock.json index 5a6198c41..20da177bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "amplify-api-next-monorepo", + "name": "amplify-data-monorepo", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "amplify-api-next-monorepo", + "name": "amplify-data-monorepo", "license": "Apache-2.0", "workspaces": [ "packages/*", diff --git a/package.json b/package.json index 79e7461af..f70dfc37c 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "amplify-api-next-monorepo", + "name": "amplify-data-monorepo", "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/aws-amplify/amplify-api-next.git" + "url": "https://github.com/aws-amplify/amplify-data.git" }, "private": true, "workspaces": [ diff --git a/packages/data-schema/package.json b/packages/data-schema/package.json index e87815287..e50ad5d01 100644 --- a/packages/data-schema/package.json +++ b/packages/data-schema/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/aws-amplify/amplify-api-next.git" + "url": "https://github.com/aws-amplify/amplify-data.git" }, "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", diff --git a/packages/data-schema/src/ModelField.ts b/packages/data-schema/src/ModelField.ts index e76bff894..c5388162b 100644 --- a/packages/data-schema/src/ModelField.ts +++ b/packages/data-schema/src/ModelField.ts @@ -103,11 +103,11 @@ export type ModelField< [__auth]?: Auth; [brandSymbol]: typeof brandName; - /** - * Internal non-omittable method that allows `BaseModelField` to retain a reference to `T` type arg in `ModelField`. - * Since all public methods are omittable, the evaluated `BaseModelField` loses type information unless + /** + * Internal non-omittable method that allows `BaseModelField` to retain a reference to `T` type arg in `ModelField`. + * Since all public methods are omittable, the evaluated `BaseModelField` loses type information unless * some property on the type is guaranteed to reference `T` - * Context: https://github.com/aws-amplify/amplify-api-next/pull/406/files#r1869481467 + * Context: https://github.com/aws-amplify/amplify-data/pull/406/files#r1869481467 */ [internal](): ModelField; @@ -119,7 +119,10 @@ export type ModelField< /** * Converts a field type definition to an array of the field type. */ - array(): ModelField, Exclude | 'array'>; + array(): ModelField< + ArrayField, + Exclude | 'array' + >; // TODO: should be T, but .array breaks this constraint. Fix later /** * Sets a default value for the scalar type. diff --git a/packages/e2e-tests/README.md b/packages/e2e-tests/README.md index c3293ebfd..0783f8e13 100644 --- a/packages/e2e-tests/README.md +++ b/packages/e2e-tests/README.md @@ -1,4 +1,4 @@ -# `amplify-api-next` E2E Tests +# `amplify-data` E2E Tests This package contains automated tests for validating functionality E2E in Node. @@ -67,7 +67,7 @@ the IAM OIDC provider. ### IAM trust policy restrictions for OIDC provider: Currently, the trust policy for the OIDC provider is set to only allow execution -of the `main` branch on `amplify-api-next`, since this branch contains appropriate +of the `main` branch on `amplify-data`, since this branch contains appropriate restrictions to limit E2E runs (test runs only occur when an approved PR has been merged to `main`). From 9877561d16a59a9065e0f4a30e72a4be33812d88 Mon Sep 17 00:00:00 2001 From: aws-amplify-bot Date: Wed, 18 Dec 2024 17:10:14 +0000 Subject: [PATCH 4/9] release: publish [ci skip] --- .changeset/six-zoos-fly.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .changeset/six-zoos-fly.md diff --git a/.changeset/six-zoos-fly.md b/.changeset/six-zoos-fly.md deleted file mode 100644 index a845151cc..000000000 --- a/.changeset/six-zoos-fly.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- From eb22febc7b4c854d278f827e08ddb8d8c1909b4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:22:06 +0000 Subject: [PATCH 5/9] chore(deps-dev): bump next from 14.2.12 to 14.2.20 (#415) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .changeset/sharp-berries-refuse.md | 4 ++ package-lock.json | 86 +++++++++++++++--------------- 2 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 .changeset/sharp-berries-refuse.md diff --git a/.changeset/sharp-berries-refuse.md b/.changeset/sharp-berries-refuse.md new file mode 100644 index 000000000..9e5618394 --- /dev/null +++ b/.changeset/sharp-berries-refuse.md @@ -0,0 +1,4 @@ +--- +--- + +chore(deps-dev): bump next from 14.2.12 to 14.2.20 diff --git a/package-lock.json b/package-lock.json index 20da177bb..ef84ff660 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4751,16 +4751,16 @@ } }, "node_modules/@next/env": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.12.tgz", - "integrity": "sha512-3fP29GIetdwVIfIRyLKM7KrvJaqepv+6pVodEbx0P5CaMLYBtx+7eEg8JYO5L9sveJO87z9eCReceZLi0hxO1Q==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.20.tgz", + "integrity": "sha512-JfDpuOCB0UBKlEgEy/H6qcBSzHimn/YWjUHzKl1jMeUO+QVRdzmTTl8gFJaNO87c8DXmVKhFCtwxQ9acqB3+Pw==", "dev": true, "peer": true }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.12.tgz", - "integrity": "sha512-crHJ9UoinXeFbHYNok6VZqjKnd8rTd7K3Z2zpyzF1ch7vVNKmhjv/V7EHxep3ILoN8JB9AdRn/EtVVyG9AkCXw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.20.tgz", + "integrity": "sha512-WDfq7bmROa5cIlk6ZNonNdVhKmbCv38XteVFYsxea1vDJt3SnYGgxLGMTXQNfs5OkFvAhmfKKrwe7Y0Hs+rWOg==", "cpu": [ "arm64" ], @@ -4775,9 +4775,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.12.tgz", - "integrity": "sha512-JbEaGbWq18BuNBO+lCtKfxl563Uw9oy2TodnN2ioX00u7V1uzrsSUcg3Ep9ce+P0Z9es+JmsvL2/rLphz+Frcw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.20.tgz", + "integrity": "sha512-XIQlC+NAmJPfa2hruLvr1H1QJJeqOTDV+v7tl/jIdoFvqhoihvSNykLU/G6NMgoeo+e/H7p/VeWSOvMUHKtTIg==", "cpu": [ "x64" ], @@ -4792,9 +4792,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.12.tgz", - "integrity": "sha512-qBy7OiXOqZrdp88QEl2H4fWalMGnSCrr1agT/AVDndlyw2YJQA89f3ttR/AkEIP9EkBXXeGl6cC72/EZT5r6rw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.20.tgz", + "integrity": "sha512-pnzBrHTPXIMm5QX3QC8XeMkpVuoAYOmyfsO4VlPn+0NrHraNuWjdhe+3xLq01xR++iCvX+uoeZmJDKcOxI201Q==", "cpu": [ "arm64" ], @@ -4809,9 +4809,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.12.tgz", - "integrity": "sha512-EfD9L7o9biaQxjwP1uWXnk3vYZi64NVcKUN83hpVkKocB7ogJfyH2r7o1pPnMtir6gHZiGCeHKagJ0yrNSLNHw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.20.tgz", + "integrity": "sha512-WhJJAFpi6yqmUx1momewSdcm/iRXFQS0HU2qlUGlGE/+98eu7JWLD5AAaP/tkK1mudS/rH2f9E3WCEF2iYDydQ==", "cpu": [ "arm64" ], @@ -4826,9 +4826,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.12.tgz", - "integrity": "sha512-iQ+n2pxklJew9IpE47hE/VgjmljlHqtcD5UhZVeHICTPbLyrgPehaKf2wLRNjYH75udroBNCgrSSVSVpAbNoYw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.20.tgz", + "integrity": "sha512-ao5HCbw9+iG1Kxm8XsGa3X174Ahn17mSYBQlY6VGsdsYDAbz/ZP13wSLfvlYoIDn1Ger6uYA+yt/3Y9KTIupRg==", "cpu": [ "x64" ], @@ -4843,9 +4843,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.12.tgz", - "integrity": "sha512-rFkUkNwcQ0ODn7cxvcVdpHlcOpYxMeyMfkJuzaT74xjAa5v4fxP4xDk5OoYmPi8QNLDs3UgZPMSBmpBuv9zKWA==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.20.tgz", + "integrity": "sha512-CXm/kpnltKTT7945np6Td3w7shj/92TMRPyI/VvveFe8+YE+/YOJ5hyAWK5rpx711XO1jBCgXl211TWaxOtkaA==", "cpu": [ "x64" ], @@ -4860,9 +4860,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.12.tgz", - "integrity": "sha512-PQFYUvwtHs/u0K85SG4sAdDXYIPXpETf9mcEjWc0R4JmjgMKSDwIU/qfZdavtP6MPNiMjuKGXHCtyhR/M5zo8g==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.20.tgz", + "integrity": "sha512-upJn2HGQgKNDbXVfIgmqT2BN8f3z/mX8ddoyi1I565FHbfowVK5pnMEwauvLvaJf4iijvuKq3kw/b6E9oIVRWA==", "cpu": [ "arm64" ], @@ -4877,9 +4877,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.12.tgz", - "integrity": "sha512-FAj2hMlcbeCV546eU2tEv41dcJb4NeqFlSXU/xL/0ehXywHnNpaYajOUvn3P8wru5WyQe6cTZ8fvckj/2XN4Vw==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.20.tgz", + "integrity": "sha512-igQW/JWciTGJwj3G1ipalD2V20Xfx3ywQy17IV0ciOUBbFhNfyU1DILWsTi32c8KmqgIDviUEulW/yPb2FF90w==", "cpu": [ "ia32" ], @@ -4894,9 +4894,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.12.tgz", - "integrity": "sha512-yu8QvV53sBzoIVRHsxCHqeuS8jYq6Lrmdh0briivuh+Brsp6xjg80MAozUsBTAV9KNmY08KlX0KYTWz1lbPzEg==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.20.tgz", + "integrity": "sha512-AFmqeLW6LtxeFTuoB+MXFeM5fm5052i3MU6xD0WzJDOwku6SkZaxb1bxjBaRC8uNqTRTSPl0yMFtjNowIVI67w==", "cpu": [ "x64" ], @@ -15706,13 +15706,13 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/next": { - "version": "14.2.12", - "resolved": "https://registry.npmjs.org/next/-/next-14.2.12.tgz", - "integrity": "sha512-cDOtUSIeoOvt1skKNihdExWMTybx3exnvbFbb9ecZDIxlvIbREQzt9A5Km3Zn3PfU+IFjyYGsHS+lN9VInAGKA==", + "version": "14.2.20", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.20.tgz", + "integrity": "sha512-yPvIiWsiyVYqJlSQxwmzMIReXn5HxFNq4+tlVQ812N1FbvhmE+fDpIAD7bcS2mGYQwPJ5vAsQouyme2eKsxaug==", "dev": true, "peer": true, "dependencies": { - "@next/env": "14.2.12", + "@next/env": "14.2.20", "@swc/helpers": "0.5.5", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", @@ -15727,15 +15727,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.2.12", - "@next/swc-darwin-x64": "14.2.12", - "@next/swc-linux-arm64-gnu": "14.2.12", - "@next/swc-linux-arm64-musl": "14.2.12", - "@next/swc-linux-x64-gnu": "14.2.12", - "@next/swc-linux-x64-musl": "14.2.12", - "@next/swc-win32-arm64-msvc": "14.2.12", - "@next/swc-win32-ia32-msvc": "14.2.12", - "@next/swc-win32-x64-msvc": "14.2.12" + "@next/swc-darwin-arm64": "14.2.20", + "@next/swc-darwin-x64": "14.2.20", + "@next/swc-linux-arm64-gnu": "14.2.20", + "@next/swc-linux-arm64-musl": "14.2.20", + "@next/swc-linux-x64-gnu": "14.2.20", + "@next/swc-linux-x64-musl": "14.2.20", + "@next/swc-win32-arm64-msvc": "14.2.20", + "@next/swc-win32-ia32-msvc": "14.2.20", + "@next/swc-win32-x64-msvc": "14.2.20" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", From 87b7afac103528e9a377ebd67641dc242067fdca Mon Sep 17 00:00:00 2001 From: Kevin Shan Date: Wed, 18 Dec 2024 09:30:04 -0800 Subject: [PATCH 6/9] chore: fix dependabot alert #18 (#413) Signed-off-by: Kevin Shan --- .changeset/friendly-crabs-relax.md | 2 + package-lock.json | 870 ++++++++++++++--------------- package.json | 2 +- 3 files changed, 426 insertions(+), 448 deletions(-) create mode 100644 .changeset/friendly-crabs-relax.md diff --git a/.changeset/friendly-crabs-relax.md b/.changeset/friendly-crabs-relax.md new file mode 100644 index 000000000..a845151cc --- /dev/null +++ b/.changeset/friendly-crabs-relax.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/package-lock.json b/package-lock.json index ef84ff660..f52b8850e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "tsx": "^4.8.2", "turbo": "^1.10.14", "typescript": "^5.1.6", - "verdaccio": "^5.32.2" + "verdaccio": "^6.0.2" } }, "examples/client-types-example": { @@ -2959,9 +2959,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", - "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.5.tgz", + "integrity": "sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -2970,14 +2970,14 @@ "combined-stream": "~1.0.6", "extend": "~3.0.2", "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "http-signature": "~1.3.6", + "form-data": "~4.0.0", + "http-signature": "~1.4.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "6.10.4", + "qs": "6.13.0", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -7226,20 +7226,19 @@ "dev": true }, "node_modules/@verdaccio/auth": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/auth/-/auth-8.0.0-next-8.1.tgz", - "integrity": "sha512-sPmHdnYuRSMgABCsTJEfz8tb/smONsWVg0g4KK2QycyYZ/A+RwZLV1JLiQb4wzu9zvS0HSloqWqkWlyNHW3mtw==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/auth/-/auth-8.0.0-next-8.4.tgz", + "integrity": "sha512-Bv+du+eIMK2/KU2wIjha2FHQrhBT5RuDOVi1nyRyjEyjmJrUt2RWU0Cb7ASxzQy61nkcJ3bs7kuu9dPHK/Z+jw==", "dev": true, "dependencies": { - "@verdaccio/config": "8.0.0-next-8.1", - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/loaders": "8.0.0-next-8.1", - "@verdaccio/logger": "8.0.0-next-8.1", - "@verdaccio/signature": "8.0.0-next-8.0", - "@verdaccio/utils": "7.0.1-next-8.1", + "@verdaccio/config": "8.0.0-next-8.4", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/loaders": "8.0.0-next-8.3", + "@verdaccio/signature": "8.0.0-next-8.1", + "@verdaccio/utils": "8.1.0-next-8.4", "debug": "4.3.7", "lodash": "4.17.21", - "verdaccio-htpasswd": "13.0.0-next-8.1" + "verdaccio-htpasswd": "13.0.0-next-8.4" }, "engines": { "node": ">=18" @@ -7249,6 +7248,34 @@ "url": "https://opencollective.com/verdaccio" } }, + "node_modules/@verdaccio/auth/node_modules/@verdaccio/utils": { + "version": "8.1.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/utils/-/utils-8.1.0-next-8.4.tgz", + "integrity": "sha512-mAEBWV5zsjtC4e/hfj1Q/eYtMlML5wxedk7mqqmvAydjw+ycSH/D/ksU+B10h4STX2NcBlcLtgLl7OI/wFzrgA==", + "dev": true, + "dependencies": { + "@verdaccio/core": "8.0.0-next-8.4", + "lodash": "4.17.21", + "minimatch": "7.4.6", + "semver": "7.6.3" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/verdaccio" + } + }, + "node_modules/@verdaccio/auth/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@verdaccio/auth/node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", @@ -7266,6 +7293,21 @@ } } }, + "node_modules/@verdaccio/auth/node_modules/minimatch": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", + "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@verdaccio/auth/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7296,20 +7338,39 @@ "dev": true }, "node_modules/@verdaccio/config": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/config/-/config-8.0.0-next-8.1.tgz", - "integrity": "sha512-goDVOH4e8xMUxjHybJpi5HwIecVFqzJ9jeNFrRUgtUUn0PtFuNMHgxOeqDKRVboZhc5HK90yed8URK/1O6VsUw==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/config/-/config-8.0.0-next-8.4.tgz", + "integrity": "sha512-9CTYYhaO4xrGbiYjLqRy8EMFPm0YL4a7P6ae8Zm4Dx85Dd6i8XqZ7tlU/+a6qf1g/qggYloolU8pcjaLWNDKAQ==", "dev": true, "dependencies": { - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/utils": "7.0.1-next-8.1", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/utils": "8.1.0-next-8.4", "debug": "4.3.7", "js-yaml": "4.1.0", "lodash": "4.17.21", "minimatch": "7.4.6" }, "engines": { - "node": ">=14" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/verdaccio" + } + }, + "node_modules/@verdaccio/config/node_modules/@verdaccio/utils": { + "version": "8.1.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/utils/-/utils-8.1.0-next-8.4.tgz", + "integrity": "sha512-mAEBWV5zsjtC4e/hfj1Q/eYtMlML5wxedk7mqqmvAydjw+ycSH/D/ksU+B10h4STX2NcBlcLtgLl7OI/wFzrgA==", + "dev": true, + "dependencies": { + "@verdaccio/core": "8.0.0-next-8.4", + "lodash": "4.17.21", + "minimatch": "7.4.6", + "semver": "7.6.3" + }, + "engines": { + "node": ">=12" }, "funding": { "type": "opencollective", @@ -7382,9 +7443,9 @@ "dev": true }, "node_modules/@verdaccio/core": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/core/-/core-8.0.0-next-8.1.tgz", - "integrity": "sha512-kQRCB2wgXEh8H88G51eQgAFK9IxmnBtkQ8sY5FbmB6PbBkyHrbGcCp+2mtRqqo36j0W1VAlfM3XzoknMy6qQnw==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/core/-/core-8.0.0-next-8.4.tgz", + "integrity": "sha512-TCaHwIpr97f4YQkU25E6pk1dbfWTQwYPos1tMb9Q7k6IapoxN0c1s+SyF5FBuMOIfJpTHoWJDo/z7QCouQC3lw==", "dev": true, "dependencies": { "ajv": "8.17.1", @@ -7395,7 +7456,7 @@ "semver": "7.6.3" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7441,12 +7502,11 @@ } }, "node_modules/@verdaccio/loaders": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/loaders/-/loaders-8.0.0-next-8.1.tgz", - "integrity": "sha512-mqGCUBs862g8mICZwX8CG92p1EZ1Un0DJ2DB7+iVu2TYaEeKoHoIdafabVdiYrbOjLcAOOBrMKE1Wnn14eLxpA==", + "version": "8.0.0-next-8.3", + "resolved": "https://registry.npmjs.org/@verdaccio/loaders/-/loaders-8.0.0-next-8.3.tgz", + "integrity": "sha512-7bIOdi+U1xSLRu0s1XxQwrV3zzzFaVaTX7JKFgj2tQvMy9AgzlpjbW1CqaH8OTVEqq03Pwvwj5hQlcvyzCwm1A==", "dev": true, "dependencies": { - "@verdaccio/logger": "8.0.0-next-8.1", "debug": "4.3.7", "lodash": "4.17.21" }, @@ -7511,13 +7571,13 @@ "dev": true }, "node_modules/@verdaccio/logger": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/logger/-/logger-8.0.0-next-8.1.tgz", - "integrity": "sha512-w5kR0/umQkfH2F4PK5Fz9T6z3xz+twewawKLPTUfAgrVAOiWxcikGhhcHWhSGiJ0lPqIa+T0VYuLWMeVeDirGw==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/logger/-/logger-8.0.0-next-8.4.tgz", + "integrity": "sha512-zJIFpKYNR/api/mxj5HqJSlEMFh9J4sVKk+3QYlPmppW68beZLLzqwchb5+c/V559lnSrGy5HvDUEGLXvp6reA==", "dev": true, "dependencies": { - "@verdaccio/logger-commons": "8.0.0-next-8.1", - "pino": "8.17.2" + "@verdaccio/logger-commons": "8.0.0-next-8.4", + "pino": "9.4.0" }, "engines": { "node": ">=18" @@ -7527,128 +7587,19 @@ "url": "https://opencollective.com/verdaccio" } }, - "node_modules/@verdaccio/logger-7": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/logger-7/-/logger-7-8.0.0-next-8.1.tgz", - "integrity": "sha512-V+/B1Wnct3IZ90q6HkI1a3dqbS0ds7s/5WPrS5cmBeLEw78/OGgF76XkhI2+lett7Un1CjVow7mcebOWcZ/Sqw==", - "dev": true, - "dependencies": { - "@verdaccio/logger-commons": "8.0.0-next-8.1", - "pino": "7.11.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/verdaccio" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/duplexify": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz", - "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.2" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/on-exit-leak-free": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz", - "integrity": "sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==", - "dev": true - }, - "node_modules/@verdaccio/logger-7/node_modules/pino": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-7.11.0.tgz", - "integrity": "sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==", - "dev": true, - "dependencies": { - "atomic-sleep": "^1.0.0", - "fast-redact": "^3.0.0", - "on-exit-leak-free": "^0.2.0", - "pino-abstract-transport": "v0.5.0", - "pino-std-serializers": "^4.0.0", - "process-warning": "^1.0.0", - "quick-format-unescaped": "^4.0.3", - "real-require": "^0.1.0", - "safe-stable-stringify": "^2.1.0", - "sonic-boom": "^2.2.1", - "thread-stream": "^0.15.1" - }, - "bin": { - "pino": "bin.js" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/pino-abstract-transport": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz", - "integrity": "sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==", - "dev": true, - "dependencies": { - "duplexify": "^4.1.2", - "split2": "^4.0.0" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/pino-std-serializers": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz", - "integrity": "sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==", - "dev": true - }, - "node_modules/@verdaccio/logger-7/node_modules/real-require": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.1.0.tgz", - "integrity": "sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==", - "dev": true, - "engines": { - "node": ">= 12.13.0" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/sonic-boom": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.8.0.tgz", - "integrity": "sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==", - "dev": true, - "dependencies": { - "atomic-sleep": "^1.0.0" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/split2": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", - "dev": true, - "engines": { - "node": ">= 10.x" - } - }, - "node_modules/@verdaccio/logger-7/node_modules/thread-stream": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-0.15.2.tgz", - "integrity": "sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==", - "dev": true, - "dependencies": { - "real-require": "^0.1.0" - } - }, "node_modules/@verdaccio/logger-commons": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/logger-commons/-/logger-commons-8.0.0-next-8.1.tgz", - "integrity": "sha512-jCge//RT4uaK7MarhpzcJeJ5Uvtu/DbJ1wvJQyGiFe+9AvxDGm3EUFXvawLFZ0lzYhmLt1nvm7kevcc3vOm2ZQ==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/logger-commons/-/logger-commons-8.0.0-next-8.4.tgz", + "integrity": "sha512-neDbq5IIRoidFT4Rv3zH9YydICDCJEybb06BzCGVOzlhZ7F+fBzJH1qlBhAEISfbONugDgfuUQ2jbRCKEkHezQ==", "dev": true, "dependencies": { - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/logger-prettify": "8.0.0-next-8.0", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/logger-prettify": "8.0.0-next-8.1", "colorette": "2.0.20", "debug": "4.3.7" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7679,19 +7630,19 @@ "dev": true }, "node_modules/@verdaccio/logger-prettify": { - "version": "8.0.0-next-8.0", - "resolved": "https://registry.npmjs.org/@verdaccio/logger-prettify/-/logger-prettify-8.0.0-next-8.0.tgz", - "integrity": "sha512-7mAFHZF2NPTubrOXYp2+fbMjRW5MMWXMeS3LcpupMAn5uPp6jkKEM8NC4IVJEevC5Ph4vPVZqpoPDpgXHEaV3Q==", + "version": "8.0.0-next-8.1", + "resolved": "https://registry.npmjs.org/@verdaccio/logger-prettify/-/logger-prettify-8.0.0-next-8.1.tgz", + "integrity": "sha512-vLhaGq0q7wtMCcqa0aQY6QOsMNarhTu/l4e6Z8mG/5LUH95GGLsBwpXLnKS94P3deIjsHhc9ycnEmG39txbQ1w==", "dev": true, "dependencies": { "colorette": "2.0.20", "dayjs": "1.11.13", "lodash": "4.17.21", - "pino-abstract-transport": "1.1.0", - "sonic-boom": "3.8.0" + "pino-abstract-transport": "1.2.0", + "sonic-boom": "3.8.1" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7699,22 +7650,41 @@ } }, "node_modules/@verdaccio/middleware": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/middleware/-/middleware-8.0.0-next-8.1.tgz", - "integrity": "sha512-GpAdJYky1WmOERpxPoCkVSwTTJIsVAjqf2a2uQNvi7R3UZhs059JKhWcZjJMVCGV0uz9xgQvtb3DEuYGHqyaOg==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/middleware/-/middleware-8.0.0-next-8.4.tgz", + "integrity": "sha512-tzpfSpeLKUeyTsQ+fvUsokgdh1NrjDJX/oz2ya8wTYSInKAt1Ld9MRzRVSHJwIQc7wfg46zSjpcKZVLA/YkJ6w==", "dev": true, "dependencies": { - "@verdaccio/config": "8.0.0-next-8.1", - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/url": "13.0.0-next-8.1", - "@verdaccio/utils": "7.0.1-next-8.1", + "@verdaccio/config": "8.0.0-next-8.4", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/url": "13.0.0-next-8.4", + "@verdaccio/utils": "8.1.0-next-8.4", "debug": "4.3.7", - "express": "4.21.0", + "express": "4.21.1", "express-rate-limit": "5.5.1", "lodash": "4.17.21", "lru-cache": "7.18.3", "mime": "2.6.0" }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/verdaccio" + } + }, + "node_modules/@verdaccio/middleware/node_modules/@verdaccio/utils": { + "version": "8.1.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/utils/-/utils-8.1.0-next-8.4.tgz", + "integrity": "sha512-mAEBWV5zsjtC4e/hfj1Q/eYtMlML5wxedk7mqqmvAydjw+ycSH/D/ksU+B10h4STX2NcBlcLtgLl7OI/wFzrgA==", + "dev": true, + "dependencies": { + "@verdaccio/core": "8.0.0-next-8.4", + "lodash": "4.17.21", + "minimatch": "7.4.6", + "semver": "7.6.3" + }, "engines": { "node": ">=12" }, @@ -7723,6 +7693,15 @@ "url": "https://opencollective.com/verdaccio" } }, + "node_modules/@verdaccio/middleware/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@verdaccio/middleware/node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", @@ -7761,6 +7740,21 @@ "node": ">=4.0.0" } }, + "node_modules/@verdaccio/middleware/node_modules/minimatch": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", + "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@verdaccio/middleware/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7768,12 +7762,12 @@ "dev": true }, "node_modules/@verdaccio/search-indexer": { - "version": "8.0.0-next-8.0", - "resolved": "https://registry.npmjs.org/@verdaccio/search-indexer/-/search-indexer-8.0.0-next-8.0.tgz", - "integrity": "sha512-VS9axVt8XAueiPceVCgaj9nlvYj5s/T4MkAILSf2rVZeFFOMUyxU3mddUCajSHzL+YpqCuzLLL9865sRRzOJ9w==", + "version": "8.0.0-next-8.2", + "resolved": "https://registry.npmjs.org/@verdaccio/search-indexer/-/search-indexer-8.0.0-next-8.2.tgz", + "integrity": "sha512-sWliVN5BkAGbZ3e/GD0CsZMfPJdRMRuN0tEKQFsvEJifxToq5UkfCw6vKaVvhezsTWqb+Rp5y+2d4n5BDOA49w==", "dev": true, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7781,16 +7775,16 @@ } }, "node_modules/@verdaccio/signature": { - "version": "8.0.0-next-8.0", - "resolved": "https://registry.npmjs.org/@verdaccio/signature/-/signature-8.0.0-next-8.0.tgz", - "integrity": "sha512-klcc2UlCvQxXDV65Qewo2rZOfv7S1y8NekS/8uurSaCTjU35T+fz+Pbqz1S9XK9oQlMp4vCQ7w3iMPWQbvphEQ==", + "version": "8.0.0-next-8.1", + "resolved": "https://registry.npmjs.org/@verdaccio/signature/-/signature-8.0.0-next-8.1.tgz", + "integrity": "sha512-lHD/Z2FoPQTtDYz6ZlXhj/lrg0SFirHrwCGt/cibl1GlePpx78WPdo03tgAyl0Qf+I35n484/gR1l9eixBQqYw==", "dev": true, "dependencies": { "debug": "4.3.7", "jsonwebtoken": "9.0.2" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7835,27 +7829,55 @@ } }, "node_modules/@verdaccio/tarball": { - "version": "13.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/tarball/-/tarball-13.0.0-next-8.1.tgz", - "integrity": "sha512-58uimU2Bqt9+s+9ixy7wK/nPCqbOXhhhr/MQjl+otIlsUhSeATndhFzEctz/W+4MhUDg0tUnE9HC2yeNHHAo1Q==", + "version": "13.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/tarball/-/tarball-13.0.0-next-8.4.tgz", + "integrity": "sha512-zizQwACK+P9sHtArbuW5MJluRpc3lC6bilGTFNc0TLkHbwL73F8wxkKr5VLzWV7H54+sVKMDs1lCnaoHa0ygmw==", "dev": true, "dependencies": { - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/url": "13.0.0-next-8.1", - "@verdaccio/utils": "7.0.1-next-8.1", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/url": "13.0.0-next-8.4", + "@verdaccio/utils": "8.1.0-next-8.4", "debug": "4.3.7", "gunzip-maybe": "^1.4.2", "lodash": "4.17.21", "tar-stream": "^3.1.7" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/verdaccio" } }, + "node_modules/@verdaccio/tarball/node_modules/@verdaccio/utils": { + "version": "8.1.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/utils/-/utils-8.1.0-next-8.4.tgz", + "integrity": "sha512-mAEBWV5zsjtC4e/hfj1Q/eYtMlML5wxedk7mqqmvAydjw+ycSH/D/ksU+B10h4STX2NcBlcLtgLl7OI/wFzrgA==", + "dev": true, + "dependencies": { + "@verdaccio/core": "8.0.0-next-8.4", + "lodash": "4.17.21", + "minimatch": "7.4.6", + "semver": "7.6.3" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/verdaccio" + } + }, + "node_modules/@verdaccio/tarball/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@verdaccio/tarball/node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", @@ -7873,6 +7895,21 @@ } } }, + "node_modules/@verdaccio/tarball/node_modules/minimatch": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", + "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@verdaccio/tarball/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7880,24 +7917,24 @@ "dev": true }, "node_modules/@verdaccio/ui-theme": { - "version": "8.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-8.0.0-next-8.1.tgz", - "integrity": "sha512-9PxV8+jE2Tr+iy9DQW/bzny4YqOlW0mCZ9ct6jhcUW4GdfzU//gY2fBN/DDtQVmfbTy8smuj4Enyv5f0wCsnYg==", + "version": "8.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-8.0.0-next-8.4.tgz", + "integrity": "sha512-j3STxUuIgvn058LqfXWv+SwRi1fQ7HapMSfVKXAhi09+f4zlD2mtvKLth0WbuzU1NqJPTGLAP9ueBf1210C1Hw==", "dev": true }, "node_modules/@verdaccio/url": { - "version": "13.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/@verdaccio/url/-/url-13.0.0-next-8.1.tgz", - "integrity": "sha512-h6pkJf+YtogImKgOrmPP9UVG3p3gtb67gqkQU0bZnK+SEKQt6Rkek/QvtJ8MbmciagYS18bDhpI8DxqLHjDfZQ==", + "version": "13.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/@verdaccio/url/-/url-13.0.0-next-8.4.tgz", + "integrity": "sha512-Xo+9DUcwYTBV6d0n4vjLAN2k92J33XM/9JNltWM6140oI8lz+VJKiajtejG/hRBi82RioRdWJ0RZDDY6FsbS3Q==", "dev": true, "dependencies": { - "@verdaccio/core": "8.0.0-next-8.1", + "@verdaccio/core": "8.0.0-next-8.4", "debug": "4.3.7", "lodash": "4.17.21", "validator": "13.12.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -7946,6 +7983,43 @@ "url": "https://opencollective.com/verdaccio" } }, + "node_modules/@verdaccio/utils/node_modules/@verdaccio/core": { + "version": "8.0.0-next-8.1", + "resolved": "https://registry.npmjs.org/@verdaccio/core/-/core-8.0.0-next-8.1.tgz", + "integrity": "sha512-kQRCB2wgXEh8H88G51eQgAFK9IxmnBtkQ8sY5FbmB6PbBkyHrbGcCp+2mtRqqo36j0W1VAlfM3XzoknMy6qQnw==", + "dev": true, + "dependencies": { + "ajv": "8.17.1", + "core-js": "3.37.1", + "http-errors": "2.0.0", + "http-status-codes": "2.3.0", + "process-warning": "1.0.0", + "semver": "7.6.3" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/verdaccio" + } + }, + "node_modules/@verdaccio/utils/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/@verdaccio/utils/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -7955,6 +8029,12 @@ "balanced-match": "^1.0.0" } }, + "node_modules/@verdaccio/utils/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, "node_modules/@verdaccio/utils/node_modules/minimatch": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", @@ -8030,6 +8110,15 @@ "node": ">= 0.6" } }, + "node_modules/accepts/node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.11.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", @@ -8340,9 +8429,9 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", "dev": true }, "node_modules/asynckit": { @@ -8781,15 +8870,15 @@ } }, "node_modules/aws4": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.1.tgz", - "integrity": "sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", + "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", "dev": true }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true }, "node_modules/babel-generator": { @@ -9109,9 +9198,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "dev": true, "optional": true }, @@ -9195,15 +9284,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -9219,21 +9299,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dev": true, - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/bowser": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", @@ -9374,9 +9439,9 @@ } }, "node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, "engines": { "node": ">= 0.8" @@ -9604,10 +9669,13 @@ "link": true }, "node_modules/clipanion": { - "version": "4.0.0-rc.3", - "resolved": "https://registry.npmjs.org/clipanion/-/clipanion-4.0.0-rc.3.tgz", - "integrity": "sha512-+rJOJMt2N6Oikgtfqmo/Duvme7uz3SIedL2b6ycgCztQMiTfr3aQh2DDyLHl+QUPClKMNpSg3gDJFvNQYIcq1g==", + "version": "4.0.0-rc.4", + "resolved": "https://registry.npmjs.org/clipanion/-/clipanion-4.0.0-rc.4.tgz", + "integrity": "sha512-CXkMQxU6s9GklO/1f714dkKBMu1lopS1WFF0B8o4AxPykR1hpozxSiUZ5ZUeBjfPgCWqbcNOtZVFhB8Lkfp1+Q==", "dev": true, + "workspaces": [ + "website" + ], "dependencies": { "typanion": "^3.8.0" }, @@ -9786,17 +9854,17 @@ } }, "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", + "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", "dev": true, "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", + "bytes": "3.1.2", + "compressible": "~2.0.18", "debug": "2.6.9", + "negotiator": "~0.6.4", "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", + "safe-buffer": "5.2.1", "vary": "~1.1.2" }, "engines": { @@ -9818,12 +9886,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/compression/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -10511,9 +10573,9 @@ } }, "node_modules/envinfo": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", - "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -11385,9 +11447,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, "dependencies": { "accepts": "~1.3.8", @@ -11395,7 +11457,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -11447,21 +11509,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/express/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dev": true, - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -11576,9 +11623,9 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", "dev": true }, "node_modules/fast-xml-parser": { @@ -11823,17 +11870,17 @@ } }, "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dev": true, "dependencies": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" }, "engines": { - "node": ">= 0.12" + "node": ">= 6" } }, "node_modules/forwarded": { @@ -12405,14 +12452,14 @@ } }, "node_modules/http-signature": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", - "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz", + "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==", "dev": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^2.0.2", - "sshpk": "^1.14.1" + "sshpk": "^1.18.0" }, "engines": { "node": ">=0.10" @@ -14949,20 +14996,6 @@ "node": ">= 14" } }, - "node_modules/jsdom/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/jsdom/node_modules/https-proxy-agent": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", @@ -15601,62 +15634,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/mv": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", - "dev": true, - "dependencies": { - "mkdirp": "~0.5.1", - "ncp": "~2.0.0", - "rimraf": "~2.4.0" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/mv/node_modules/glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mv/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mv/node_modules/rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^6.0.1" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/nanoid": { "version": "3.3.8", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", @@ -15682,19 +15659,10 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "dev": true, - "bin": { - "ncp": "bin/ncp" - } - }, "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", "dev": true, "engines": { "node": ">= 0.6" @@ -16363,31 +16331,31 @@ } }, "node_modules/pino": { - "version": "8.17.2", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.17.2.tgz", - "integrity": "sha512-LA6qKgeDMLr2ux2y/YiUt47EfgQ+S9LznBWOJdN3q1dx2sv0ziDLUBeVpyVv17TEcGCBuWf0zNtg3M5m1NhhWQ==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/pino/-/pino-9.4.0.tgz", + "integrity": "sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w==", "dev": true, "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "v1.1.0", - "pino-std-serializers": "^6.0.0", - "process-warning": "^3.0.0", + "pino-abstract-transport": "^1.2.0", + "pino-std-serializers": "^7.0.0", + "process-warning": "^4.0.0", "quick-format-unescaped": "^4.0.3", "real-require": "^0.2.0", "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^3.7.0", - "thread-stream": "^2.0.0" + "sonic-boom": "^4.0.1", + "thread-stream": "^3.0.0" }, "bin": { "pino": "bin.js" } }, "node_modules/pino-abstract-transport": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz", - "integrity": "sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", + "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", "dev": true, "dependencies": { "readable-stream": "^4.0.0", @@ -16444,17 +16412,26 @@ } }, "node_modules/pino-std-serializers": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz", - "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz", + "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==", "dev": true }, "node_modules/pino/node_modules/process-warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz", - "integrity": "sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.0.tgz", + "integrity": "sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw==", "dev": true }, + "node_modules/pino/node_modules/sonic-boom": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz", + "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==", + "dev": true, + "dependencies": { + "atomic-sleep": "^1.0.0" + } + }, "node_modules/pirates": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", @@ -16705,12 +16682,12 @@ ] }, "node_modules/qs": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", - "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -16780,15 +16757,6 @@ "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/react": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", @@ -17420,9 +17388,9 @@ } }, "node_modules/sonic-boom": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.0.tgz", - "integrity": "sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.1.tgz", + "integrity": "sha512-y4Z8LCDBuum+PBP3lSV7RHrXscqksve/bi0as7mhwVnBW+/wUqKT/2Kb7um8yqcFy0duYbbPxzt89Zy2nOCaxg==", "dev": true, "dependencies": { "atomic-sleep": "^1.0.0" @@ -17590,9 +17558,9 @@ } }, "node_modules/streamx": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", - "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz", + "integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==", "dev": true, "dependencies": { "fast-fifo": "^1.3.2", @@ -17953,9 +17921,9 @@ } }, "node_modules/text-decoder": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", - "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.2.tgz", + "integrity": "sha512-/MDslo7ZyWTA2vnk1j7XoDVfXsGk3tp+zFEJHJGm0UjIlQifonVFwlVbQDFh8KJzTBnT8ie115TYqir6bclddA==", "dev": true, "dependencies": { "b4a": "^1.6.4" @@ -17968,9 +17936,9 @@ "dev": true }, "node_modules/thread-stream": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz", - "integrity": "sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz", + "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==", "dev": true, "dependencies": { "real-require": "^0.2.0" @@ -18364,7 +18332,10 @@ "version": "3.14.0", "resolved": "https://registry.npmjs.org/typanion/-/typanion-3.14.0.tgz", "integrity": "sha512-ZW/lVMRabETuYCd9O9ZvMhAh8GslSqaUjxmK/JLPCh6l73CvLBiuXswj/+7LdnWOgYsQ130FqLzFz5aGT4I3Ug==", - "dev": true + "dev": true, + "workspaces": [ + "website" + ] }, "node_modules/type-check": { "version": "0.4.0", @@ -18745,32 +18716,32 @@ } }, "node_modules/verdaccio": { - "version": "5.32.2", - "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-5.32.2.tgz", - "integrity": "sha512-QnVYIUvwB884fwVcA/D+x7AabsRPlTPyYAKMtExm8kJjiH+s2LGK2qX2o3I4VmYXqBR3W9b8gEnyQnGwQhUPsw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-6.0.2.tgz", + "integrity": "sha512-XthgJlF1hGW+GR/apRLZ7DQw26XpLI+xjMGb7dhJKxI4Pz2gSiEY1RXP9T9I/rlIBr9Zx6rYOgRk7A9Aeq/kpg==", "dev": true, "dependencies": { - "@cypress/request": "3.0.1", - "@verdaccio/auth": "8.0.0-next-8.1", - "@verdaccio/config": "8.0.0-next-8.1", - "@verdaccio/core": "8.0.0-next-8.1", + "@cypress/request": "3.0.5", + "@verdaccio/auth": "8.0.0-next-8.4", + "@verdaccio/config": "8.0.0-next-8.4", + "@verdaccio/core": "8.0.0-next-8.4", "@verdaccio/local-storage-legacy": "11.0.2", - "@verdaccio/logger-7": "8.0.0-next-8.1", - "@verdaccio/middleware": "8.0.0-next-8.1", - "@verdaccio/search-indexer": "8.0.0-next-8.0", - "@verdaccio/signature": "8.0.0-next-8.0", + "@verdaccio/logger": "8.0.0-next-8.4", + "@verdaccio/middleware": "8.0.0-next-8.4", + "@verdaccio/search-indexer": "8.0.0-next-8.2", + "@verdaccio/signature": "8.0.0-next-8.1", "@verdaccio/streams": "10.2.1", - "@verdaccio/tarball": "13.0.0-next-8.1", - "@verdaccio/ui-theme": "8.0.0-next-8.1", - "@verdaccio/url": "13.0.0-next-8.1", + "@verdaccio/tarball": "13.0.0-next-8.4", + "@verdaccio/ui-theme": "8.0.0-next-8.4", + "@verdaccio/url": "13.0.0-next-8.4", "@verdaccio/utils": "7.0.1-next-8.1", - "async": "3.2.5", - "clipanion": "4.0.0-rc.3", - "compression": "1.7.4", + "async": "3.2.6", + "clipanion": "4.0.0-rc.4", + "compression": "1.7.5", "cors": "2.8.5", - "debug": "^4.3.5", - "envinfo": "7.13.0", - "express": "4.21.0", + "debug": "4.3.7", + "envinfo": "7.14.0", + "express": "4.21.1", "express-rate-limit": "5.5.1", "fast-safe-stringify": "2.1.1", "handlebars": "4.7.8", @@ -18782,18 +18753,17 @@ "lru-cache": "7.18.3", "mime": "3.0.0", "mkdirp": "1.0.4", - "mv": "2.1.1", "pkginfo": "0.4.1", "semver": "7.6.3", "validator": "13.12.0", - "verdaccio-audit": "13.0.0-next-8.1", - "verdaccio-htpasswd": "13.0.0-next-8.1" + "verdaccio-audit": "13.0.0-next-8.4", + "verdaccio-htpasswd": "13.0.0-next-8.4" }, "bin": { "verdaccio": "bin/verdaccio" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -18801,19 +18771,19 @@ } }, "node_modules/verdaccio-audit": { - "version": "13.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/verdaccio-audit/-/verdaccio-audit-13.0.0-next-8.1.tgz", - "integrity": "sha512-EEfUeC1kHuErtwF9FC670W+EXHhcl+iuigONkcprwRfkPxmdBs+Hx36745hgAMZ9SCqedNECaycnGF3tZ3VYfw==", + "version": "13.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/verdaccio-audit/-/verdaccio-audit-13.0.0-next-8.4.tgz", + "integrity": "sha512-T4yi/46fLngllx5mvFtXsGcW3MxGZZ9IkHYPK1OQw9+Xj9aOuMec2eFdztTRo9SgqZfgblGSY1ESZYy19sQLvw==", "dev": true, "dependencies": { - "@verdaccio/config": "8.0.0-next-8.1", - "@verdaccio/core": "8.0.0-next-8.1", - "express": "4.21.0", + "@verdaccio/config": "8.0.0-next-8.4", + "@verdaccio/core": "8.0.0-next-8.4", + "express": "4.21.1", "https-proxy-agent": "5.0.1", "node-fetch": "cjs" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -18821,13 +18791,13 @@ } }, "node_modules/verdaccio-htpasswd": { - "version": "13.0.0-next-8.1", - "resolved": "https://registry.npmjs.org/verdaccio-htpasswd/-/verdaccio-htpasswd-13.0.0-next-8.1.tgz", - "integrity": "sha512-BfvmO+ZdbwfttOwrdTPD6Bccr1ZfZ9Tk/9wpXamxdWB/XPWlk3FtyGsvqCmxsInRLPhQ/FSk9c3zRCGvICTFYg==", + "version": "13.0.0-next-8.4", + "resolved": "https://registry.npmjs.org/verdaccio-htpasswd/-/verdaccio-htpasswd-13.0.0-next-8.4.tgz", + "integrity": "sha512-w0knjKz8SdBGSv0Kt61LoUOCYBZ2/iig3bVbGFWTj4MwCUG6eNewMoQ6nbrk+kyHNFVq75IzT1eIhXDEysx15Q==", "dev": true, "dependencies": { - "@verdaccio/core": "8.0.0-next-8.1", - "@verdaccio/file-locking": "13.0.0-next-8.0", + "@verdaccio/core": "8.0.0-next-8.4", + "@verdaccio/file-locking": "13.0.0-next-8.2", "apache-md5": "1.1.8", "bcryptjs": "2.4.3", "core-js": "3.37.1", @@ -18836,7 +18806,7 @@ "unix-crypt-td-js": "1.1.4" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -18844,15 +18814,15 @@ } }, "node_modules/verdaccio-htpasswd/node_modules/@verdaccio/file-locking": { - "version": "13.0.0-next-8.0", - "resolved": "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-13.0.0-next-8.0.tgz", - "integrity": "sha512-28XRwpKiE3Z6KsnwE7o8dEM+zGWOT+Vef7RVJyUlG176JVDbGGip3HfCmFioE1a9BklLyGEFTu6D69BzfbRkzA==", + "version": "13.0.0-next-8.2", + "resolved": "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-13.0.0-next-8.2.tgz", + "integrity": "sha512-TcHgN3I/N28WBSvtukpGrJhBljl4jyIXq0vEv94vXAG6nUE3saK+vtgo8PfYA3Ueo88v/1zyAbiZM4uxwojCmQ==", "dev": true, "dependencies": { "lockfile": "1.0.4" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "type": "opencollective", @@ -18889,12 +18859,12 @@ "dev": true }, "node_modules/verdaccio/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -18956,6 +18926,12 @@ "node": ">=12" } }, + "node_modules/verdaccio/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "node_modules/verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", diff --git a/package.json b/package.json index f70dfc37c..4e52e0d0c 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "tsx": "^4.8.2", "turbo": "^1.10.14", "typescript": "^5.1.6", - "verdaccio": "^5.32.2" + "verdaccio": "^6.0.2" }, "resolutions": { "cookie": "^0.7.2" From 4e6c02298f8d39fe224254ab3da4fdb47e212f00 Mon Sep 17 00:00:00 2001 From: aws-amplify-bot Date: Wed, 18 Dec 2024 17:41:57 +0000 Subject: [PATCH 7/9] release: publish [ci skip] --- .changeset/friendly-crabs-relax.md | 2 -- .changeset/sharp-berries-refuse.md | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 .changeset/friendly-crabs-relax.md delete mode 100644 .changeset/sharp-berries-refuse.md diff --git a/.changeset/friendly-crabs-relax.md b/.changeset/friendly-crabs-relax.md deleted file mode 100644 index a845151cc..000000000 --- a/.changeset/friendly-crabs-relax.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.changeset/sharp-berries-refuse.md b/.changeset/sharp-berries-refuse.md deleted file mode 100644 index 9e5618394..000000000 --- a/.changeset/sharp-berries-refuse.md +++ /dev/null @@ -1,4 +0,0 @@ ---- ---- - -chore(deps-dev): bump next from 14.2.12 to 14.2.20 From 56cf00c2c1896e2fdc60afca182de27453aca27b Mon Sep 17 00:00:00 2001 From: Jack Lu Date: Thu, 19 Dec 2024 09:12:46 -0800 Subject: [PATCH 8/9] fix: DeepPickFromPath<> to flatten Arrays of Models referenced in a join table (#417) --- .changeset/slow-paws-own.md | 6 + .../data-schema/src/runtime/client/index.ts | 16 +- .../3-exhaustive/custom-selection-set.ts | 155 ++++++++++++++++++ 3 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 .changeset/slow-paws-own.md diff --git a/.changeset/slow-paws-own.md b/.changeset/slow-paws-own.md new file mode 100644 index 000000000..dbc2ce0b7 --- /dev/null +++ b/.changeset/slow-paws-own.md @@ -0,0 +1,6 @@ +--- +'integration-tests': patch +'@aws-amplify/data-schema': patch +--- + +Fix DeepPickFromPath unable to flatten arrays in a join table diff --git a/packages/data-schema/src/runtime/client/index.ts b/packages/data-schema/src/runtime/client/index.ts index 382e8c2c4..82251b5df 100644 --- a/packages/data-schema/src/runtime/client/index.ts +++ b/packages/data-schema/src/runtime/client/index.ts @@ -198,9 +198,9 @@ type DeepPickFromPath< ? Head extends keyof FlatModel ? Tail extends '*' ? { - [k in Head]: NonRelationshipFields< - UnwrapArray - >; + [k in Head]: FlatModel[Head] extends Record + ? NonRelationshipFields> + : NonRelationshipFields>; } : { [k in Head]: DeepPickFromPath } : never @@ -208,6 +208,16 @@ type DeepPickFromPath< ? { [K in Path]: FlatModel[Path] } : never; +/** + * This mapped type gets called by DeepPickFromPath when user uses selection + * set on a query to a many-to-many relationship join table. It flattens the Arrays of Models referenced in the join table. + * + * (e.g. { customer: { orders: Order[]} } => { customer: { orders: Order} }) + */ +type FlattenArrays = { + [K in keyof T]: UnwrapArray; +}; + /** * Generates custom selection set type with up to 6 levels of nested fields * diff --git a/packages/integration-tests/__tests__/defined-behavior/3-exhaustive/custom-selection-set.ts b/packages/integration-tests/__tests__/defined-behavior/3-exhaustive/custom-selection-set.ts index 1b256ffe9..d2b0cfde2 100644 --- a/packages/integration-tests/__tests__/defined-behavior/3-exhaustive/custom-selection-set.ts +++ b/packages/integration-tests/__tests__/defined-behavior/3-exhaustive/custom-selection-set.ts @@ -1107,4 +1107,159 @@ describe('Custom selection set edge cases', () => { type _test = Expect>; }); }); + + describe('optional array with many-to-many relationships', () => { + const schema = a + .schema({ + AlphabetEnum: a.enum(['A', 'B', 'C', 'D']), + Customer: a.model({ + name: a.string().required(), + verbiageReqReq: a.ref('Verbiage').required().array().required(), + verbiageOptReq: a.ref('Verbiage').array().required(), + verbiageReqOpt: a.ref('Verbiage').required().array(), + verbiageOptOpt: a.ref('Verbiage').array(), + orders: a.hasMany('CustomerPart', 'customerId'), + }), + Verbiage: a.customType({ + name: a.ref('AlphabetEnum').required(), + paragraphs: a.string().required().array().required(), + }), + CustomerPart: a.model({ + customer: a.belongsTo('Customer', 'customerId'), + customerId: a.string(), + experience: a.string(), + part: a.belongsTo('Part', 'partId'), + partId: a.string(), + }), + Part: a.model({ + name: a.string().required(), + orders: a.hasMany('CustomerPart', 'partId'), + }), + }) + .authorization((allow) => allow.guest()); + + type Schema = ClientSchema; + + async function getMockedClient( + operationName: string, + mockedResult: object, + ) { + const { spy, generateClient } = mockedGenerateClient([ + { + data: { + [operationName]: { + items: [mockedResult], + }, + }, + }, + ]); + + const config = await buildAmplifyConfig(schema); + Amplify.configure(config); + const client = generateClient(); + return { client, spy }; + } + + describe('Defined many-to-many relations', () => { + const sampleCustomerPart = { + customer: [ + { + name: 'some-customer', + verbiageReqReq: [ + { + name: 'A', + paragraphs: ['some-paragraph'], + }, + ], + verbiageOptReq: [ + { + name: 'A', + paragraphs: ['some-paragraph'], + }, + ], + verbiageReqOpt: [ + { + name: 'A', + paragraphs: ['some-paragraph'], + }, + ], + verbiageOptOpt: [ + { + name: 'A', + paragraphs: ['some-paragraph'], + }, + ], + }, + ], + customerId: 'some-customer-id', + part: [ + { + name: 'some-part', + orders: [ + { + customerId: 'some-customer-id', + partId: 'some-part-id', + }, + ], + }, + ], + partId: 'some-part-id', + }; + + async function mockedOperation() { + const { client, spy } = await getMockedClient( + 'listCustomerPart', + sampleCustomerPart, + ); + + const { data } = await client.models.CustomerPart.list({ + selectionSet: [ + 'customer.*', + 'customer.verbiageReqReq.*', + 'customer.verbiageOptReq.*', + 'customer.verbiageReqOpt.*', + 'customer.verbiageOptOpt.*', + ], + }); + return { data, spy }; + } + + type Verbiage = { + readonly name: 'A' | 'B' | 'C' | 'D'; + readonly paragraphs: string[]; + }; + + test('.required().array().required()', async () => { + const { data } = await mockedOperation(); + const cus = data[0].customer.verbiageReqReq; + type ExpectedType = Verbiage[]; + type ActualType = typeof cus; + type _test = Expect>; + }); + + test('.array().required()', async () => { + const { data } = await mockedOperation(); + const cus = data[0].customer.verbiageOptReq; + type ExpectedType = (Verbiage | null)[]; + type ActualType = typeof cus; + type _test = Expect>; + }); + + test('.required().array()', async () => { + const { data } = await mockedOperation(); + const cus = data[0].customer.verbiageReqOpt; + type ExpectedType = Verbiage[] | null; + type ActualType = typeof cus; + type _test = Expect>; + }); + + test('.array()', async () => { + const { data } = await mockedOperation(); + const cus = data[0].customer.verbiageOptOpt; + type ExpectedType = (Verbiage | null)[] | null; + type ActualType = typeof cus; + type _test = Expect>; + }); + }); + }); }); From 2394f64dc37eeda0f6a48876ec8d22709662c2a7 Mon Sep 17 00:00:00 2001 From: aws-amplify-bot Date: Thu, 19 Dec 2024 17:26:52 +0000 Subject: [PATCH 9/9] release: publish [ci skip] --- .changeset/slow-paws-own.md | 6 ------ package-lock.json | 4 ++-- packages/data-schema/CHANGELOG.md | 6 ++++++ packages/data-schema/package.json | 2 +- packages/integration-tests/CHANGELOG.md | 6 ++++++ packages/integration-tests/package.json | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 .changeset/slow-paws-own.md diff --git a/.changeset/slow-paws-own.md b/.changeset/slow-paws-own.md deleted file mode 100644 index dbc2ce0b7..000000000 --- a/.changeset/slow-paws-own.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'integration-tests': patch -'@aws-amplify/data-schema': patch ---- - -Fix DeepPickFromPath unable to flatten arrays in a join table diff --git a/package-lock.json b/package-lock.json index f52b8850e..96ae887e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19399,7 +19399,7 @@ }, "packages/data-schema": { "name": "@aws-amplify/data-schema", - "version": "1.17.1", + "version": "1.17.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/data-schema-types": "*", @@ -19435,7 +19435,7 @@ } }, "packages/integration-tests": { - "version": "0.2.0", + "version": "0.2.1", "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-generator": "^0.5.2", diff --git a/packages/data-schema/CHANGELOG.md b/packages/data-schema/CHANGELOG.md index 8cd4c440d..31501683c 100644 --- a/packages/data-schema/CHANGELOG.md +++ b/packages/data-schema/CHANGELOG.md @@ -1,5 +1,11 @@ # @aws-amplify/data-schema +## 1.17.2 + +### Patch Changes + +- 56cf00c: Fix DeepPickFromPath unable to flatten arrays in a join table + ## 1.17.1 ### Patch Changes diff --git a/packages/data-schema/package.json b/packages/data-schema/package.json index e50ad5d01..07befa2ac 100644 --- a/packages/data-schema/package.json +++ b/packages/data-schema/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/data-schema", - "version": "1.17.1", + "version": "1.17.2", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md index f8a2681ff..e17a9fb6e 100644 --- a/packages/integration-tests/CHANGELOG.md +++ b/packages/integration-tests/CHANGELOG.md @@ -1,5 +1,11 @@ # integration-tests +## 0.2.1 + +### Patch Changes + +- 56cf00c: Fix DeepPickFromPath unable to flatten arrays in a join table + ## 0.2.0 ### Minor Changes diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index ba4de1e9c..2ef48283a 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "integration-tests", - "version": "0.2.0", + "version": "0.2.1", "private": true, "description": "", "license": "Apache-2.0",