From 69ece2f864d8772870952834c31566840facf8c2 Mon Sep 17 00:00:00 2001 From: David Lopez Date: Thu, 16 Nov 2023 15:34:01 -0800 Subject: [PATCH] feat: move amplify js v6 to latest (#1135) * feat: move amplify js v6 to latest * feat: add v6 integ tests and update v5 canary * fix: use corrent version syntax * fix: signIn v6 api e2e test template * fix: use ThemeProvider for v6 * chore: make old integ test use v5 * fix: pass in dependencies to integ test generator * fix: need v5 dependencies in package lock to install for integ tests * fix: put the env var in the correct position * fix: downgrade /datastore to ^4.0.0 * fix: downgrade /datastore to ^4.0.0 package lock * fix: use datastore v4 for windows integ setup --------- Co-authored-by: David Lopez --- .github/workflows/canaries.yml | 4 +- .github/workflows/check.yml | 97 +- .../lib/helpers/amplify-js-versioning.ts | 2 +- .../.eslintrc.js | 7 + .../cypress.config.js | 23 + .../cypress/.eslintrc.js | 3 + .../cypress/e2e/e2e-tests.cy.js | 28 + .../src/App.js | 57 + .../lib/generators/GenerateTestApp.ts | 7 + packages/test-generator/package-lock.json | 1127 +++++++++++++++-- packages/test-generator/package.json | 2 +- scripts/integ-setup.bat | 6 +- scripts/integ-setup.sh | 6 +- scripts/integ-templates.sh | 2 +- 14 files changed, 1268 insertions(+), 103 deletions(-) create mode 100644 packages/test-generator/e2e-test-templates-amplify-js-v6/.eslintrc.js create mode 100644 packages/test-generator/e2e-test-templates-amplify-js-v6/cypress.config.js create mode 100644 packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/.eslintrc.js create mode 100644 packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/e2e/e2e-tests.cy.js create mode 100644 packages/test-generator/e2e-test-templates-amplify-js-v6/src/App.js diff --git a/.github/workflows/canaries.yml b/.github/workflows/canaries.yml index 58295aed8..5aa151876 100644 --- a/.github/workflows/canaries.yml +++ b/.github/workflows/canaries.yml @@ -29,7 +29,7 @@ jobs: - name: Install test app dependencies working-directory: e2e-test-app run: | - npm i aws-amplify @aws-amplify/ui-react + npm i aws-amplify@^5.0.0 @aws-amplify/ui-react@^5.0.0 npm i --save-dev cypress - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 @@ -110,7 +110,7 @@ jobs: - name: Install test app dependencies working-directory: e2e-test-app run: | - npm i aws-amplify @aws-amplify/ui-react + npm i aws-amplify@^5.0.0 @aws-amplify/ui-react@^5.0.0 npm i --save-dev cypress - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 267357e60..24185bd30 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,7 +12,7 @@ permissions: contents: read # This is required for actions/checkout jobs: - amplify-cli-tests: + amplify-cli-tests-v5: runs-on: ubuntu-latest steps: - name: Checkout Studio Codegen @@ -59,7 +59,7 @@ jobs: - name: Install test app dependencies working-directory: e2e-test-app run: | - npm i aws-amplify @aws-amplify/ui-react + npm i aws-amplify@^5.0.0 @aws-amplify/ui-react@^5.0.0 npm i --save-dev cypress - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 @@ -105,6 +105,99 @@ jobs: name: cypress-videos path: /home/runner/work/amplify-codegen-ui/amplify-codegen-ui/e2e-test-app/cypress/videos + amplify-cli-tests-v6: + runs-on: ubuntu-latest + steps: + - name: Checkout Studio Codegen + uses: actions/checkout@v2 + with: + path: amplify-codegen-ui + repository: aws-amplify/amplify-codegen-ui + - name: Checkout Amplify CLI + uses: actions/checkout@v2 + with: + path: amplify-cli + repository: aws-amplify/amplify-cli + - name: Setup Node.js LTS/gallium + uses: actions/setup-node@v2 + with: + node-version: lts/gallium + - name: Build amplify-codegen-ui + working-directory: amplify-codegen-ui + run: | + npm ci + npx lerna bootstrap + npm run build + - name: Package amplify-codegen-ui + working-directory: amplify-codegen-ui + run: npx lerna exec npm pack + - name: Build amplify-cli + working-directory: amplify-cli + run: | + yarn install + yarn setup-dev + - name: Install updated codegen libraries + working-directory: amplify-cli/packages/amplify-util-uibuilder + run: | + yarn add ../../../amplify-codegen-ui/packages/codegen-ui/aws-amplify-codegen-ui-*.tgz + yarn add ../../../amplify-codegen-ui/packages/codegen-ui-react/aws-amplify-codegen-ui-react-*.tgz + - name: Build amplify-cli with updated codegen libraries + working-directory: amplify-cli + run: | + yarn install + yarn build + echo "$HOME/work/amplify-codegen-ui/amplify-codegen-ui/amplify-cli/.bin" >> $GITHUB_PATH + - name: Create a test react app + run: npx create-react-app e2e-test-app + - name: Install test app dependencies + working-directory: e2e-test-app + run: | + npm i aws-amplify@^6.0.0 @aws-amplify/ui-react@^6.0.0 + npm i --save-dev cypress + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + role-to-assume: ${{ secrets.E2E_TEST_ROLE_ARN }} + aws-region: us-west-2 + - name: Create temp AWS credentials file + working-directory: e2e-test-app + run: | + aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID && \ + aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY && \ + aws configure set aws_session_token $AWS_SESSION_TOKEN && \ + aws configure set default.region $AWS_REGION + - name: Run CLI Pull in test app + working-directory: e2e-test-app + run: | + FORCE_RENDER=1 amplify-dev pull --appId ${{ secrets.E2E_TEST_APP_ID }} --envName staging -y --providers "{\ + \"awscloudformation\":{\ + \"configLevel\":\"project\",\ + \"useProfile\":true,\ + \"profileName\":\"default\",\ + }\ + }" + - name: Write test files + working-directory: e2e-test-app + run: cp -r ../amplify-codegen-ui/packages/test-generator/e2e-test-templates-amplify-js-v6/. . + - name: Cypress run + uses: cypress-io/github-action@v5 + with: + working-directory: e2e-test-app + install: false + start: npm start + wait-on: 'http://localhost:3000' + wait-on-timeout: 120 + config-file: cypress.config.js + env: + REACT_APP_USER_EMAIL: ${{ secrets.E2E_TEST_USER_EMAIL }} + REACT_APP_USER_PASSWORD: ${{ secrets.E2E_TEST_USER_PASSWORD }} + - name: Upload Cypress videos + if: failure() + uses: actions/upload-artifact@v3 + with: + name: cypress-videos + path: /home/runner/work/amplify-codegen-ui/amplify-codegen-ui/e2e-test-app-v6/cypress/videos + functional-tests: runs-on: ubuntu-latest steps: diff --git a/packages/codegen-ui-react/lib/helpers/amplify-js-versioning.ts b/packages/codegen-ui-react/lib/helpers/amplify-js-versioning.ts index ac5debfe1..2fe0f4f54 100644 --- a/packages/codegen-ui-react/lib/helpers/amplify-js-versioning.ts +++ b/packages/codegen-ui-react/lib/helpers/amplify-js-versioning.ts @@ -20,7 +20,7 @@ import { AMPLIFY_JS_V5, AMPLIFY_JS_V6 } from '../utils/constants'; import { ImportValue } from '../imports'; export function isAmplifyJSV6RenderingEnabled(): boolean { - return false; + return true; } export function getLatestAmplifyJSV6RenderingEnabled( diff --git a/packages/test-generator/e2e-test-templates-amplify-js-v6/.eslintrc.js b/packages/test-generator/e2e-test-templates-amplify-js-v6/.eslintrc.js new file mode 100644 index 000000000..d39060885 --- /dev/null +++ b/packages/test-generator/e2e-test-templates-amplify-js-v6/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + rules: { + 'import/no-unresolved': 'off', + 'import/no-extraneous-dependencies': 'off', + 'import/extensions': 'off', + }, +}; diff --git a/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress.config.js b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress.config.js new file mode 100644 index 000000000..d2f31c220 --- /dev/null +++ b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress.config.js @@ -0,0 +1,23 @@ +/* + Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"). + You may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +// eslint-disable-next-line @typescript-eslint/no-var-requires +const { defineConfig } = require('cypress'); + +module.exports = defineConfig({ + e2e: { + supportFile: false, + }, +}); diff --git a/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/.eslintrc.js b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/.eslintrc.js new file mode 100644 index 000000000..eeacb5820 --- /dev/null +++ b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + extends: ['plugin:cypress/recommended'], +}; diff --git a/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/e2e/e2e-tests.cy.js b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/e2e/e2e-tests.cy.js new file mode 100644 index 000000000..56a5f4082 --- /dev/null +++ b/packages/test-generator/e2e-test-templates-amplify-js-v6/cypress/e2e/e2e-tests.cy.js @@ -0,0 +1,28 @@ +/* + Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"). + You may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +describe('e2e-tests', () => { + before(() => { + cy.visit('localhost:3000'); + }); + + it('renders datastore collection', () => { + // wait to log in + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(4000); + cy.get('#blogPosts').contains('Working on E2E Tests'); + }); +}); diff --git a/packages/test-generator/e2e-test-templates-amplify-js-v6/src/App.js b/packages/test-generator/e2e-test-templates-amplify-js-v6/src/App.js new file mode 100644 index 000000000..0662f7b49 --- /dev/null +++ b/packages/test-generator/e2e-test-templates-amplify-js-v6/src/App.js @@ -0,0 +1,57 @@ +/* + Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"). + You may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +import { Amplify } from 'aws-amplify'; +import { signIn } from 'aws-amplify/auth'; +import { DataStore, AuthModeStrategyType } from 'aws-amplify/datastore'; +import '@aws-amplify/ui-react/styles.css'; +import { ThemeProvider } from '@aws-amplify/ui-react'; +import { useEffect, useRef, useState } from 'react'; +import amplifyconfig from './amplifyconfiguration.json'; +import { BlogPosts } from './ui-components'; + +Amplify.configure(amplifyconfig); +DataStore.configure({ + DataStore: { + authModeStrategyType: AuthModeStrategyType.MULTI_AUTH, + }, +}); + +function App() { + const [isLoggedIn, setIsLoggedIn] = useState(false); + const initialized = useRef(false); + + useEffect(() => { + if (initialized.current) { + return; + } + initialized.current = true; + signIn({ username: process.env.REACT_APP_USER_EMAIL, password: process.env.REACT_APP_USER_PASSWORD }).then(() => { + setIsLoggedIn(true); + }); + }, []); + + if (isLoggedIn) { + return ( + + + + ); + } + + return null; +} + +export default App; diff --git a/packages/test-generator/lib/generators/GenerateTestApp.ts b/packages/test-generator/lib/generators/GenerateTestApp.ts index f7cda612d..92bbdfc0f 100644 --- a/packages/test-generator/lib/generators/GenerateTestApp.ts +++ b/packages/test-generator/lib/generators/GenerateTestApp.ts @@ -16,6 +16,12 @@ import { ModuleKind, ScriptTarget, ScriptKind } from '@aws-amplify/codegen-ui-react/dist/lib/react-render-config'; import { NodeTestGenerator } from './NodeTestGenerator'; +const { DEPENDENCIES } = process.env; + +if (!DEPENDENCIES) { + throw new Error('DEPENDENCIES env var not found'); +} + const GOLDEN_COMPONENTS = [ 'GoldenBasicComponent', 'GoldenCollectionWithDataBindingAndPagination', @@ -68,6 +74,7 @@ const jsxGenerator = new NodeTestGenerator({ target: ScriptTarget.ES2020, script: ScriptKind.JSX, renderTypeDeclarations: true, + dependencies: JSON.parse(DEPENDENCIES), }, outputConfigOverride: { outputPathDir: INTEG_TEST_PATH, diff --git a/packages/test-generator/package-lock.json b/packages/test-generator/package-lock.json index b40188911..ac7d5a96a 100644 --- a/packages/test-generator/package-lock.json +++ b/packages/test-generator/package-lock.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@aws-amplify/datastore": "^4.0.0", - "@aws-amplify/ui-react": "^4.6.0", + "@aws-amplify/ui-react": "^5.0.0", "@aws-amplify/ui-react-storage": "^1.1.0", "cypress": "12.0.2", "eslint-plugin-cypress": "2.12.1", @@ -54,6 +54,25 @@ "uuid": "^3.2.1" } }, + "node_modules/@aws-amplify/analytics/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/analytics/node_modules/@aws-sdk/util-utf8-browser": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.6.1.tgz", @@ -69,6 +88,7 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-5.4.5.tgz", "integrity": "sha512-mZMIR3w1PiUP5S41Z1j5SL5h/aY1dConndLwC7eOE4GHoGSlFUjZdrsTTRFEH8uFAg6CJ0nj/Ww8pEL+MU5FlQ==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/api-graphql": "3.4.11", "@aws-amplify/api-rest": "3.5.5", @@ -80,6 +100,7 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-3.4.11.tgz", "integrity": "sha512-brvExeD2IRnQZbcWqFeDP5xfM1ANgtsZMGGzW75Tmw4gKCQPlYcBb/mQXTVsa7AJfIgxLrSYmhlu7drTTtyBnQ==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/api-rest": "3.5.5", "@aws-amplify/auth": "5.6.5", @@ -92,11 +113,31 @@ "zen-observable-ts": "0.8.19" } }, + "node_modules/@aws-amplify/api-graphql/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/api-rest": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-3.5.5.tgz", "integrity": "sha512-tGR5yLoIC0gPcI8VyAbd7dZ8GdFMz/EEU7aG0HsAsg46Oig5VTtKa8xWV8w+dWXjzr9I2/jkpZtDfRD57PqiBg==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/core": "5.8.5", "axios": "0.26.0", @@ -104,11 +145,31 @@ "url": "0.11.0" } }, + "node_modules/@aws-amplify/api-rest/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/auth": { "version": "5.6.5", "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-5.6.5.tgz", "integrity": "sha512-NkBbYe3kV4LXj/VBeh0/HTZCNjhs8gB1frfJ2r1ZG3j+Q3taeKV4jhZcM1SyRbFh5ZGHiVSJPVefgBPi7UXBrw==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/core": "5.8.5", "amazon-cognito-identity-js": "6.3.6", @@ -117,21 +178,60 @@ "url": "0.11.0" } }, + "node_modules/@aws-amplify/auth/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/cache": { "version": "5.1.11", "resolved": "https://registry.npmjs.org/@aws-amplify/cache/-/cache-5.1.11.tgz", "integrity": "sha512-o8ju6RAbGOv8MXDJuLM2Fc5yl23pLfp1jdijlMjxBn+uXonV3B7YCtpJtjj3MW6RUY0xEZrz7fEfTp9Pa1Y7+Q==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/core": "5.8.5", "tslib": "^1.8.0" } }, - "node_modules/@aws-amplify/core": { + "node_modules/@aws-amplify/cache/node_modules/@aws-amplify/core": { "version": "5.8.5", "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, + "node_modules/@aws-amplify/core": { + "version": "5.8.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.6.tgz", + "integrity": "sha512-fDu4aduCagJb8uwQd+S0FBhuYgCgnpwfRsmO0/t01h68JR+KS3Cny0pQa7Qzk6cW/HY3rtPLELOqbdF6doA6oA==", + "dev": true, "dependencies": { "@aws-crypto/sha256-js": "1.2.2", "@aws-sdk/client-cloudwatch-logs": "3.6.1", @@ -146,16 +246,16 @@ } }, "node_modules/@aws-amplify/datastore": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.5.tgz", - "integrity": "sha512-q+5hYvPD5Y4zAximOUQY9bokZ0L2VDmqbbCjwd7rbq0qZS4cjcaMTeRk5HqxSA+HBCn4L17bqJ3z3GHCe+JZIA==", + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.6.tgz", + "integrity": "sha512-vuozosYTmWUgYzR9tqBaP1CyusPQG9/caDeqQkHCDogqJRHIkWG9INon/EUZQu4bR7W5/V8y1Dv2bLqUJSUWZA==", "dev": true, "dependencies": { - "@aws-amplify/api": "5.4.5", - "@aws-amplify/auth": "5.6.5", - "@aws-amplify/core": "5.8.5", - "@aws-amplify/pubsub": "5.5.5", - "amazon-cognito-identity-js": "6.3.6", + "@aws-amplify/api": "5.4.6", + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/core": "5.8.6", + "@aws-amplify/pubsub": "5.5.6", + "amazon-cognito-identity-js": "6.3.7", "buffer": "4.9.2", "idb": "5.0.6", "immer": "9.0.6", @@ -165,6 +265,130 @@ "zen-push": "0.2.1" } }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/api": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-5.4.6.tgz", + "integrity": "sha512-Wn9kQJ/uf0CYW1zoBueaCsoF5v3wJZpMxkpdEBYwD10GqhSt5baoghq2oW72JyDrGS8Hfq71o4a2vpXiIL/8hg==", + "dev": true, + "dependencies": { + "@aws-amplify/api-graphql": "3.4.12", + "@aws-amplify/api-rest": "3.5.6", + "tslib": "^1.8.0" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/api-graphql": { + "version": "3.4.12", + "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-3.4.12.tgz", + "integrity": "sha512-lEKXl0hM7nyulCRUQNIQ6I0+DCD16hR+V4XUdMmVgnlVnPVows5H17wM/Hu24lX84G1jFi/i14umH8+qvpk1fQ==", + "dev": true, + "dependencies": { + "@aws-amplify/api-rest": "3.5.6", + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/cache": "5.1.12", + "@aws-amplify/core": "5.8.6", + "@aws-amplify/pubsub": "5.5.6", + "graphql": "15.8.0", + "tslib": "^1.8.0", + "uuid": "^3.2.1", + "zen-observable-ts": "0.8.19" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/api-rest": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-3.5.6.tgz", + "integrity": "sha512-WAv7q05G2ypE59ebVMvIih5aTIi+jOTu+ApkEI/E5mNM2Lj33TnaOrM5Vt2oja0aHT37AQHvIF1gYYf6gF1iRQ==", + "dev": true, + "dependencies": { + "@aws-amplify/core": "5.8.6", + "axios": "1.6.0", + "tslib": "^1.8.0", + "url": "0.11.0" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/auth": { + "version": "5.6.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-5.6.6.tgz", + "integrity": "sha512-v4qiOTW7dTObEoHPjQMl0diL+E7KKk6HrKd1O+roE9f93U1ZDbcIkeY5Yih+I/U8VbS+hQ5D9oHyFbeLZWsDcg==", + "dev": true, + "dependencies": { + "@aws-amplify/core": "5.8.6", + "amazon-cognito-identity-js": "6.3.7", + "buffer": "4.9.2", + "tslib": "^1.8.0", + "url": "0.11.0" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/cache": { + "version": "5.1.12", + "resolved": "https://registry.npmjs.org/@aws-amplify/cache/-/cache-5.1.12.tgz", + "integrity": "sha512-bOhkqABOUehPCWy5x5XHMHfJtuQ7tBOGD7gAhDo6leY1O7NIHjDBto+U6FZmCE2bS8u/QcgJ94PRZ1E5/3rsng==", + "dev": true, + "dependencies": { + "@aws-amplify/core": "5.8.6", + "tslib": "^1.8.0" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/@aws-amplify/pubsub": { + "version": "5.5.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/pubsub/-/pubsub-5.5.6.tgz", + "integrity": "sha512-IxM2hjGwLQm2ICFKyr2jdpLVje5Z/m0wsLD0laDfF441NkGwSP1AEpds1I5ozAJ18ETsnxRS/6731H+nSdLVgQ==", + "dev": true, + "dependencies": { + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/cache": "5.1.12", + "@aws-amplify/core": "5.8.6", + "buffer": "4.9.2", + "graphql": "15.8.0", + "tslib": "^1.8.0", + "url": "0.11.0", + "uuid": "^3.2.1", + "zen-observable-ts": "0.8.19" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/amazon-cognito-identity-js": { + "version": "6.3.7", + "resolved": "https://registry.npmjs.org/amazon-cognito-identity-js/-/amazon-cognito-identity-js-6.3.7.tgz", + "integrity": "sha512-tSjnM7KyAeOZ7UMah+oOZ6cW4Gf64FFcc7BE2l7MTcp7ekAPrXaCbpcW2xEpH1EiDS4cPcAouHzmCuc2tr72vQ==", + "dev": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "buffer": "4.9.2", + "fast-base64-decode": "^1.0.0", + "isomorphic-unfetch": "^3.0.0", + "js-cookie": "^2.2.1" + } + }, + "node_modules/@aws-amplify/datastore/node_modules/axios": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/@aws-amplify/datastore/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/@aws-amplify/datastore/node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/@aws-amplify/geo": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/@aws-amplify/geo/-/geo-2.3.5.tgz", @@ -179,6 +403,25 @@ "tslib": "^1.8.0" } }, + "node_modules/@aws-amplify/geo/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/interactions": { "version": "5.2.11", "resolved": "https://registry.npmjs.org/@aws-amplify/interactions/-/interactions-5.2.11.tgz", @@ -195,6 +438,25 @@ "tslib": "^1.8.0" } }, + "node_modules/@aws-amplify/interactions/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/notifications": { "version": "1.6.5", "resolved": "https://registry.npmjs.org/@aws-amplify/notifications/-/notifications-1.6.5.tgz", @@ -209,6 +471,25 @@ "uuid": "^3.2.1" } }, + "node_modules/@aws-amplify/notifications/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/predictions": { "version": "5.5.5", "resolved": "https://registry.npmjs.org/@aws-amplify/predictions/-/predictions-5.5.5.tgz", @@ -230,11 +511,31 @@ "uuid": "^3.2.1" } }, + "node_modules/@aws-amplify/predictions/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/pubsub": { "version": "5.5.5", "resolved": "https://registry.npmjs.org/@aws-amplify/pubsub/-/pubsub-5.5.5.tgz", "integrity": "sha512-hRKMDxZrYA7srdTAhLbgluqKsm8zyoP6vOcXpx75Lut9OUfEEP5AixR4D4cyqX0B/0Ji1lRl9T7aUBcMFfFvCw==", "dev": true, + "peer": true, "dependencies": { "@aws-amplify/auth": "5.6.5", "@aws-amplify/cache": "5.1.11", @@ -247,6 +548,25 @@ "zen-observable-ts": "0.8.19" } }, + "node_modules/@aws-amplify/pubsub/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/rtn-push-notification": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/@aws-amplify/rtn-push-notification/-/rtn-push-notification-1.1.7.tgz", @@ -270,6 +590,25 @@ "tslib": "^1.8.0" } }, + "node_modules/@aws-amplify/storage/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "node_modules/@aws-amplify/ui": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/@aws-amplify/ui/-/ui-5.6.0.tgz", @@ -292,13 +631,13 @@ } }, "node_modules/@aws-amplify/ui-react": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-4.6.0.tgz", - "integrity": "sha512-dbzyTaIJqAp8otbrvqH6gsyKp/IT2gZYHSB49KaMdtOf64QCGj2Q3NGHhMvXhTDB8JUCUAgTkgFaM6u9HKSoDQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-5.3.2.tgz", + "integrity": "sha512-CzLUb7acrXroDHloKhjOWZwLAjFfaj7F1L/HpxcG9x3hV6klwvaECgN8qthDeI675XtHQNx48Pfk2DRrViXL0w==", "dev": true, "dependencies": { - "@aws-amplify/ui": "5.6.0", - "@aws-amplify/ui-react-core": "2.1.19", + "@aws-amplify/ui": "5.8.1", + "@aws-amplify/ui-react-core": "2.1.33", "@radix-ui/react-accordion": "1.0.0", "@radix-ui/react-direction": "1.0.0", "@radix-ui/react-dropdown-menu": "1.0.0", @@ -308,17 +647,12 @@ "classnames": "2.3.1", "deepmerge": "4.2.2", "lodash": "4.17.21", - "mapbox-gl": "1.13.1", - "maplibre-gl": "2.1.9", - "maplibre-gl-js-amplify": "3.0.5", "qrcode": "1.5.0", "react-generate-context": "1.0.1", - "react-map-gl": "7.0.15", - "tinycolor2": "1.4.2", "tslib": "2.4.1" }, "peerDependencies": { - "aws-amplify": ">= 5.0.1", + "aws-amplify": "^5.0.1", "react": ">= 16.14.0", "react-dom": ">= 16.14.0" }, @@ -391,12 +725,109 @@ } } }, + "node_modules/@aws-amplify/ui-react-storage/node_modules/@aws-amplify/ui-react": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-4.6.0.tgz", + "integrity": "sha512-dbzyTaIJqAp8otbrvqH6gsyKp/IT2gZYHSB49KaMdtOf64QCGj2Q3NGHhMvXhTDB8JUCUAgTkgFaM6u9HKSoDQ==", + "dev": true, + "dependencies": { + "@aws-amplify/ui": "5.6.0", + "@aws-amplify/ui-react-core": "2.1.19", + "@radix-ui/react-accordion": "1.0.0", + "@radix-ui/react-direction": "1.0.0", + "@radix-ui/react-dropdown-menu": "1.0.0", + "@radix-ui/react-slider": "1.0.0", + "@radix-ui/react-tabs": "1.0.0", + "@xstate/react": "3.0.0", + "classnames": "2.3.1", + "deepmerge": "4.2.2", + "lodash": "4.17.21", + "mapbox-gl": "1.13.1", + "maplibre-gl": "2.1.9", + "maplibre-gl-js-amplify": "3.0.5", + "qrcode": "1.5.0", + "react-generate-context": "1.0.1", + "react-map-gl": "7.0.15", + "tinycolor2": "1.4.2", + "tslib": "2.4.1" + }, + "peerDependencies": { + "aws-amplify": ">= 5.0.1", + "react": ">= 16.14.0", + "react-dom": ">= 16.14.0" + }, + "peerDependenciesMeta": { + "aws-amplify": { + "optional": true + } + } + }, "node_modules/@aws-amplify/ui-react-storage/node_modules/tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", "dev": true }, + "node_modules/@aws-amplify/ui-react/node_modules/@aws-amplify/ui": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui/-/ui-5.8.1.tgz", + "integrity": "sha512-f7CYveXr3QzkWCjEcIzXe2ywoAc+j3cux7CBh/hS1X64dfleS8AhgHgnf1eJ+CQqNzEF51rZIJ8lrR62KBPAIQ==", + "dev": true, + "dependencies": { + "csstype": "^3.1.1", + "lodash": "4.17.21", + "style-dictionary": "3.7.1", + "tslib": "2.4.1" + }, + "peerDependencies": { + "aws-amplify": "^5.0.1", + "xstate": "^4.33.6" + }, + "peerDependenciesMeta": { + "xstate": { + "optional": true + } + } + }, + "node_modules/@aws-amplify/ui-react/node_modules/@aws-amplify/ui-react-core": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react-core/-/ui-react-core-2.1.33.tgz", + "integrity": "sha512-4f+8713lRy/qzFSAwVAhboVsui9qiQE5Mu3AX9AO6VlUtTdqPAY+RZWNqojZyWmLISm/Y4wHZRhvYe5/6x1Mgw==", + "dev": true, + "dependencies": { + "@aws-amplify/ui": "5.8.1", + "@xstate/react": "3.0.1", + "lodash": "4.17.21", + "xstate": "^4.33.6" + }, + "peerDependencies": { + "aws-amplify": "^5.0.1", + "react": ">= 16.14.0" + } + }, + "node_modules/@aws-amplify/ui-react/node_modules/@aws-amplify/ui-react-core/node_modules/@xstate/react": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@xstate/react/-/react-3.0.1.tgz", + "integrity": "sha512-/tq/gg92P9ke8J+yDNDBv5/PAxBvXJf2cYyGDByzgtl5wKaxKxzDT82Gj3eWlCJXkrBg4J5/V47//gRJuVH2fA==", + "dev": true, + "dependencies": { + "use-isomorphic-layout-effect": "^1.0.0", + "use-sync-external-store": "^1.0.0" + }, + "peerDependencies": { + "@xstate/fsm": "^2.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "xstate": "^4.33.0" + }, + "peerDependenciesMeta": { + "@xstate/fsm": { + "optional": true + }, + "xstate": { + "optional": true + } + } + }, "node_modules/@aws-amplify/ui-react/node_modules/tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", @@ -580,9 +1011,9 @@ "dev": true }, "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true }, "node_modules/@aws-sdk/client-comprehend": { @@ -8995,9 +9426,9 @@ } }, "node_modules/@mapbox/mapbox-gl-draw": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.1.tgz", - "integrity": "sha512-g6F49KZagF9269/IoF6vZJeail6qtoc5mVF3eVRikNT7UFnY0QASfe2y53mgE99s6GrHdpV+PZuFxaL71hkMhg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.3.tgz", + "integrity": "sha512-03qIJgyGmm0IoTZbV/cfODru9jRGogi4LcQ3maxIJDKccq1gY3ofgt2UYPkeU143ElxitZahEythNQv1NpsLhg==", "dev": true, "dependencies": { "@mapbox/geojson-area": "^0.2.2", @@ -11050,9 +11481,9 @@ "dev": true }, "node_modules/@types/geojson": { - "version": "7946.0.10", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz", - "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==", + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", "dev": true }, "node_modules/@types/istanbul-lib-coverage": { @@ -11083,15 +11514,15 @@ } }, "node_modules/@types/mapbox__point-geometry": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz", - "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==", "dev": true }, "node_modules/@types/mapbox__vector-tile": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz", - "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", "dev": true, "dependencies": { "@types/geojson": "*", @@ -11100,9 +11531,9 @@ } }, "node_modules/@types/mapbox-gl": { - "version": "2.7.10", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz", - "integrity": "sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw==", + "version": "2.7.18", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.18.tgz", + "integrity": "sha512-3Yq4v8IdigSs2oD70dRJuWY/6PoW9i6MyXOx8DvJNc6CuSXRMleVdNiFYa5E0w6tSCfL+b+cGau5Em09MIujtQ==", "dev": true, "dependencies": { "@types/geojson": "*" @@ -11138,9 +11569,9 @@ } }, "node_modules/@types/pbf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz", - "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==", "dev": true }, "node_modules/@types/sinonjs__fake-timers": { @@ -11304,6 +11735,7 @@ "resolved": "https://registry.npmjs.org/amazon-cognito-identity-js/-/amazon-cognito-identity-js-6.3.6.tgz", "integrity": "sha512-kBq+GE6OkLrxtFj3ZduIOlKBFYeOqZK3EhxbDBkv476UTvy+uwfR0tlriTq2QzNdnvlQAjBIXnXuOM7DwR1UEQ==", "dev": true, + "peer": true, "dependencies": { "@aws-crypto/sha256-js": "1.2.2", "buffer": "4.9.2", @@ -11719,6 +12151,53 @@ "tslib": "^2.0.0" } }, + "node_modules/aws-amplify/node_modules/@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, + "node_modules/aws-amplify/node_modules/@aws-amplify/core/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "peer": true + }, + "node_modules/aws-amplify/node_modules/@aws-amplify/datastore": { + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.5.tgz", + "integrity": "sha512-q+5hYvPD5Y4zAximOUQY9bokZ0L2VDmqbbCjwd7rbq0qZS4cjcaMTeRk5HqxSA+HBCn4L17bqJ3z3GHCe+JZIA==", + "dev": true, + "peer": true, + "dependencies": { + "@aws-amplify/api": "5.4.5", + "@aws-amplify/auth": "5.6.5", + "@aws-amplify/core": "5.8.5", + "@aws-amplify/pubsub": "5.5.5", + "amazon-cognito-identity-js": "6.3.6", + "buffer": "4.9.2", + "idb": "5.0.6", + "immer": "9.0.6", + "ulid": "2.3.0", + "uuid": "3.4.0", + "zen-observable-ts": "0.8.19", + "zen-push": "0.2.1" + } + }, "node_modules/aws-amplify/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -11746,6 +12225,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz", "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==", "dev": true, + "peer": true, "dependencies": { "follow-redirects": "^1.14.8" } @@ -18552,9 +19032,9 @@ "dev": true }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -20760,6 +21240,25 @@ "uuid": "^3.2.1" }, "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + }, "@aws-sdk/util-utf8-browser": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.6.1.tgz", @@ -20777,6 +21276,7 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-5.4.5.tgz", "integrity": "sha512-mZMIR3w1PiUP5S41Z1j5SL5h/aY1dConndLwC7eOE4GHoGSlFUjZdrsTTRFEH8uFAg6CJ0nj/Ww8pEL+MU5FlQ==", "dev": true, + "peer": true, "requires": { "@aws-amplify/api-graphql": "3.4.11", "@aws-amplify/api-rest": "3.5.5", @@ -20788,6 +21288,7 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-3.4.11.tgz", "integrity": "sha512-brvExeD2IRnQZbcWqFeDP5xfM1ANgtsZMGGzW75Tmw4gKCQPlYcBb/mQXTVsa7AJfIgxLrSYmhlu7drTTtyBnQ==", "dev": true, + "peer": true, "requires": { "@aws-amplify/api-rest": "3.5.5", "@aws-amplify/auth": "5.6.5", @@ -20798,6 +21299,27 @@ "tslib": "^1.8.0", "uuid": "^3.2.1", "zen-observable-ts": "0.8.19" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/api-rest": { @@ -20805,11 +21327,33 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-3.5.5.tgz", "integrity": "sha512-tGR5yLoIC0gPcI8VyAbd7dZ8GdFMz/EEU7aG0HsAsg46Oig5VTtKa8xWV8w+dWXjzr9I2/jkpZtDfRD57PqiBg==", "dev": true, + "peer": true, "requires": { "@aws-amplify/core": "5.8.5", "axios": "0.26.0", "tslib": "^1.8.0", "url": "0.11.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/auth": { @@ -20817,12 +21361,34 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-5.6.5.tgz", "integrity": "sha512-NkBbYe3kV4LXj/VBeh0/HTZCNjhs8gB1frfJ2r1ZG3j+Q3taeKV4jhZcM1SyRbFh5ZGHiVSJPVefgBPi7UXBrw==", "dev": true, + "peer": true, "requires": { "@aws-amplify/core": "5.8.5", "amazon-cognito-identity-js": "6.3.6", "buffer": "4.9.2", "tslib": "^1.8.0", "url": "0.11.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/cache": { @@ -20830,15 +21396,37 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/cache/-/cache-5.1.11.tgz", "integrity": "sha512-o8ju6RAbGOv8MXDJuLM2Fc5yl23pLfp1jdijlMjxBn+uXonV3B7YCtpJtjj3MW6RUY0xEZrz7fEfTp9Pa1Y7+Q==", "dev": true, + "peer": true, "requires": { "@aws-amplify/core": "5.8.5", "tslib": "^1.8.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", - "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "version": "5.8.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.6.tgz", + "integrity": "sha512-fDu4aduCagJb8uwQd+S0FBhuYgCgnpwfRsmO0/t01h68JR+KS3Cny0pQa7Qzk6cW/HY3rtPLELOqbdF6doA6oA==", "dev": true, "requires": { "@aws-crypto/sha256-js": "1.2.2", @@ -20854,16 +21442,16 @@ } }, "@aws-amplify/datastore": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.5.tgz", - "integrity": "sha512-q+5hYvPD5Y4zAximOUQY9bokZ0L2VDmqbbCjwd7rbq0qZS4cjcaMTeRk5HqxSA+HBCn4L17bqJ3z3GHCe+JZIA==", + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.6.tgz", + "integrity": "sha512-vuozosYTmWUgYzR9tqBaP1CyusPQG9/caDeqQkHCDogqJRHIkWG9INon/EUZQu4bR7W5/V8y1Dv2bLqUJSUWZA==", "dev": true, "requires": { - "@aws-amplify/api": "5.4.5", - "@aws-amplify/auth": "5.6.5", - "@aws-amplify/core": "5.8.5", - "@aws-amplify/pubsub": "5.5.5", - "amazon-cognito-identity-js": "6.3.6", + "@aws-amplify/api": "5.4.6", + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/core": "5.8.6", + "@aws-amplify/pubsub": "5.5.6", + "amazon-cognito-identity-js": "6.3.7", "buffer": "4.9.2", "idb": "5.0.6", "immer": "9.0.6", @@ -20871,6 +21459,129 @@ "uuid": "3.4.0", "zen-observable-ts": "0.8.19", "zen-push": "0.2.1" + }, + "dependencies": { + "@aws-amplify/api": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-5.4.6.tgz", + "integrity": "sha512-Wn9kQJ/uf0CYW1zoBueaCsoF5v3wJZpMxkpdEBYwD10GqhSt5baoghq2oW72JyDrGS8Hfq71o4a2vpXiIL/8hg==", + "dev": true, + "requires": { + "@aws-amplify/api-graphql": "3.4.12", + "@aws-amplify/api-rest": "3.5.6", + "tslib": "^1.8.0" + } + }, + "@aws-amplify/api-graphql": { + "version": "3.4.12", + "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-3.4.12.tgz", + "integrity": "sha512-lEKXl0hM7nyulCRUQNIQ6I0+DCD16hR+V4XUdMmVgnlVnPVows5H17wM/Hu24lX84G1jFi/i14umH8+qvpk1fQ==", + "dev": true, + "requires": { + "@aws-amplify/api-rest": "3.5.6", + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/cache": "5.1.12", + "@aws-amplify/core": "5.8.6", + "@aws-amplify/pubsub": "5.5.6", + "graphql": "15.8.0", + "tslib": "^1.8.0", + "uuid": "^3.2.1", + "zen-observable-ts": "0.8.19" + } + }, + "@aws-amplify/api-rest": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-3.5.6.tgz", + "integrity": "sha512-WAv7q05G2ypE59ebVMvIih5aTIi+jOTu+ApkEI/E5mNM2Lj33TnaOrM5Vt2oja0aHT37AQHvIF1gYYf6gF1iRQ==", + "dev": true, + "requires": { + "@aws-amplify/core": "5.8.6", + "axios": "1.6.0", + "tslib": "^1.8.0", + "url": "0.11.0" + } + }, + "@aws-amplify/auth": { + "version": "5.6.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-5.6.6.tgz", + "integrity": "sha512-v4qiOTW7dTObEoHPjQMl0diL+E7KKk6HrKd1O+roE9f93U1ZDbcIkeY5Yih+I/U8VbS+hQ5D9oHyFbeLZWsDcg==", + "dev": true, + "requires": { + "@aws-amplify/core": "5.8.6", + "amazon-cognito-identity-js": "6.3.7", + "buffer": "4.9.2", + "tslib": "^1.8.0", + "url": "0.11.0" + } + }, + "@aws-amplify/cache": { + "version": "5.1.12", + "resolved": "https://registry.npmjs.org/@aws-amplify/cache/-/cache-5.1.12.tgz", + "integrity": "sha512-bOhkqABOUehPCWy5x5XHMHfJtuQ7tBOGD7gAhDo6leY1O7NIHjDBto+U6FZmCE2bS8u/QcgJ94PRZ1E5/3rsng==", + "dev": true, + "requires": { + "@aws-amplify/core": "5.8.6", + "tslib": "^1.8.0" + } + }, + "@aws-amplify/pubsub": { + "version": "5.5.6", + "resolved": "https://registry.npmjs.org/@aws-amplify/pubsub/-/pubsub-5.5.6.tgz", + "integrity": "sha512-IxM2hjGwLQm2ICFKyr2jdpLVje5Z/m0wsLD0laDfF441NkGwSP1AEpds1I5ozAJ18ETsnxRS/6731H+nSdLVgQ==", + "dev": true, + "requires": { + "@aws-amplify/auth": "5.6.6", + "@aws-amplify/cache": "5.1.12", + "@aws-amplify/core": "5.8.6", + "buffer": "4.9.2", + "graphql": "15.8.0", + "tslib": "^1.8.0", + "url": "0.11.0", + "uuid": "^3.2.1", + "zen-observable-ts": "0.8.19" + } + }, + "amazon-cognito-identity-js": { + "version": "6.3.7", + "resolved": "https://registry.npmjs.org/amazon-cognito-identity-js/-/amazon-cognito-identity-js-6.3.7.tgz", + "integrity": "sha512-tSjnM7KyAeOZ7UMah+oOZ6cW4Gf64FFcc7BE2l7MTcp7ekAPrXaCbpcW2xEpH1EiDS4cPcAouHzmCuc2tr72vQ==", + "dev": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "buffer": "4.9.2", + "fast-base64-decode": "^1.0.0", + "isomorphic-unfetch": "^3.0.0", + "js-cookie": "^2.2.1" + } + }, + "axios": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "dev": true, + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "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, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + } } }, "@aws-amplify/geo": { @@ -20885,6 +21596,27 @@ "@turf/boolean-clockwise": "6.5.0", "camelcase-keys": "6.2.2", "tslib": "^1.8.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/interactions": { @@ -20901,6 +21633,27 @@ "fflate": "0.7.3", "pako": "2.0.4", "tslib": "^1.8.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/notifications": { @@ -20915,6 +21668,27 @@ "@aws-amplify/rtn-push-notification": "1.1.7", "lodash": "^4.17.21", "uuid": "^3.2.1" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/predictions": { @@ -20936,6 +21710,27 @@ "buffer": "4.9.2", "tslib": "^1.8.0", "uuid": "^3.2.1" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/pubsub": { @@ -20943,6 +21738,7 @@ "resolved": "https://registry.npmjs.org/@aws-amplify/pubsub/-/pubsub-5.5.5.tgz", "integrity": "sha512-hRKMDxZrYA7srdTAhLbgluqKsm8zyoP6vOcXpx75Lut9OUfEEP5AixR4D4cyqX0B/0Ji1lRl9T7aUBcMFfFvCw==", "dev": true, + "peer": true, "requires": { "@aws-amplify/auth": "5.6.5", "@aws-amplify/cache": "5.1.11", @@ -20953,6 +21749,27 @@ "url": "0.11.0", "uuid": "^3.2.1", "zen-observable-ts": "0.8.19" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/rtn-push-notification": { @@ -20976,6 +21793,27 @@ "events": "^3.1.0", "fast-xml-parser": "^4.2.5", "tslib": "^1.8.0" + }, + "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + } + } } }, "@aws-amplify/ui": { @@ -20999,13 +21837,13 @@ } }, "@aws-amplify/ui-react": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-4.6.0.tgz", - "integrity": "sha512-dbzyTaIJqAp8otbrvqH6gsyKp/IT2gZYHSB49KaMdtOf64QCGj2Q3NGHhMvXhTDB8JUCUAgTkgFaM6u9HKSoDQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-5.3.2.tgz", + "integrity": "sha512-CzLUb7acrXroDHloKhjOWZwLAjFfaj7F1L/HpxcG9x3hV6klwvaECgN8qthDeI675XtHQNx48Pfk2DRrViXL0w==", "dev": true, "requires": { - "@aws-amplify/ui": "5.6.0", - "@aws-amplify/ui-react-core": "2.1.19", + "@aws-amplify/ui": "5.8.1", + "@aws-amplify/ui-react-core": "2.1.33", "@radix-ui/react-accordion": "1.0.0", "@radix-ui/react-direction": "1.0.0", "@radix-ui/react-dropdown-menu": "1.0.0", @@ -21015,16 +21853,47 @@ "classnames": "2.3.1", "deepmerge": "4.2.2", "lodash": "4.17.21", - "mapbox-gl": "1.13.1", - "maplibre-gl": "2.1.9", - "maplibre-gl-js-amplify": "3.0.5", "qrcode": "1.5.0", "react-generate-context": "1.0.1", - "react-map-gl": "7.0.15", - "tinycolor2": "1.4.2", "tslib": "2.4.1" }, "dependencies": { + "@aws-amplify/ui": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui/-/ui-5.8.1.tgz", + "integrity": "sha512-f7CYveXr3QzkWCjEcIzXe2ywoAc+j3cux7CBh/hS1X64dfleS8AhgHgnf1eJ+CQqNzEF51rZIJ8lrR62KBPAIQ==", + "dev": true, + "requires": { + "csstype": "^3.1.1", + "lodash": "4.17.21", + "style-dictionary": "3.7.1", + "tslib": "2.4.1" + } + }, + "@aws-amplify/ui-react-core": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react-core/-/ui-react-core-2.1.33.tgz", + "integrity": "sha512-4f+8713lRy/qzFSAwVAhboVsui9qiQE5Mu3AX9AO6VlUtTdqPAY+RZWNqojZyWmLISm/Y4wHZRhvYe5/6x1Mgw==", + "dev": true, + "requires": { + "@aws-amplify/ui": "5.8.1", + "@xstate/react": "3.0.1", + "lodash": "4.17.21", + "xstate": "^4.33.6" + }, + "dependencies": { + "@xstate/react": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@xstate/react/-/react-3.0.1.tgz", + "integrity": "sha512-/tq/gg92P9ke8J+yDNDBv5/PAxBvXJf2cYyGDByzgtl5wKaxKxzDT82Gj3eWlCJXkrBg4J5/V47//gRJuVH2fA==", + "dev": true, + "requires": { + "use-isomorphic-layout-effect": "^1.0.0", + "use-sync-external-store": "^1.0.0" + } + } + } + }, "tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", @@ -21071,6 +21940,33 @@ "tslib": "2.4.1" }, "dependencies": { + "@aws-amplify/ui-react": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-4.6.0.tgz", + "integrity": "sha512-dbzyTaIJqAp8otbrvqH6gsyKp/IT2gZYHSB49KaMdtOf64QCGj2Q3NGHhMvXhTDB8JUCUAgTkgFaM6u9HKSoDQ==", + "dev": true, + "requires": { + "@aws-amplify/ui": "5.6.0", + "@aws-amplify/ui-react-core": "2.1.19", + "@radix-ui/react-accordion": "1.0.0", + "@radix-ui/react-direction": "1.0.0", + "@radix-ui/react-dropdown-menu": "1.0.0", + "@radix-ui/react-slider": "1.0.0", + "@radix-ui/react-tabs": "1.0.0", + "@xstate/react": "3.0.0", + "classnames": "2.3.1", + "deepmerge": "4.2.2", + "lodash": "4.17.21", + "mapbox-gl": "1.13.1", + "maplibre-gl": "2.1.9", + "maplibre-gl-js-amplify": "3.0.5", + "qrcode": "1.5.0", + "react-generate-context": "1.0.1", + "react-map-gl": "7.0.15", + "tinycolor2": "1.4.2", + "tslib": "2.4.1" + } + }, "tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", @@ -21247,9 +22143,9 @@ } }, "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true } } @@ -28224,9 +29120,9 @@ "dev": true }, "@mapbox/mapbox-gl-draw": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.1.tgz", - "integrity": "sha512-g6F49KZagF9269/IoF6vZJeail6qtoc5mVF3eVRikNT7UFnY0QASfe2y53mgE99s6GrHdpV+PZuFxaL71hkMhg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.3.tgz", + "integrity": "sha512-03qIJgyGmm0IoTZbV/cfODru9jRGogi4LcQ3maxIJDKccq1gY3ofgt2UYPkeU143ElxitZahEythNQv1NpsLhg==", "dev": true, "requires": { "@mapbox/geojson-area": "^0.2.2", @@ -29894,9 +30790,9 @@ "dev": true }, "@types/geojson": { - "version": "7946.0.10", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz", - "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==", + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", "dev": true }, "@types/istanbul-lib-coverage": { @@ -29927,15 +30823,15 @@ } }, "@types/mapbox__point-geometry": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz", - "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==", "dev": true }, "@types/mapbox__vector-tile": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz", - "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", "dev": true, "requires": { "@types/geojson": "*", @@ -29944,9 +30840,9 @@ } }, "@types/mapbox-gl": { - "version": "2.7.10", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz", - "integrity": "sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw==", + "version": "2.7.18", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.18.tgz", + "integrity": "sha512-3Yq4v8IdigSs2oD70dRJuWY/6PoW9i6MyXOx8DvJNc6CuSXRMleVdNiFYa5E0w6tSCfL+b+cGau5Em09MIujtQ==", "dev": true, "requires": { "@types/geojson": "*" @@ -29981,9 +30877,9 @@ } }, "@types/pbf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz", - "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==", "dev": true }, "@types/sinonjs__fake-timers": { @@ -30113,6 +31009,7 @@ "resolved": "https://registry.npmjs.org/amazon-cognito-identity-js/-/amazon-cognito-identity-js-6.3.6.tgz", "integrity": "sha512-kBq+GE6OkLrxtFj3ZduIOlKBFYeOqZK3EhxbDBkv476UTvy+uwfR0tlriTq2QzNdnvlQAjBIXnXuOM7DwR1UEQ==", "dev": true, + "peer": true, "requires": { "@aws-crypto/sha256-js": "1.2.2", "buffer": "4.9.2", @@ -30441,6 +31338,55 @@ "tslib": "^2.0.0" }, "dependencies": { + "@aws-amplify/core": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-5.8.5.tgz", + "integrity": "sha512-R7zB+VUyNRT/7GCfBfWOIz2vy70VbHNfhotbdyo02ZVcc4vyXt+tsdZvvMSm1SB5uQ411jiAfDmTvOzLOIaJsA==", + "dev": true, + "peer": true, + "requires": { + "@aws-crypto/sha256-js": "1.2.2", + "@aws-sdk/client-cloudwatch-logs": "3.6.1", + "@aws-sdk/types": "3.6.1", + "@aws-sdk/util-hex-encoding": "3.6.1", + "@types/node-fetch": "2.6.4", + "isomorphic-unfetch": "^3.0.0", + "react-native-url-polyfill": "^1.3.0", + "tslib": "^1.8.0", + "universal-cookie": "^4.0.4", + "zen-observable-ts": "0.8.19" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "peer": true + } + } + }, + "@aws-amplify/datastore": { + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.5.tgz", + "integrity": "sha512-q+5hYvPD5Y4zAximOUQY9bokZ0L2VDmqbbCjwd7rbq0qZS4cjcaMTeRk5HqxSA+HBCn4L17bqJ3z3GHCe+JZIA==", + "dev": true, + "peer": true, + "requires": { + "@aws-amplify/api": "5.4.5", + "@aws-amplify/auth": "5.6.5", + "@aws-amplify/core": "5.8.5", + "@aws-amplify/pubsub": "5.5.5", + "amazon-cognito-identity-js": "6.3.6", + "buffer": "4.9.2", + "idb": "5.0.6", + "immer": "9.0.6", + "ulid": "2.3.0", + "uuid": "3.4.0", + "zen-observable-ts": "0.8.19", + "zen-push": "0.2.1" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -30467,6 +31413,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz", "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==", "dev": true, + "peer": true, "requires": { "follow-redirects": "^1.14.8" } @@ -35928,9 +36875,9 @@ "dev": true }, "rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "requires": { "tslib": "^2.1.0" diff --git a/packages/test-generator/package.json b/packages/test-generator/package.json index 6c7bee45f..50d220bf4 100644 --- a/packages/test-generator/package.json +++ b/packages/test-generator/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@aws-amplify/datastore": "^4.0.0", - "@aws-amplify/ui-react": "^4.6.0", + "@aws-amplify/ui-react": "^5.0.0", "@aws-amplify/ui-react-storage": "^1.1.0", "cypress": "12.0.2", "eslint-plugin-cypress": "2.12.1", diff --git a/scripts/integ-setup.bat b/scripts/integ-setup.bat index a16ca166e..871ba1111 100644 --- a/scripts/integ-setup.bat +++ b/scripts/integ-setup.bat @@ -12,9 +12,9 @@ call npm run integ:templates :: install call lerna bootstrap -call lerna add --scope integration-test aws-amplify -call lerna add --scope integration-test @aws-amplify/ui-react -call lerna add --scope integration-test @aws-amplify/datastore +call lerna add --scope integration-test aws-amplify@^5.0.0 +call lerna add --scope integration-test @aws-amplify/ui-react@^5.0.0 +call lerna add --scope integration-test @aws-amplify/datastore@^4.0.0 call lerna add --scope integration-test @aws-amplify/codegen-ui call lerna add --scope integration-test @aws-amplify/codegen-ui-react call lerna add --scope integration-test @aws-amplify/codegen-ui-test-generator diff --git a/scripts/integ-setup.sh b/scripts/integ-setup.sh index 6e0cea0a7..6246a3f38 100755 --- a/scripts/integ-setup.sh +++ b/scripts/integ-setup.sh @@ -17,9 +17,9 @@ npm run integ:templates # install lerna bootstrap lerna add --scope integration-test typescript@4.4.4 -lerna add --scope integration-test aws-amplify -lerna add --scope integration-test @aws-amplify/ui-react -lerna add --scope integration-test @aws-amplify/datastore +lerna add --scope integration-test aws-amplify@^5.0.0 +lerna add --scope integration-test @aws-amplify/ui-react@^5.0.0 +lerna add --scope integration-test @aws-amplify/datastore@^4.0.0 lerna add --scope integration-test @aws-amplify/codegen-ui lerna add --scope integration-test @aws-amplify/codegen-ui-react lerna add --scope integration-test @aws-amplify/codegen-ui-test-generator diff --git a/scripts/integ-templates.sh b/scripts/integ-templates.sh index ea28fe729..49b0776cd 100755 --- a/scripts/integ-templates.sh +++ b/scripts/integ-templates.sh @@ -3,4 +3,4 @@ set -e lerna run build --scope @aws-amplify/codegen-ui-test-generator cp -r packages/test-generator/integration-test-templates/. packages/integration-test -node packages/test-generator/dist/generators/GenerateTestApp.js +DEPENDENCIES='{"aws-amplify": "5.0.0"}' node packages/test-generator/dist/generators/GenerateTestApp.js