From 8eaabce90b2226c208137926dea32675f9cd6718 Mon Sep 17 00:00:00 2001 From: Alexey Date: Sat, 1 Jun 2024 02:34:57 +0800 Subject: [PATCH] CB-5228 feat: fast frontend unit tests (#2677) * fix: try to fix make docker container.sh * fix: specify correct docker build scripts folder * fix: validate branch to valid docker tag name * feat: combined workflows * feat: add readable names for github actions * feat: add docker pull command comment * fix: comment publishing comment with docker instructions * feat: improve build & test performance * feat: add option to skip cache * fix: flush cache * fix: flush cache * feat: merge tests and build steps * fix: github action outputs keys * feat: add lint job * feat: change file to trigger lint * fix: omit webapp path * fix: trigger lint * fix: continue on linting errors * feat: add publishing container to github docker registry * feat: add lint status * chore: re-trigger-lint * feat: add java checkstyle * fix: java linting * fix: github token * fix: update jave checkstyle action * chore: simplify frontend lint action * chore: remove changed java files * feat: revert lint trigger frontend * feat: add docker credentials helper * fix: remove credentials warning * fix: tests and clean command * CB-5228 feat: run frontend tests for every build * fix: clean tasks * feat: update cli tools --- .github/workflows/backend-build.yml | 12 +- .github/workflows/backend-lint.yml | 40 ++ .github/workflows/common-cleanup.yml | 57 +++ .github/workflows/common.yml | 56 +++ .github/workflows/docker-build-and-push.yml | 80 +++- .github/workflows/frontend-build.yml | 42 +- .github/workflows/frontend-cache.yml | 76 ---- .github/workflows/frontend-cleanup.yaml | 29 -- .github/workflows/frontend-lint.yml | 45 +++ .github/workflows/frontend.yml | 80 ---- .vscode/tasks.json | 12 +- deploy/build-frontend.sh | 12 +- webapp/package.json | 6 +- .../packages/core-administration/package.json | 5 +- webapp/packages/core-app/package.json | 3 +- .../packages/core-authentication/package.json | 5 +- webapp/packages/core-blocks/package.json | 5 +- webapp/packages/core-bootstrap/package.json | 3 +- .../core-browser-cookies/package.json | 5 +- .../core-browser-settings/package.json | 5 +- webapp/packages/core-browser/package.json | 5 +- .../bin/typescript-resolve-references.js | 148 ++++--- .../core-cli/bin/validate-dependencies.js | 202 +--------- .../packages/core-cli/configs/babel.config.js | 31 -- .../core-cli/configs/jest.babel.config.js | 11 - .../packages/core-cli/configs/jest.config.js | 8 +- .../core-cli/configs/webpack.config.js | 13 +- webapp/packages/core-cli/package.json | 16 +- .../packages/core-cli/utils/printMessage.js | 24 ++ .../core-cli/utils/validateDependencies.js | 218 +++++++++++ .../core-client-activity/package.json | 3 +- webapp/packages/core-connections/package.json | 3 +- .../packages/core-data-context/package.json | 3 +- webapp/packages/core-di/package.json | 5 +- webapp/packages/core-dialogs/package.json | 3 +- webapp/packages/core-events/package.json | 5 +- webapp/packages/core-executor/package.json | 5 +- webapp/packages/core-extensions/package.json | 3 +- .../packages/core-localization/package.json | 5 +- .../core-navigation-tree/package.json | 5 +- .../packages/core-notifications/package.json | 3 +- webapp/packages/core-product/package.json | 3 +- webapp/packages/core-projects/package.json | 3 +- .../core-resource-manager/package.json | 3 +- webapp/packages/core-resource/package.json | 5 +- webapp/packages/core-root/package.json | 3 +- webapp/packages/core-routing/package.json | 3 +- webapp/packages/core-sdk/package.json | 4 +- .../core-server-localization/package.json | 5 +- .../core-session-localization/package.json | 5 +- .../core-settings-localization/package.json | 5 +- .../packages/core-settings-user/package.json | 5 +- webapp/packages/core-settings/package.json | 5 +- webapp/packages/core-storage/package.json | 3 +- .../packages/core-task-manager/package.json | 3 +- webapp/packages/core-theming/package.json | 5 +- webapp/packages/core-ui/package.json | 3 +- webapp/packages/core-utils/package.json | 5 +- .../packages/core-version-update/package.json | 3 +- webapp/packages/core-version/package.json | 3 +- webapp/packages/core-view/package.json | 3 +- .../plugin-administration/package.json | 3 +- .../package.json | 3 +- .../plugin-authentication/package.json | 3 +- webapp/packages/plugin-browser/package.json | 3 +- .../packages/plugin-codemirror6/package.json | 3 +- .../plugin-connection-custom/package.json | 3 +- .../plugin-connection-search/package.json | 3 +- .../plugin-connection-template/package.json | 3 +- .../package.json | 3 +- .../packages/plugin-connections/package.json | 3 +- webapp/packages/plugin-d3js/package.json | 5 +- .../packages/plugin-data-export/package.json | 5 +- .../packages/plugin-data-import/package.json | 5 +- .../plugin-data-spreadsheet-new/package.json | 5 +- .../package.json | 3 +- .../packages/plugin-data-viewer/package.json | 5 +- .../package.json | 3 +- .../package.json | 3 +- .../packages/plugin-ddl-viewer/package.json | 3 +- webapp/packages/plugin-devtools/package.json | 3 +- .../packages/plugin-gis-viewer/package.json | 3 +- webapp/packages/plugin-help/package.json | 3 +- .../packages/plugin-localization/package.json | 3 +- .../packages/plugin-log-viewer/package.json | 5 +- .../plugin-navigation-tabs/package.json | 3 +- .../package.json | 5 +- .../plugin-navigation-tree-rm/package.json | 5 +- .../plugin-navigation-tree/package.json | 5 +- .../plugin-object-viewer/package.json | 3 +- webapp/packages/plugin-product/package.json | 3 +- webapp/packages/plugin-projects/package.json | 3 +- .../plugin-react-data-grid/package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../plugin-resource-manager/package.json | 5 +- webapp/packages/plugin-root/package.json | 3 +- .../plugin-session-expiration/package.json | 3 +- .../package.json | 5 +- .../package.json | 3 +- .../plugin-settings-menu/package.json | 3 +- .../plugin-settings-panel/package.json | 5 +- .../package.json | 3 +- .../package.json | 3 +- .../plugin-sql-editor-new/package.json | 3 +- .../plugin-sql-editor-screen/package.json | 3 +- .../packages/plugin-sql-editor/package.json | 5 +- .../plugin-sql-generator/package.json | 5 +- webapp/packages/plugin-sso/package.json | 3 +- .../packages/plugin-task-manager/package.json | 3 +- webapp/packages/plugin-theme/package.json | 3 +- .../packages/plugin-tools-panel/package.json | 3 +- .../package.json | 3 +- .../packages/plugin-top-app-bar/package.json | 3 +- .../package.json | 3 +- .../plugin-user-profile-settings/package.json | 3 +- .../packages/plugin-user-profile/package.json | 3 +- .../package.json | 3 +- webapp/packages/plugin-version/package.json | 3 +- webapp/packages/product-default/package.json | 2 +- webapp/packages/tests-runner/package.json | 5 +- webapp/scripts/license-check.mjs | 3 + webapp/tsconfig.base.json | 2 +- webapp/yarn.lock | 369 ++++++------------ 124 files changed, 1039 insertions(+), 918 deletions(-) create mode 100644 .github/workflows/backend-lint.yml create mode 100644 .github/workflows/common-cleanup.yml create mode 100644 .github/workflows/common.yml delete mode 100644 .github/workflows/frontend-cache.yml delete mode 100644 .github/workflows/frontend-cleanup.yaml create mode 100644 .github/workflows/frontend-lint.yml delete mode 100644 .github/workflows/frontend.yml delete mode 100644 webapp/packages/core-cli/configs/babel.config.js delete mode 100644 webapp/packages/core-cli/configs/jest.babel.config.js create mode 100644 webapp/packages/core-cli/utils/printMessage.js create mode 100644 webapp/packages/core-cli/utils/validateDependencies.js diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml index 0a9758176b..7b1dcb97b5 100644 --- a/.github/workflows/backend-build.yml +++ b/.github/workflows/backend-build.yml @@ -1,15 +1,6 @@ name: Backend Build on: - # push: - # branches: - # - devel - # pull_request: - # branches: - # - devel - # paths-ignore: - # - "webapp/**" - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -18,6 +9,7 @@ on: jobs: build-backend: + name: Backend runs-on: ubuntu-latest steps: @@ -30,7 +22,7 @@ jobs: distribution: "temurin" java-version: "17" cache: maven - + - uses: stCarolas/setup-maven@v5 with: maven-version: 3.9.0 diff --git a/.github/workflows/backend-lint.yml b/.github/workflows/backend-lint.yml new file mode 100644 index 0000000000..8bda3def26 --- /dev/null +++ b/.github/workflows/backend-lint.yml @@ -0,0 +1,40 @@ +name: Backend Lint + +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + + # Allows you to reuse workflows by referencing their YAML files + workflow_call: + inputs: + skip_cache: + required: false + type: string + +jobs: + lint: + name: Backend + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Checkout checkstyle config repository + uses: actions/checkout@v4 + with: + repository: dbeaver/dbeaver + path: dbeaver-config + + - name: Copy checkstyle config + run: cp dbeaver-config/dbeaver-checkstyle-config.xml ./dbeaver-checkstyle-config.xml + + - name: Remove checkstyle config directory + run: rm -rf dbeaver-config + + - uses: dbelyaev/action-checkstyle@master + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-review + filter_mode: diff_context + checkstyle_config: ./dbeaver-checkstyle-config.xml + fail_on_error: true diff --git a/.github/workflows/common-cleanup.yml b/.github/workflows/common-cleanup.yml new file mode 100644 index 0000000000..8914495aee --- /dev/null +++ b/.github/workflows/common-cleanup.yml @@ -0,0 +1,57 @@ +name: Cleanup checks + +on: + pull_request: + types: [closed] + +jobs: + delete-caches: + runs-on: ubuntu-latest + steps: + - name: Cleanup + run: | + gh extension install actions/gh-actions-cache + + echo "Fetching list of cache key" + cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) + + ## Setting this to not fail the workflow while deleting cache keys. + set +e + echo "Deleting caches..." + for cacheKey in $cacheKeysForPR + do + gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm + done + echo "Done" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO: ${{ github.repository }} + BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge + + # delete-docker-image: + # name: Delete Docker Image + # if: github.event.pull_request.merged == true + # runs-on: ubuntu-latest + + # steps: + # - name: Check out the repository + # uses: actions/checkout@v4 + + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 + + # - name: Determine Docker Image Tag + # run: | + # REPO_NAME=$(basename ${{ github.repository }}) + # IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/$REPO_NAME + # BRANCH_NAME=${{ github.event.pull_request.head.ref }} + # TAG_NAME=$(echo $BRANCH_NAME | sed 's/[^a-zA-Z0-9._-]/-/g') + # echo "image=$IMAGE_NAME:$TAG_NAME" >> $GITHUB_ENV + + # - name: Log in to GitHub Container Registry + # run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + + # - name: Delete Docker Image + # run: | + # docker rmi ${{ env.image }} + # echo "Deleted image: ${{ env.image }}" diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml new file mode 100644 index 0000000000..2d1ba04acb --- /dev/null +++ b/.github/workflows/common.yml @@ -0,0 +1,56 @@ +name: Check + +on: + push: + branches: + - devel + pull_request: + branches: + - devel + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + inputs: + skip_cache: + description: "Skip cache restoration" + required: false + default: "false" + +jobs: + call-backend-build: + name: Build + uses: ./.github/workflows/backend-build.yml + + call-frontend-build: + name: Build + uses: ./.github/workflows/frontend-build.yml + with: + skip_cache: ${{ github.event.inputs.skip_cache }} + + call-frontend-lint: + name: Lint + needs: call-frontend-build + uses: ./.github/workflows/frontend-lint.yml + + call-backend-lint: + name: Lint + uses: ./.github/workflows/backend-lint.yml + + # call-frontend-tests: + # name: Frontend Unit Tests + # needs: call-frontend-build + # runs-on: ubuntu-latest + # steps: + # - name: Check if tests passed + # if: ${{ needs.call-frontend-build.outputs.test-status != 'success' }} + # run: | + # echo "Tests failed" + # exit 1 + # - name: Continue if tests passed + # if: ${{ needs.call-frontend-build.outputs.test-status == 'success' }} + # run: echo "Tests passed" + + # call-docker-build-and-push: + # name: Run + # needs: [call-backend-build, call-frontend-build] + # uses: ./.github/workflows/docker-build-and-push.yml diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index dd7a192bb7..19c7b99773 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -1,26 +1,16 @@ name: Build and Push Docker Image on: - # push: - # branches: - # - devel - # pull_request: - # branches: - # - devel - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -jobs: - call-backend-build: - uses: ./.github/workflows/backend-build.yml - - call-frontend-build: - uses: ./.github/workflows/frontend-build.yml + # Allows you to reuse workflows by referencing their YAML files + workflow_call: +jobs: build-and-push-docker: + name: Build and Push Docker Image runs-on: ubuntu-latest - needs: [call-backend-build, call-frontend-build] steps: - name: Checkout repository @@ -42,14 +32,62 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Run custom Docker build script - working-directory: ./deploy + run: ./make-docker-container.sh shell: bash - run: | - chmod +x make-docker-container.sh - ./make-docker-container.sh + working-directory: ./deploy/docker - name: Tag Docker Image run: | - IMAGE_NAME=dbeaver/cloudbeaver - TAG_NAME=${{ github.head_ref || github.ref_name }} - docker tag $IMAGE_NAME:dev $IMAGE_NAME:$TAG_NAME + REPO_NAME=$(basename ${{ github.repository }}) + IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/$REPO_NAME + BRANCH_NAME=${{ github.head_ref || github.ref_name }} + TAG_NAME=$(echo $BRANCH_NAME | sed 's/[^a-zA-Z0-9._-]/-/g') + docker tag dbeaver/cloudbeaver:dev $IMAGE_NAME:$TAG_NAME + echo "image=$IMAGE_NAME:$TAG_NAME" >> $GITHUB_ENV + + # - name: Install Docker Credential Helper + # run: | + # sudo apt-get update + # sudo apt-get install -y gnupg2 pass + # curl -fsSL https://github.com/docker/docker-credential-helpers/releases/download/v0.6.4/docker-credential-pass-v0.6.4-amd64.tar.gz -o docker-credential-pass.tar.gz + # tar xzvf docker-credential-pass.tar.gz + # sudo mv docker-credential-pass /usr/local/bin/docker-credential-pass + # sudo chmod +x /usr/local/bin/docker-credential-pass + + # - name: Configure Docker to use Credential Helper + # run: | + # mkdir -p ~/.docker + # echo '{"credsStore":"pass"}' > ~/.docker/config.json + + # - name: Initialize Password Store + # run: | + # gpg --batch --gen-key <> $GITHUB_OUTPUT - - - name: restore yarn cache - uses: actions/cache@v4 - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: restore node_modules - uses: actions/cache@v4 - with: - path: "**/node_modules" - key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node_modules- - - - name: restore typescript cache - uses: actions/cache@v4 - with: - path: "**/packages/*/dist" - key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-dist- - - - name: yarn install - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: install - - - name: yarn lerna bootstrap - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: lerna bootstrap - - - name: build - uses: borales/actions-yarn@v5 - with: - dir: webapp/packages/product-default - cmd: build # build tyescript source code - - - name: test - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: lerna run test # build packages that have test script diff --git a/.github/workflows/frontend-cleanup.yaml b/.github/workflows/frontend-cleanup.yaml deleted file mode 100644 index 2cb13f6613..0000000000 --- a/.github/workflows/frontend-cleanup.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: cleanup caches by a branch -on: - pull_request: - types: - - closed - -jobs: - cleanup: - runs-on: ubuntu-latest - steps: - - name: Cleanup - run: | - gh extension install actions/gh-actions-cache - - echo "Fetching list of cache key" - cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) - - ## Setting this to not fail the workflow while deleting cache keys. - set +e - echo "Deleting caches..." - for cacheKey in $cacheKeysForPR - do - gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm - done - echo "Done" - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REPO: ${{ github.repository }} - BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/frontend-lint.yml b/.github/workflows/frontend-lint.yml new file mode 100644 index 0000000000..3f22b3df53 --- /dev/null +++ b/.github/workflows/frontend-lint.yml @@ -0,0 +1,45 @@ +name: Frontend Lint + +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + + # Allows you to reuse workflows by referencing their YAML files + workflow_call: + +jobs: + lint: + name: Frontend + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: "20" + cache: yarn + cache-dependency-path: webapp/yarn.lock + + - name: restore node_modules + uses: actions/cache@v4 + with: + path: "**/node_modules" + key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-node_modules- + + - name: yarn install --frozen-lockfile + uses: borales/actions-yarn@v5 + with: + dir: webapp + cmd: install + + - name: Lint + uses: reviewdog/action-eslint@v1 + with: + reporter: github-pr-review + filter_mode: file + workdir: webapp + fail_on_error: true + eslint_flags: "--ext .ts,.tsx" diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml deleted file mode 100644 index 68a196695a..0000000000 --- a/.github/workflows/frontend.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: frontend - -on: - # Triggers the workflow on push or pull request events but only for the "devel" branch - pull_request: - branches: ["devel"] - paths: - - "webapp/**" # monitor for the frontend changes - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - # Allows you to reuse workflows by referencing their YAML files - workflow_call: - -jobs: - build_and_test: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ./webapp - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - with: - node-version: "20" - - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - name: restore yarn cache - uses: actions/cache@v4 - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: restore node_modules - uses: actions/cache@v4 - with: - path: "**/node_modules" - key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node_modules- - - - name: restore typescript cache - uses: actions/cache@v4 - with: - path: "**/packages/*/dist" - key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-dist- - - - name: yarn install - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: install - - - name: yarn lerna bootstrap - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: lerna bootstrap - - - name: build - uses: borales/actions-yarn@v5 - with: - dir: webapp/packages/product-default - cmd: bundle - - - name: test - uses: borales/actions-yarn@v5 - with: - dir: webapp - cmd: lerna run test diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0f7b1f4d53..e9425ad16c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -17,7 +17,7 @@ "type": "shell", "command": "yarn", "group": "test", - "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"] + "args": ["test"] }, { "label": "Run DevServer CE", @@ -106,7 +106,15 @@ { "label": "Update TS references CE", "type": "shell", - "command": "yarn lerna run update-ts-references --stream", + "command": "yarn run update-ts-references", + "options": { + "cwd": "${workspaceFolder}/webapp" + } + }, + { + "label": "Clean CE", + "type": "shell", + "command": "yarn clean", "options": { "cwd": "${workspaceFolder}/webapp" } diff --git a/deploy/build-frontend.sh b/deploy/build-frontend.sh index 19a7c3a216..da359f27d3 100755 --- a/deploy/build-frontend.sh +++ b/deploy/build-frontend.sh @@ -6,12 +6,20 @@ echo "Build static content" cd ../../cloudbeaver/webapp yarn -yarn lerna run bootstrap -yarn lerna run bundle --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map +cd ./packages/product-default +yarn run bundle + if [[ "$?" -ne 0 ]] ; then echo 'Application build failed'; exit $rc fi +cd ../../ +yarn test + +if [[ "$?" -ne 0 ]] ; then + echo 'Frontend tests failed'; exit $rc +fi + cd ../deploy echo "Copy static content" diff --git a/webapp/package.json b/webapp/package.json index ec515034be..c9e1c1ec96 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -19,8 +19,12 @@ "mobx-react-lite": "^4.0.5" }, "scripts": { + "test": "core-cli-test", + "clean": "rimraf --glob packages/*/dist", + "lint": "eslint --ext .ts,.tsx", + "validate-dependencies": "core-cli-validate-dependencies './packages/*/'", + "update-ts-references": "yarn run clean && typescript-resolve-references './packages/*/'", "prebuild": "lerna run gql:gen --stream --parallel", - "pretest": "lerna run gql:gen --stream --parallel && yarn lerna run test --scope @cloudbeaver/tests-runner", "prepare": "cd .. && husky ./webapp/.husky", "postinstall": "husky" }, diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json index b485188e9d..18d3a775bf 100644 --- a/webapp/packages/core-administration/package.json +++ b/webapp/packages/core-administration/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-data-context": "~0.1.0", diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json index 92913f7fcf..24ff55278e 100644 --- a/webapp/packages/core-app/package.json +++ b/webapp/packages/core-app/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json index f3c2711625..5ef2334959 100644 --- a/webapp/packages/core-authentication/package.json +++ b/webapp/packages/core-authentication/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-data-context": "~0.1.0", diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index 1bceac9b9e..b7c1389d92 100644 --- a/webapp/packages/core-blocks/package.json +++ b/webapp/packages/core-blocks/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json index 132356dae4..6c7e81176c 100644 --- a/webapp/packages/core-bootstrap/package.json +++ b/webapp/packages/core-bootstrap/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/core-browser-cookies/package.json b/webapp/packages/core-browser-cookies/package.json index 251053e6bc..074c52340d 100644 --- a/webapp/packages/core-browser-cookies/package.json +++ b/webapp/packages/core-browser-cookies/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-browser-settings": "~0.1.0", diff --git a/webapp/packages/core-browser-settings/package.json b/webapp/packages/core-browser-settings/package.json index 32b9d59ac2..cfe1930be4 100644 --- a/webapp/packages/core-browser-settings/package.json +++ b/webapp/packages/core-browser-settings/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-browser/package.json b/webapp/packages/core-browser/package.json index ac9229eec9..12d8a00e26 100644 --- a/webapp/packages/core-browser/package.json +++ b/webapp/packages/core-browser/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-cli/bin/typescript-resolve-references.js b/webapp/packages/core-cli/bin/typescript-resolve-references.js index fdbff046ec..830c47d793 100755 --- a/webapp/packages/core-cli/bin/typescript-resolve-references.js +++ b/webapp/packages/core-cli/bin/typescript-resolve-references.js @@ -1,76 +1,122 @@ #!/usr/bin/env node - +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ 'use strict'; -require('./validate-dependencies'); process.title = 'typescript-resolve-references'; +const filter = process.argv[2] || '.'; + +const { validateDependencies } = require('../utils/validateDependencies'); +const { printMessage } = require('../utils/printMessage'); +const glob = require('glob'); const fs = require('fs'); const { resolve, join } = require('path'); const upath = require('upath'); const { getCloudBeaverDeps } = require('../utils/getCloudBeaverDeps'); -const tsConfigPath = resolve('tsconfig.json'); -// const tsRootPath = resolve('../../'); -// const tsRootConfigPath = resolve(join(tsRootPath, 'tsconfig.json')); -const pkg = require(resolve('package.json')); -const typescriptConfig = require(tsConfigPath); -// const typescriptRootConfig = require(tsRootConfigPath); - -const allDependencies = getCloudBeaverDeps(pkg); -const dependencies = [...allDependencies.dependencies, ...allDependencies.devDependencies, ...allDependencies.peerDependencies]; const currentDir = resolve(); +const sourceFilesIterator = glob.globIterateSync(filter, { cwd: currentDir }); -const nodeModules = [resolve('node_modules')]; +for (let currentPackageDir of sourceFilesIterator) { + currentPackageDir = resolve(currentPackageDir); + const packageJsonPath = join(currentPackageDir, 'package.json'); + const tsConfigPath = join(currentPackageDir, 'tsconfig.json'); -typescriptConfig.references = []; -// typescriptRootConfig.references = typescriptRootConfig.references || []; - -for (const dependency of dependencies) { - if (dependency === pkg.name) { - console.error(`Self reference detected: ${dependency}`); + if (!fs.existsSync(packageJsonPath) || !fs.existsSync(tsConfigPath)) { continue; } - try { - if (!dependency.startsWith('@cloudbeaver')) { + + const pkg = require(packageJsonPath); + console.info(`Processing ${pkg['name']}`); + validateDependencies(currentPackageDir); + + let isNeedToReplace = true; + + function log(type, message, ...args) { + let color = '\x1b[34m%s\x1b[0m'; + if (type === 'warn') { + color = '\x1b[33m%s\x1b[0m'; + } else if (type === 'error') { + color = '\x1b[31m%s\x1b[0m'; + } else if (type === 'success') { + color = '\x1b[32m%s\x1b[0m'; + } + + printMessage(color, isNeedToReplace, message, ...args); + if (isNeedToReplace) { + printMessage('', false); + isNeedToReplace = false; + } + } + + printMessage('Resolving typescript project references', true); + + // const tsRootPath = resolve('../../'); + // const tsRootConfigPath = resolve(join(tsRootPath, 'tsconfig.json')); + const typescriptConfig = require(tsConfigPath); + // const typescriptRootConfig = require(tsRootConfigPath); + + const allDependencies = getCloudBeaverDeps(pkg); + const dependencies = [...allDependencies.dependencies, ...allDependencies.devDependencies, ...allDependencies.peerDependencies]; + + const nodeModules = [join(currentPackageDir, 'node_modules')]; + + typescriptConfig.references = []; + // typescriptRootConfig.references = typescriptRootConfig.references || []; + + for (const dependency of dependencies) { + if (dependency === pkg.name) { + log('error', `Self reference detected: ${dependency}`); continue; } - const dependencyPath = resolve(require.resolve(join(dependency, 'src', 'index.ts'), { paths: nodeModules }), '../../tsconfig.json'); - typescriptConfig.references.push({ - path: upath.relative(currentDir, dependencyPath), - }); - - // const relativePath = relative(tsRootPath, dependencyPath); - - // if (!typescriptRootConfig.references.find(ref => ref.path === relativePath)) { - // typescriptRootConfig.references.push({ - // path: relativePath, - // }); - // } - } catch (e) { - console.error(`Failed to resolve ${dependency}`); + try { + if (!dependency.startsWith('@cloudbeaver')) { + continue; + } + const dependencyPath = join(require.resolve(join(dependency, 'src', 'index.ts'), { paths: nodeModules }), '../../tsconfig.json'); + typescriptConfig.references.push({ + path: upath.relative(currentPackageDir, dependencyPath), + }); + + // const relativePath = relative(tsRootPath, dependencyPath); + + // if (!typescriptRootConfig.references.find(ref => ref.path === relativePath)) { + // typescriptRootConfig.references.push({ + // path: relativePath, + // }); + // } + } catch (e) { + log('error', `Failed to resolve ${dependency}`); + } } -} -typescriptConfig.references = [...new Set(typescriptConfig.references)]; -typescriptConfig.references.sort((a, b) => a.path.localeCompare(b.path)); + typescriptConfig.references = [...new Set(typescriptConfig.references)]; + typescriptConfig.references.sort((a, b) => a.path.localeCompare(b.path)); -typescriptConfig.compilerOptions = { - rootDir: 'src', - outDir: 'dist', - tsBuildInfoFile: 'dist/tsconfig.tsbuildinfo', -}; + typescriptConfig.compilerOptions = { + rootDir: 'src', + outDir: 'dist', + tsBuildInfoFile: 'dist/tsconfig.tsbuildinfo', + }; -typescriptConfig.include = ['__custom_mocks__/**/*', 'src/**/*', 'src/**/*.json', 'src/**/*.css', 'src/**/*.scss']; + typescriptConfig.include = ['__custom_mocks__/**/*', 'src/**/*', 'src/**/*.json', 'src/**/*.css', 'src/**/*.scss']; -typescriptConfig.exclude = typescriptConfig.exclude || []; + typescriptConfig.exclude = typescriptConfig.exclude || []; -const defaultExclude = ['lib/**/*', 'dist/**/*', '**/node_modules']; + const defaultExclude = ['lib/**/*', 'dist/**/*', '**/node_modules']; -for (const exclude of defaultExclude) { - if (!typescriptConfig.exclude.includes(exclude)) { - typescriptConfig.exclude.push(exclude); + for (const exclude of defaultExclude) { + if (!typescriptConfig.exclude.includes(exclude)) { + typescriptConfig.exclude.push(exclude); + } } -} -fs.writeFileSync(tsConfigPath, JSON.stringify(typescriptConfig, undefined, 2) + '\n', 'utf8'); -// fs.writeFileSync(tsRootConfigPath, JSON.stringify(typescriptRootConfig, undefined, 2), 'utf8'); + fs.writeFileSync(tsConfigPath, JSON.stringify(typescriptConfig, undefined, 2) + '\n', 'utf8'); + // fs.writeFileSync(tsRootConfigPath, JSON.stringify(typescriptRootConfig, undefined, 2), 'utf8'); + log('success', 'Typescript project references resolved'); +} diff --git a/webapp/packages/core-cli/bin/validate-dependencies.js b/webapp/packages/core-cli/bin/validate-dependencies.js index bc68c847ae..254ef6c3f2 100755 --- a/webapp/packages/core-cli/bin/validate-dependencies.js +++ b/webapp/packages/core-cli/bin/validate-dependencies.js @@ -1,193 +1,27 @@ #!/usr/bin/env node +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ /* eslint-disable @typescript-eslint/no-var-requires */ - 'use strict'; process.title = 'core-filter-deps'; -const glob = require('glob'); -const fs = require('fs'); -const path = require('path'); - -// Resolve current root -const currentPackageRoot = path.resolve('.'); - -// Replace with the correct path to the `package.json` file -const currentPackagePath = path.join(currentPackageRoot, 'package.json'); - -// Replace with the correct path to the `src` directory -const currentPackageSrcPath = path.join(currentPackageRoot, 'src'); - -// Read the contents of the `package.json` file -const currentPackage = JSON.parse(fs.readFileSync(currentPackagePath, 'utf8')); - -// Keep track of the dependencies that were found in the source files -const dependencies = new Set(); -const devDependencies = new Set(); -let isSuccess = true; - -const sourceFilesIterator = glob.globIterateSync('**/*.{ts,tsx,scss,css}', { cwd: currentPackageSrcPath }); -const importRegex = /(import|export) ((type |)([\w,\s*]*?)(\{[\w\s\n,]*?\}|) from |)['"]((@[\w-]*\/[\w-]*)|([^\\.].*?))(\/.*)*['"]/g; -const testFileRegex = /((__custom_mocks__|__tests__).*|\.test)\.tsx?$/i; -const tsFileRegex = /\.ts$/i; -const tsxFileRegex = /\.tsx$/i; -const styleFileRegex = /\.s?css$/i; -const cssModuleFileRegex = /\.(m|module)\.s?css$/i; - -for (const file of sourceFilesIterator) { - const isCSSModuleFileRegex = cssModuleFileRegex.test(file); - const isTSFileRegex = tsFileRegex.test(file); - const isStyleFileRegex = styleFileRegex.test(file); - const isTSXFileRegex = tsxFileRegex.test(file); - const isTestFile = testFileRegex.test(file); - - if (isTSFileRegex) { - devDependencies.add('typescript'); - } - - if (isCSSModuleFileRegex) { - devDependencies.add('typescript-plugin-css-modules'); - } - - if (isTestFile) { - devDependencies.add('@types/jest'); - } - - if (isTSXFileRegex) { - if (isTestFile) { - devDependencies.add('react'); - } else { - dependencies.add('react'); - } - devDependencies.add('@types/react'); - } - - const fileContent = fs.readFileSync(path.join(currentPackageSrcPath, file), 'utf8'); - const matches = fileContent.matchAll(importRegex); - for (const match of matches) { - const dep = match[6]; - - if (isStyleFileRegex || isTestFile) { - devDependencies.add(dep); - continue; - } - - dependencies.add(dep); - } -} - -currentPackage.sideEffects = currentPackage.sideEffects || []; - -const sideEffects = ['src/**/*.css', 'src/**/*.scss', 'public/**/*']; - -for (const sideEffect of sideEffects) { - if (!currentPackage.sideEffects.includes(sideEffect)) { - currentPackage.sideEffects.push(sideEffect); - } -} - -console.log('Analyzing dependencies...'); +const filter = process.argv[2] || '.'; -const newDependencies = [...dependencies].sort(sortDependencies); -const newAllDependencies = [...newDependencies, ...devDependencies].sort(sortDependencies); - -logUnmetAndExtraDependencies('dependencies', newDependencies, currentPackage.dependencies, newAllDependencies); - -currentPackage.dependencies = sortObjectKeys( - newDependencies.reduce( - (acc, dep) => ({ - ...acc, - [dep]: getVersion(dep, acc?.[dep]), - }), - currentPackage.dependencies, - ), -); - -const newDevDependencies = [...devDependencies].sort(sortDependencies); - -logUnmetAndExtraDependencies('dev dependencies', newDevDependencies, currentPackage.devDependencies, newAllDependencies); - -currentPackage.devDependencies = sortObjectKeys( - [...devDependencies].sort(sortDependencies).reduce( - (acc, dep) => ({ - ...acc, - [dep]: getVersion(dep, acc?.[dep]), - }), - currentPackage.devDependencies, - ), -); - -if (isSuccess) { - console.log('All dependencies are valid'); -} - -// Write the updated `package.json` -fs.writeFileSync(currentPackagePath, JSON.stringify(currentPackage, null, 2) + '\n', 'utf8'); - -function getVersion(dependency, current) { - if (dependency.startsWith('@cloudbeaver')) { - return '~0.1.0'; - } - - if (current) { - return current; - } - - try { - if (fs.existsSync(path.join(require.resolve(dependency), 'package.json')) === false) { - console.error(`Dependency ${dependency} not found`); - return '*'; - } - } catch { - try { - if (fs.existsSync(path.join('@types', require.resolve(dependency), 'package.json')) === false) { - console.error(`Dependency ${dependency} not found`); - return '*'; - } else { - return '^' + require(path.join('@types', require.resolve(dependency), 'package.json')).version; - } - } catch { - console.error(`Dependency ${dependency} not found`); - return '*'; - } - } - - return '^' + require(path.join(dependency, 'package.json')).version; -} - -function sortDependencies(a, b) { - return a.localeCompare(b); -} - -function logUnmetAndExtraDependencies(key, newDependencies, current, allDependencies = []) { - const unmetDependencies = newDependencies.filter(dep => !current?.[dep]); - const extraDependencies = Object.keys(current || {}).filter(dep => { - if (newDependencies.includes(dep)) { - return false; - } - - if (dep.startsWith('@types/') && allDependencies.includes(dep.replace('@types/', ''))) { - return false; - } - - return true; - }); - - if (unmetDependencies.length > 0) { - console.warn('\x1b[90m%s\x1b[0m', `Unmet ${key} found:`, unmetDependencies); - isSuccess = false; - } +const glob = require('glob'); +const { resolve, join } = require('path'); +const { validateDependencies } = require('../utils/validateDependencies'); - if (extraDependencies.length > 0) { - console.warn('\x1b[31m%s\x1b[0m', `Extra ${key} found:`, extraDependencies); - isSuccess = false; - } -} +const currentDir = resolve(); +const sourceFilesIterator = glob.globIterateSync(filter, { cwd: currentDir }); -function sortObjectKeys(object) { - return Object.keys(object) - .sort() - .reduce((obj, key) => { - obj[key] = object[key]; - return obj; - }, {}); +for (let currentPackageDir of sourceFilesIterator) { + currentPackageDir = resolve(currentPackageDir); + const pkg = require(join(currentPackageDir, 'package.json')); + console.info(`Processing ${pkg['name']}`); + validateDependencies(currentPackageDir); } diff --git a/webapp/packages/core-cli/configs/babel.config.js b/webapp/packages/core-cli/configs/babel.config.js deleted file mode 100644 index 592599c689..0000000000 --- a/webapp/packages/core-cli/configs/babel.config.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others - * - * Licensed under the Apache License, Version 2.0. - * you may not use this file except in compliance with the License. - */ - -module.exports = api => { - const devMode = !api.env('production'); - api.cache.never(); - - return { - compact: !devMode, - retainLines: devMode, - assumptions: { - setPublicClassFields: true, // defines properties in extending classes via Object.defineProperty - setSpreadProperties: true, - }, - presets: [ - [ - '@babel/preset-react', - { - development: devMode, - runtime: 'automatic', - }, - ], - ], - plugins: [devMode && require.resolve('react-refresh/babel')].filter(Boolean), - }; -}; diff --git a/webapp/packages/core-cli/configs/jest.babel.config.js b/webapp/packages/core-cli/configs/jest.babel.config.js deleted file mode 100644 index cad3ce7515..0000000000 --- a/webapp/packages/core-cli/configs/jest.babel.config.js +++ /dev/null @@ -1,11 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others - * - * Licensed under the Apache License, Version 2.0. - * you may not use this file except in compliance with the License. - */ -module.exports = { - presets: ['@babel/preset-env', ['@babel/preset-react', { runtime: 'automatic' }]], - plugins: [], -}; diff --git a/webapp/packages/core-cli/configs/jest.config.js b/webapp/packages/core-cli/configs/jest.config.js index 8cb5d8353f..afa6f9c079 100644 --- a/webapp/packages/core-cli/configs/jest.config.js +++ b/webapp/packages/core-cli/configs/jest.config.js @@ -11,9 +11,9 @@ const path = require('path'); /** @type {import('ts-jest').JestConfigWithTsJest} */ module.exports = { testEnvironment: require.resolve('../tests/test.environment.js'), - rootDir: path.resolve('./dist'), + rootDir: path.resolve('./'), moduleFileExtensions: ['js', 'jsx', 'json'], - testMatch: ['**/?(*.)+(spec|test).js?(x)'], + testMatch: ['/(packages/*/|)dist/?(*.)+(spec|test).js?(x)'], transformIgnorePatterns: [ '\\.pnp\\.[^\\/]+$', 'node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)', @@ -25,11 +25,11 @@ module.exports = { '\\.(css|scss|less)$': require.resolve('./__mocks__/styleMock.js'), '^dexie$': require.resolve('dexie'), }, - passWithNoTests: true, + // passWithNoTests: true, setupFiles: [require.resolve('fake-indexeddb/auto'), require.resolve('../tests/setup.js')], setupFilesAfterEnv: ['@testing-library/jest-dom'], transform: { - '\\.jsx?$': ['babel-jest', { configFile: require.resolve('./jest.babel.config.js') }], + '\\.jsx?$': [require.resolve('@swc/jest')], }, testEnvironmentOptions: { // This will force JSDOM to use the default export condition when importing msw/node, resulting in correct imports. diff --git a/webapp/packages/core-cli/configs/webpack.config.js b/webapp/packages/core-cli/configs/webpack.config.js index c9d0e997bf..ad1595a600 100644 --- a/webapp/packages/core-cli/configs/webpack.config.js +++ b/webapp/packages/core-cli/configs/webpack.config.js @@ -119,15 +119,6 @@ module.exports = (env, argv) => { ]; } - var babelLoader = { - loader: require.resolve('babel-loader'), - options: { - root: __dirname, - // cacheDirectory: true, - envName: argv.mode, - }, - }; - let entry = {}; if (devMode) { @@ -295,10 +286,10 @@ module.exports = (env, argv) => { exclude: /node_modules/, use: ['source-map-loader'], }, - { + devMode && { test: /\.jsx?$/, exclude: /node_modules/, - use: ['thread-loader', babelLoader], + use: ['thread-loader', 'swc-loader'], }, { test: /\.(css|s[ac]ss)$/, diff --git a/webapp/packages/core-cli/package.json b/webapp/packages/core-cli/package.json index 52619d39de..e54abd883a 100644 --- a/webapp/packages/core-cli/package.json +++ b/webapp/packages/core-cli/package.json @@ -25,18 +25,6 @@ "node": ">=20.0.0" }, "dependencies": { - "@babel/cli": "^7.23.9", - "@babel/core": "^7.24.0", - "@babel/plugin-proposal-decorators": "^7.24.0", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", - "@babel/plugin-transform-optional-chaining": "^7.23.4", - "@babel/plugin-transform-runtime": "^7.24.0", - "@babel/preset-env": "^7.24.0", - "@babel/preset-react": "^7.23.3", - "@babel/preset-typescript": "^7.23.3", - "babel-loader": "^9.1.3", - "babel-plugin-module-resolver": "^5.0.0", - "babel-plugin-transform-typescript-metadata": "^0.3.2", "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "css-minimizer-webpack-plugin": "^7.0.0", @@ -67,10 +55,11 @@ }, "devDependencies": { "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", + "@swc/core": "^1.5.24", + "@swc/jest": "^0", "@types/jest": "^29.5.12", "@types/madge": "^5.0.3", "allure-commandline": "^2.27.0", - "babel-jest": "^29.7.0", "fake-indexeddb": "^5.0.2", "glob": "^10.3.10", "http-proxy": "^1.18.1", @@ -80,6 +69,7 @@ "jest-jasmine2": "^29.7.0", "madge": "^6.1.0", "react-refresh": "^0.14.0", + "swc-loader": "^0.2.6", "tsconfig-paths-webpack-plugin": "^4.1.0", "upath": "^2.0.1", "workbox-webpack-plugin": "^7.0.0" diff --git a/webapp/packages/core-cli/utils/printMessage.js b/webapp/packages/core-cli/utils/printMessage.js new file mode 100644 index 0000000000..0df28545ae --- /dev/null +++ b/webapp/packages/core-cli/utils/printMessage.js @@ -0,0 +1,24 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ +const util = require('util'); + +function printMessage(message, replace, ...args) { + const formattedMessage = util.format(message, ...args); + + if (replace) { + process.stdout.clearLine(); + process.stdout.cursorTo(0); + process.stdout.write(formattedMessage); + } else { + process.stdout.write(formattedMessage + '\n'); + } +} + +module.exports = { + printMessage, +}; diff --git a/webapp/packages/core-cli/utils/validateDependencies.js b/webapp/packages/core-cli/utils/validateDependencies.js new file mode 100644 index 0000000000..a4bdcbcfc3 --- /dev/null +++ b/webapp/packages/core-cli/utils/validateDependencies.js @@ -0,0 +1,218 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ +const glob = require('glob'); +const fs = require('fs'); +const path = require('path'); +const { printMessage } = require('./printMessage'); + +function validateDependencies(currentPackageRoot) { + const currentPackagePath = path.join(currentPackageRoot, 'package.json'); + const currentPackageSrcPath = path.join(currentPackageRoot, 'src'); + const currentPackage = JSON.parse(fs.readFileSync(currentPackagePath, 'utf8')); + + const dependencies = new Set(); + const devDependencies = new Set(); + let isSuccess = true; + + const sourceFilesIterator = glob.globIterateSync('**/*.{ts,tsx,scss,css}', { cwd: currentPackageSrcPath }); + const importRegex = /(import|export) ((type |)([\w,\s*]*?)(\{[\w\s\n,]*?\}|) from |)['"]((@[\w-]*\/[\w-]*)|([^\\.].*?))(\/.*)*['"]/g; + const testFileRegex = /((__custom_mocks__|__tests__).*|\.test)\.tsx?$/i; + const tsFileRegex = /\.ts$/i; + const tsxFileRegex = /\.tsx$/i; + const styleFileRegex = /\.s?css$/i; + const cssModuleFileRegex = /\.(m|module)\.s?css$/i; + + for (const file of sourceFilesIterator) { + const isCSSModuleFileRegex = cssModuleFileRegex.test(file); + const isTSFileRegex = tsFileRegex.test(file); + const isStyleFileRegex = styleFileRegex.test(file); + const isTSXFileRegex = tsxFileRegex.test(file); + const isTestFile = testFileRegex.test(file); + + if (isTSFileRegex) { + devDependencies.add('typescript'); + } + + if (isCSSModuleFileRegex) { + devDependencies.add('typescript-plugin-css-modules'); + } + + if (isTestFile) { + devDependencies.add('@types/jest'); + } + + if (isTSXFileRegex) { + if (isTestFile) { + devDependencies.add('react'); + } else { + dependencies.add('react'); + } + devDependencies.add('@types/react'); + } + + const fileContent = fs.readFileSync(path.join(currentPackageSrcPath, file), 'utf8'); + const matches = fileContent.matchAll(importRegex); + for (const match of matches) { + const dep = match[6]; + + if (isStyleFileRegex || isTestFile) { + devDependencies.add(dep); + continue; + } + + dependencies.add(dep); + } + } + + currentPackage.sideEffects = currentPackage.sideEffects || []; + + const sideEffects = ['src/**/*.css', 'src/**/*.scss', 'public/**/*']; + + for (const sideEffect of sideEffects) { + if (!currentPackage.sideEffects.includes(sideEffect)) { + currentPackage.sideEffects.push(sideEffect); + } + } + + printMessage('Analyzing dependencies...', true); + let isNeedToReplace = true; + let isPackageJsonPathPrinted = false; + + function log(type, message, ...args) { + if (type !== 'success' && !isPackageJsonPathPrinted) { + isPackageJsonPathPrinted = true; + log('info', 'Package: ' + currentPackagePath); + } + + let color = '\x1b[34m%s\x1b[0m'; + if (type === 'warn') { + color = '\x1b[33m%s\x1b[0m'; + } else if (type === 'error') { + color = '\x1b[31m%s\x1b[0m'; + } else if (type === 'success') { + color = '\x1b[32m%s\x1b[0m'; + } + + printMessage(color, isNeedToReplace, message, ...args); + if (isNeedToReplace) { + printMessage('', false); + isNeedToReplace = false; + } + } + + const newDependencies = [...dependencies].sort(sortDependencies); + const newAllDependencies = [...newDependencies, ...devDependencies].sort(sortDependencies); + + logUnmetAndExtraDependencies('dependencies', newDependencies, currentPackage.dependencies, newAllDependencies); + + currentPackage.dependencies = sortObjectKeys( + newDependencies.reduce( + (acc, dep) => ({ + ...acc, + [dep]: getVersion(dep, acc?.[dep]), + }), + currentPackage.dependencies, + ), + ); + + const newDevDependencies = [...devDependencies].sort(sortDependencies); + + logUnmetAndExtraDependencies('dev dependencies', newDevDependencies, currentPackage.devDependencies, newAllDependencies); + + currentPackage.devDependencies = sortObjectKeys( + [...devDependencies].sort(sortDependencies).reduce( + (acc, dep) => ({ + ...acc, + [dep]: getVersion(dep, acc?.[dep]), + }), + currentPackage.devDependencies, + ), + ); + + if (isSuccess) { + log('success', 'All dependencies are valid'); + } + + // Write the updated `package.json` + fs.writeFileSync(currentPackagePath, JSON.stringify(currentPackage, null, 2) + '\n', 'utf8'); + + function getVersion(dependency, current) { + if (dependency.startsWith('@cloudbeaver')) { + return '~0.1.0'; + } + + if (current) { + return current; + } + + try { + if (fs.existsSync(path.join(require.resolve(dependency), 'package.json')) === false) { + log('error', `Dependency ${dependency} not found`); + return '*'; + } + } catch { + try { + if (fs.existsSync(path.join('@types', require.resolve(dependency), 'package.json')) === false) { + log('error', `Dependency ${dependency} not found`); + return '*'; + } else { + return '^' + require(path.join('@types', require.resolve(dependency), 'package.json')).version; + } + } catch { + log('error', `Dependency ${dependency} not found`); + return '*'; + } + } + + return '^' + require(path.join(dependency, 'package.json')).version; + } + + function sortDependencies(a, b) { + return a.localeCompare(b); + } + + function logUnmetAndExtraDependencies(key, newDependencies, current, allDependencies = []) { + const unmetDependencies = newDependencies.filter(dep => !current?.[dep]); + const extraDependencies = Object.keys(current || {}).filter(dep => { + if (newDependencies.includes(dep)) { + return false; + } + + if (dep.startsWith('@types/') && allDependencies.includes(dep.replace('@types/', ''))) { + return false; + } + + return true; + }); + + if (unmetDependencies.length > 0) { + log('warn', `Unmet ${key} added:`, unmetDependencies); + isSuccess = false; + } + + if (extraDependencies.length > 0) { + log('error', `Extra ${key} found:`, extraDependencies); + isSuccess = false; + } + } + + function sortObjectKeys(object) { + return Object.keys(object) + .sort() + .reduce((obj, key) => { + obj[key] = object[key]; + return obj; + }, {}); + } + + return isSuccess; +} + +module.exports = { + validateDependencies, +}; diff --git a/webapp/packages/core-client-activity/package.json b/webapp/packages/core-client-activity/package.json index ad4f9b7273..e08d592e7d 100644 --- a/webapp/packages/core-client-activity/package.json +++ b/webapp/packages/core-client-activity/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-connections/package.json b/webapp/packages/core-connections/package.json index e24cb673e1..45c3b225f5 100644 --- a/webapp/packages/core-connections/package.json +++ b/webapp/packages/core-connections/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-data-context/package.json b/webapp/packages/core-data-context/package.json index 7502604c96..b396201c3f 100644 --- a/webapp/packages/core-data-context/package.json +++ b/webapp/packages/core-data-context/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-di/package.json b/webapp/packages/core-di/package.json index 6a4e778c58..dea8f9bc6c 100644 --- a/webapp/packages/core-di/package.json +++ b/webapp/packages/core-di/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-executor": "~0.1.0", diff --git a/webapp/packages/core-dialogs/package.json b/webapp/packages/core-dialogs/package.json index ee44daef80..45394b8ca9 100644 --- a/webapp/packages/core-dialogs/package.json +++ b/webapp/packages/core-dialogs/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-events/package.json b/webapp/packages/core-events/package.json index 55e4240a92..f6169b1428 100644 --- a/webapp/packages/core-events/package.json +++ b/webapp/packages/core-events/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-executor/package.json b/webapp/packages/core-executor/package.json index b65bd3d323..334eb3029f 100644 --- a/webapp/packages/core-executor/package.json +++ b/webapp/packages/core-executor/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "mobx": "^6.12.0" diff --git a/webapp/packages/core-extensions/package.json b/webapp/packages/core-extensions/package.json index 5d43126dbb..d3b3df4719 100644 --- a/webapp/packages/core-extensions/package.json +++ b/webapp/packages/core-extensions/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": {}, "peerDependencies": {}, diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json index bfe7a6dc7f..56cf715a76 100644 --- a/webapp/packages/core-localization/package.json +++ b/webapp/packages/core-localization/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-navigation-tree/package.json b/webapp/packages/core-navigation-tree/package.json index abb8aad7c6..19ad3097b8 100644 --- a/webapp/packages/core-navigation-tree/package.json +++ b/webapp/packages/core-navigation-tree/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-notifications/package.json b/webapp/packages/core-notifications/package.json index 9de6c0d5be..a082d5deec 100644 --- a/webapp/packages/core-notifications/package.json +++ b/webapp/packages/core-notifications/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/core-product/package.json b/webapp/packages/core-product/package.json index 166de8e281..695dd0ec0c 100644 --- a/webapp/packages/core-product/package.json +++ b/webapp/packages/core-product/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-projects/package.json b/webapp/packages/core-projects/package.json index 3642de2d4c..f6693bb3e5 100644 --- a/webapp/packages/core-projects/package.json +++ b/webapp/packages/core-projects/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-resource-manager/package.json b/webapp/packages/core-resource-manager/package.json index 00972df607..ef80c0966e 100644 --- a/webapp/packages/core-resource-manager/package.json +++ b/webapp/packages/core-resource-manager/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/core-resource/package.json b/webapp/packages/core-resource/package.json index 4aa612b5c4..d2d3aeb6aa 100644 --- a/webapp/packages/core-resource/package.json +++ b/webapp/packages/core-resource/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-root/package.json b/webapp/packages/core-root/package.json index 0a8e7bc5a7..f7be082c75 100644 --- a/webapp/packages/core-root/package.json +++ b/webapp/packages/core-root/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-client-activity": "~0.1.0", diff --git a/webapp/packages/core-routing/package.json b/webapp/packages/core-routing/package.json index cfe08a1ac3..46ed6e3649 100644 --- a/webapp/packages/core-routing/package.json +++ b/webapp/packages/core-routing/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-sdk/package.json b/webapp/packages/core-sdk/package.json index 157e8814db..ed767d2810 100644 --- a/webapp/packages/core-sdk/package.json +++ b/webapp/packages/core-sdk/package.json @@ -16,9 +16,9 @@ "gql:gen:dev": "yarn run clean && graphql-codegen --watch", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-server-localization/package.json b/webapp/packages/core-server-localization/package.json index 842be30ab4..2e5d760446 100644 --- a/webapp/packages/core-server-localization/package.json +++ b/webapp/packages/core-server-localization/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-session-localization/package.json b/webapp/packages/core-session-localization/package.json index fb4f008afa..367a7327ac 100644 --- a/webapp/packages/core-session-localization/package.json +++ b/webapp/packages/core-session-localization/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-settings-localization/package.json b/webapp/packages/core-settings-localization/package.json index f9b51df6ce..90d9dc3b27 100644 --- a/webapp/packages/core-settings-localization/package.json +++ b/webapp/packages/core-settings-localization/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-settings-user/package.json b/webapp/packages/core-settings-user/package.json index e6bc45f1dc..9aa6a7670e 100644 --- a/webapp/packages/core-settings-user/package.json +++ b/webapp/packages/core-settings-user/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-settings/package.json b/webapp/packages/core-settings/package.json index 859f828324..bde6f88913 100644 --- a/webapp/packages/core-settings/package.json +++ b/webapp/packages/core-settings/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-storage/package.json b/webapp/packages/core-storage/package.json index 234b638b60..5d6447f6bf 100644 --- a/webapp/packages/core-storage/package.json +++ b/webapp/packages/core-storage/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-browser": "~0.1.0", diff --git a/webapp/packages/core-task-manager/package.json b/webapp/packages/core-task-manager/package.json index 44cac1eb0c..740e2c3575 100644 --- a/webapp/packages/core-task-manager/package.json +++ b/webapp/packages/core-task-manager/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-theming/package.json b/webapp/packages/core-theming/package.json index 8c2d128a84..ead282ccda 100644 --- a/webapp/packages/core-theming/package.json +++ b/webapp/packages/core-theming/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-ui/package.json b/webapp/packages/core-ui/package.json index f4ad9c963a..2b6d774487 100644 --- a/webapp/packages/core-ui/package.json +++ b/webapp/packages/core-ui/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/core-utils/package.json b/webapp/packages/core-utils/package.json index 18600decf2..4bebdcc6c2 100644 --- a/webapp/packages/core-utils/package.json +++ b/webapp/packages/core-utils/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@timohausmann/quadtree-ts": "^2.2.2", diff --git a/webapp/packages/core-version-update/package.json b/webapp/packages/core-version-update/package.json index 424e097f61..4eb3e09859 100644 --- a/webapp/packages/core-version-update/package.json +++ b/webapp/packages/core-version-update/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-version/package.json b/webapp/packages/core-version/package.json index b2b5296a2b..5dfa949a3f 100644 --- a/webapp/packages/core-version/package.json +++ b/webapp/packages/core-version/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json index 529d96d966..5c2210e2da 100644 --- a/webapp/packages/core-view/package.json +++ b/webapp/packages/core-view/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-administration/package.json b/webapp/packages/plugin-administration/package.json index 19f8f83edf..96cf500847 100644 --- a/webapp/packages/plugin-administration/package.json +++ b/webapp/packages/plugin-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-authentication-administration/package.json b/webapp/packages/plugin-authentication-administration/package.json index 7b80879656..1ffaebd482 100644 --- a/webapp/packages/plugin-authentication-administration/package.json +++ b/webapp/packages/plugin-authentication-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-authentication/package.json b/webapp/packages/plugin-authentication/package.json index b5bcd987f4..20fd47bb23 100644 --- a/webapp/packages/plugin-authentication/package.json +++ b/webapp/packages/plugin-authentication/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-browser/package.json b/webapp/packages/plugin-browser/package.json index ba33acf6ed..62eb4fe53f 100644 --- a/webapp/packages/plugin-browser/package.json +++ b/webapp/packages/plugin-browser/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-codemirror6/package.json b/webapp/packages/plugin-codemirror6/package.json index d2442c6f1d..b8097bd351 100644 --- a/webapp/packages/plugin-codemirror6/package.json +++ b/webapp/packages/plugin-codemirror6/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-connection-custom/package.json b/webapp/packages/plugin-connection-custom/package.json index b6a8a41f19..14370ac869 100644 --- a/webapp/packages/plugin-connection-custom/package.json +++ b/webapp/packages/plugin-connection-custom/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-connection-search/package.json b/webapp/packages/plugin-connection-search/package.json index a7fa2ef6ab..59878369ab 100644 --- a/webapp/packages/plugin-connection-search/package.json +++ b/webapp/packages/plugin-connection-search/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-connection-template/package.json b/webapp/packages/plugin-connection-template/package.json index b1349fde0d..cbe7db3ae8 100644 --- a/webapp/packages/plugin-connection-template/package.json +++ b/webapp/packages/plugin-connection-template/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-connections-administration/package.json b/webapp/packages/plugin-connections-administration/package.json index 7973b6598a..d4028f053a 100644 --- a/webapp/packages/plugin-connections-administration/package.json +++ b/webapp/packages/plugin-connections-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-connections/package.json b/webapp/packages/plugin-connections/package.json index 05eb59f0c3..bb499e31d1 100644 --- a/webapp/packages/plugin-connections/package.json +++ b/webapp/packages/plugin-connections/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-d3js/package.json b/webapp/packages/plugin-d3js/package.json index dda00ad2d8..312b509916 100644 --- a/webapp/packages/plugin-d3js/package.json +++ b/webapp/packages/plugin-d3js/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/plugin-data-export/package.json b/webapp/packages/plugin-data-export/package.json index 977a609e6e..46ce7963ed 100644 --- a/webapp/packages/plugin-data-export/package.json +++ b/webapp/packages/plugin-data-export/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-data-import/package.json b/webapp/packages/plugin-data-import/package.json index c77ac5047a..9bb45c3f42 100644 --- a/webapp/packages/plugin-data-import/package.json +++ b/webapp/packages/plugin-data-import/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-data-spreadsheet-new/package.json b/webapp/packages/plugin-data-spreadsheet-new/package.json index f68ea350f7..03e63e9236 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/package.json +++ b/webapp/packages/plugin-data-spreadsheet-new/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/package.json b/webapp/packages/plugin-data-viewer-result-set-grouping/package.json index b86c6df9a6..efb5d0b74a 100644 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/package.json +++ b/webapp/packages/plugin-data-viewer-result-set-grouping/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json index 5751ef9039..e2a49324bd 100644 --- a/webapp/packages/plugin-data-viewer/package.json +++ b/webapp/packages/plugin-data-viewer/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-datasource-context-switch/package.json b/webapp/packages/plugin-datasource-context-switch/package.json index bc2b872c74..ae05895e8f 100644 --- a/webapp/packages/plugin-datasource-context-switch/package.json +++ b/webapp/packages/plugin-datasource-context-switch/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-datasource-transaction-manager/package.json b/webapp/packages/plugin-datasource-transaction-manager/package.json index cc0671ae4d..a8d7a484ac 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/package.json +++ b/webapp/packages/plugin-datasource-transaction-manager/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-ddl-viewer/package.json b/webapp/packages/plugin-ddl-viewer/package.json index dc6247e688..dda38748d3 100644 --- a/webapp/packages/plugin-ddl-viewer/package.json +++ b/webapp/packages/plugin-ddl-viewer/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-devtools/package.json b/webapp/packages/plugin-devtools/package.json index 264c27bd91..a513103bf2 100644 --- a/webapp/packages/plugin-devtools/package.json +++ b/webapp/packages/plugin-devtools/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-gis-viewer/package.json b/webapp/packages/plugin-gis-viewer/package.json index 3d546a6fa2..dd122e6623 100644 --- a/webapp/packages/plugin-gis-viewer/package.json +++ b/webapp/packages/plugin-gis-viewer/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-help/package.json b/webapp/packages/plugin-help/package.json index b39e385584..a5a10bf67e 100644 --- a/webapp/packages/plugin-help/package.json +++ b/webapp/packages/plugin-help/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-app": "~0.1.0", diff --git a/webapp/packages/plugin-localization/package.json b/webapp/packages/plugin-localization/package.json index bacc99b3ad..213fc70fb2 100644 --- a/webapp/packages/plugin-localization/package.json +++ b/webapp/packages/plugin-localization/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/plugin-log-viewer/package.json b/webapp/packages/plugin-log-viewer/package.json index a16cdd7f6d..0ca37698cd 100644 --- a/webapp/packages/plugin-log-viewer/package.json +++ b/webapp/packages/plugin-log-viewer/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-navigation-tabs/package.json b/webapp/packages/plugin-navigation-tabs/package.json index c19297ea53..6f1b88d2a3 100644 --- a/webapp/packages/plugin-navigation-tabs/package.json +++ b/webapp/packages/plugin-navigation-tabs/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-navigation-tree-filters/package.json b/webapp/packages/plugin-navigation-tree-filters/package.json index b55d47457c..e313aeba6d 100644 --- a/webapp/packages/plugin-navigation-tree-filters/package.json +++ b/webapp/packages/plugin-navigation-tree-filters/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-navigation-tree-rm/package.json b/webapp/packages/plugin-navigation-tree-rm/package.json index 0d6c13c9b8..321caee613 100644 --- a/webapp/packages/plugin-navigation-tree-rm/package.json +++ b/webapp/packages/plugin-navigation-tree-rm/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-navigation-tree/package.json b/webapp/packages/plugin-navigation-tree/package.json index b58a90194a..c7783b01a0 100644 --- a/webapp/packages/plugin-navigation-tree/package.json +++ b/webapp/packages/plugin-navigation-tree/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-object-viewer/package.json b/webapp/packages/plugin-object-viewer/package.json index 9a489835f9..c0462a19bb 100644 --- a/webapp/packages/plugin-object-viewer/package.json +++ b/webapp/packages/plugin-object-viewer/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-product/package.json b/webapp/packages/plugin-product/package.json index 1d644f8600..25cd88ac85 100644 --- a/webapp/packages/plugin-product/package.json +++ b/webapp/packages/plugin-product/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-projects/package.json b/webapp/packages/plugin-projects/package.json index 4131b66406..05a02400b1 100644 --- a/webapp/packages/plugin-projects/package.json +++ b/webapp/packages/plugin-projects/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-react-data-grid/package.json b/webapp/packages/plugin-react-data-grid/package.json index dfc1447d7d..14bcfdc4f8 100644 --- a/webapp/packages/plugin-react-data-grid/package.json +++ b/webapp/packages/plugin-react-data-grid/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "react-data-grid": "file:react-data-grid-dist" diff --git a/webapp/packages/plugin-resource-manager-administration/package.json b/webapp/packages/plugin-resource-manager-administration/package.json index e1ae1a1941..92c67fd85c 100644 --- a/webapp/packages/plugin-resource-manager-administration/package.json +++ b/webapp/packages/plugin-resource-manager-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-resource-manager-scripts/package.json b/webapp/packages/plugin-resource-manager-scripts/package.json index 3e5e83321c..5c237f409a 100644 --- a/webapp/packages/plugin-resource-manager-scripts/package.json +++ b/webapp/packages/plugin-resource-manager-scripts/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-resource-manager/package.json b/webapp/packages/plugin-resource-manager/package.json index 038b0fae5d..5d379500f1 100644 --- a/webapp/packages/plugin-resource-manager/package.json +++ b/webapp/packages/plugin-resource-manager/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-root/package.json b/webapp/packages/plugin-root/package.json index 5c421f2bb9..0cbd4e9414 100644 --- a/webapp/packages/plugin-root/package.json +++ b/webapp/packages/plugin-root/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-session-expiration/package.json b/webapp/packages/plugin-session-expiration/package.json index 3afe5b0353..fd3dffd0e0 100644 --- a/webapp/packages/plugin-session-expiration/package.json +++ b/webapp/packages/plugin-session-expiration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-settings-administration/package.json b/webapp/packages/plugin-settings-administration/package.json index 44b8689879..c8dff6fe0e 100644 --- a/webapp/packages/plugin-settings-administration/package.json +++ b/webapp/packages/plugin-settings-administration/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-settings-menu-administration/package.json b/webapp/packages/plugin-settings-menu-administration/package.json index 4d0ab711e7..75fac5b4db 100644 --- a/webapp/packages/plugin-settings-menu-administration/package.json +++ b/webapp/packages/plugin-settings-menu-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0" diff --git a/webapp/packages/plugin-settings-menu/package.json b/webapp/packages/plugin-settings-menu/package.json index 965a90856c..2f9ec5fa00 100644 --- a/webapp/packages/plugin-settings-menu/package.json +++ b/webapp/packages/plugin-settings-menu/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-settings-panel/package.json b/webapp/packages/plugin-settings-panel/package.json index 86d5a073b7..59346a6ec6 100644 --- a/webapp/packages/plugin-settings-panel/package.json +++ b/webapp/packages/plugin-settings-panel/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json b/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json index afe545e738..60d70ac985 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json +++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/package.json b/webapp/packages/plugin-sql-editor-navigation-tab/package.json index e9523947e0..e8d9b06d68 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/package.json +++ b/webapp/packages/plugin-sql-editor-navigation-tab/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sql-editor-new/package.json b/webapp/packages/plugin-sql-editor-new/package.json index fa15eee0c0..4d2f2285a3 100644 --- a/webapp/packages/plugin-sql-editor-new/package.json +++ b/webapp/packages/plugin-sql-editor-new/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sql-editor-screen/package.json b/webapp/packages/plugin-sql-editor-screen/package.json index 962593617c..ee3bcd87f0 100644 --- a/webapp/packages/plugin-sql-editor-screen/package.json +++ b/webapp/packages/plugin-sql-editor-screen/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sql-editor/package.json b/webapp/packages/plugin-sql-editor/package.json index ff53442248..25012982b9 100644 --- a/webapp/packages/plugin-sql-editor/package.json +++ b/webapp/packages/plugin-sql-editor/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-sql-generator/package.json b/webapp/packages/plugin-sql-generator/package.json index 88e9bc8dde..c8465b8906 100644 --- a/webapp/packages/plugin-sql-generator/package.json +++ b/webapp/packages/plugin-sql-generator/package.json @@ -11,11 +11,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-sso/package.json b/webapp/packages/plugin-sso/package.json index ba74f16b83..bc3bec00ac 100644 --- a/webapp/packages/plugin-sso/package.json +++ b/webapp/packages/plugin-sso/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "peerDependencies": {}, "dependencies": { diff --git a/webapp/packages/plugin-task-manager/package.json b/webapp/packages/plugin-task-manager/package.json index 1dc3f46c5d..267bde527e 100644 --- a/webapp/packages/plugin-task-manager/package.json +++ b/webapp/packages/plugin-task-manager/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-theme/package.json b/webapp/packages/plugin-theme/package.json index af1713dcb8..7814ab0465 100644 --- a/webapp/packages/plugin-theme/package.json +++ b/webapp/packages/plugin-theme/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0" diff --git a/webapp/packages/plugin-tools-panel/package.json b/webapp/packages/plugin-tools-panel/package.json index 7249fac7c1..0c362ba7e4 100644 --- a/webapp/packages/plugin-tools-panel/package.json +++ b/webapp/packages/plugin-tools-panel/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-app": "~0.1.0", diff --git a/webapp/packages/plugin-top-app-bar-administration/package.json b/webapp/packages/plugin-top-app-bar-administration/package.json index 950466379b..1eae39845f 100644 --- a/webapp/packages/plugin-top-app-bar-administration/package.json +++ b/webapp/packages/plugin-top-app-bar-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/plugin-top-app-bar/package.json b/webapp/packages/plugin-top-app-bar/package.json index e759dc1073..581213b52e 100644 --- a/webapp/packages/plugin-top-app-bar/package.json +++ b/webapp/packages/plugin-top-app-bar/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-app": "~0.1.0", diff --git a/webapp/packages/plugin-user-profile-administration/package.json b/webapp/packages/plugin-user-profile-administration/package.json index a3682a1d0b..bbf5bed022 100644 --- a/webapp/packages/plugin-user-profile-administration/package.json +++ b/webapp/packages/plugin-user-profile-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/packages/plugin-user-profile-settings/package.json b/webapp/packages/plugin-user-profile-settings/package.json index 75cfa569e2..d45f1298d1 100644 --- a/webapp/packages/plugin-user-profile-settings/package.json +++ b/webapp/packages/plugin-user-profile-settings/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/plugin-user-profile/package.json b/webapp/packages/plugin-user-profile/package.json index ad65159c6a..974b0ecbbf 100644 --- a/webapp/packages/plugin-user-profile/package.json +++ b/webapp/packages/plugin-user-profile/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", diff --git a/webapp/packages/plugin-version-update-administration/package.json b/webapp/packages/plugin-version-update-administration/package.json index a3e883f623..9aefd6214a 100644 --- a/webapp/packages/plugin-version-update-administration/package.json +++ b/webapp/packages/plugin-version-update-administration/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-administration": "~0.1.0", diff --git a/webapp/packages/plugin-version/package.json b/webapp/packages/plugin-version/package.json index e10397935c..e9afd33a0b 100644 --- a/webapp/packages/plugin-version/package.json +++ b/webapp/packages/plugin-version/package.json @@ -11,10 +11,11 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0" diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 67d812fab7..6d3660dbb0 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -22,7 +22,7 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "version:new": "yarn version --no-git-tag-version", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-blocks": "~0.1.0", diff --git a/webapp/packages/tests-runner/package.json b/webapp/packages/tests-runner/package.json index 5bb159d320..764b8e0a7c 100644 --- a/webapp/packages/tests-runner/package.json +++ b/webapp/packages/tests-runner/package.json @@ -6,11 +6,12 @@ "main": "dist/index.js", "scripts": { "build": "tsc -b", + "clean": "rimraf --glob dist", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", - "test": "yarn build && core-cli-test", + "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies", - "update-ts-references": "rimraf --glob dist && typescript-resolve-references" + "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", diff --git a/webapp/scripts/license-check.mjs b/webapp/scripts/license-check.mjs index efbb0548df..1bdd031b34 100644 --- a/webapp/scripts/license-check.mjs +++ b/webapp/scripts/license-check.mjs @@ -46,6 +46,9 @@ for await (const line of rl) { let fileLineIndex = 0; for await (const fileLine of fileRl) { + if (fileLine.startsWith('#!/usr/bin/env')) { + continue; + } if (fileLine !== license[fileLineIndex]) { invalidFiles.push(line); break; diff --git a/webapp/tsconfig.base.json b/webapp/tsconfig.base.json index 60518cc54c..0d13d2e93d 100644 --- a/webapp/tsconfig.base.json +++ b/webapp/tsconfig.base.json @@ -10,7 +10,7 @@ "importsNotUsedAsValues": "error", "forceConsistentCasingInFileNames": true, "ignoreDeprecations": "5.0", - "jsx": "preserve", + "jsx": "react-jsx", "target": "esnext", "module": "esnext", "moduleResolution": "node", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index e0988ab9ab..c0fe80004c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -59,22 +59,6 @@ dependencies: node-fetch "^2.6.1" -"@babel/cli@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.23.9.tgz#06b3e76376ee53f14ac8ac422c884950c69e1b9e" - integrity sha512-vB1UXmGDNEhcf1jNAHKT9IlYk1R+hehVTLFlCLHBi8gfuHQGP6uRjgXVYU0EVlI/qwAWpstqkBdf2aez3/z/5Q== - dependencies: - "@jridgewell/trace-mapping" "^0.3.17" - commander "^4.0.1" - convert-source-map "^2.0.0" - fs-readdir-recursive "^1.1.0" - glob "^7.2.0" - make-dir "^2.1.0" - slash "^2.0.0" - optionalDependencies: - "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" - chokidar "^3.4.0" - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" @@ -88,7 +72,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.22.9", "@babel/core@^7.23.9", "@babel/core@^7.24.0": +"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.22.9", "@babel/core@^7.23.9": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b" integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw== @@ -153,7 +137,7 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.23.6", "@babel/helper-create-class-features-plugin@^7.24.0": +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz#fc7554141bdbfa2d17f7b4b80153b9b090e5d158" integrity sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g== @@ -294,7 +278,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": +"@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== @@ -363,15 +347,6 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-decorators@^7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.0.tgz#845b42189e7441faa60a37682de1038eae97c382" - integrity sha512-LiT1RqZWeij7X+wGxCoYh3/3b8nVOX6/7BZ9wiQgAIyjoeQWdROaodJCgT+dwtbjHaz0r7bEbHJzjSbVfcOyjQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.0" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/plugin-syntax-decorators" "^7.24.0" - "@babel/plugin-proposal-object-rest-spread@^7.0.0": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" @@ -416,13 +391,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-decorators@^7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.0.tgz#7a15e20aeaf412469c53ed0d5666f31a1fc41215" - integrity sha512-MXW3pQCu9gUiVGzqkGqsgiINDVYXoAnrY8FYF/rmb+OfufNF0zHMpHPN4ulRrinxYT8Vk/aZJxYqOKsDECjKAw== - dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" @@ -535,7 +503,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.23.3", "@babel/plugin-syntax-typescript@^7.7.2": +"@babel/plugin-syntax-typescript@^7.7.2": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f" integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ== @@ -864,21 +832,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.23.3": +"@babel/plugin-transform-react-display-name@^7.0.0": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200" integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-jsx-development@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87" - integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A== - dependencies: - "@babel/plugin-transform-react-jsx" "^7.22.5" - -"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5": +"@babel/plugin-transform-react-jsx@^7.0.0": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== @@ -889,14 +850,6 @@ "@babel/plugin-syntax-jsx" "^7.23.3" "@babel/types" "^7.23.4" -"@babel/plugin-transform-react-pure-annotations@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz#fabedbdb8ee40edf5da96f3ecfc6958e3783b93c" - integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-regenerator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c" @@ -912,18 +865,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-runtime@^7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz#e308fe27d08b74027d42547081eefaf4f2ffbcc9" - integrity sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA== - dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" - babel-plugin-polyfill-corejs2 "^0.4.8" - babel-plugin-polyfill-corejs3 "^0.9.0" - babel-plugin-polyfill-regenerator "^0.5.5" - semver "^6.3.1" - "@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210" @@ -960,16 +901,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typescript@^7.23.3": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz#aa36a94e5da8d94339ae3a4e22d40ed287feb34c" - integrity sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.23.6" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-typescript" "^7.23.3" - "@babel/plugin-transform-unicode-escapes@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925" @@ -1001,7 +932,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.24.0": +"@babel/preset-env@^7.11.0": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.0.tgz#11536a7f4b977294f0bdfad780f01a8ac8e183fc" integrity sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA== @@ -1096,29 +1027,6 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.23.3.tgz#f73ca07e7590f977db07eb54dbe46538cc015709" - integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-transform-react-display-name" "^7.23.3" - "@babel/plugin-transform-react-jsx" "^7.22.15" - "@babel/plugin-transform-react-jsx-development" "^7.22.5" - "@babel/plugin-transform-react-pure-annotations" "^7.23.3" - -"@babel/preset-typescript@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913" - integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-syntax-jsx" "^7.23.3" - "@babel/plugin-transform-modules-commonjs" "^7.23.3" - "@babel/plugin-transform-typescript" "^7.23.3" - "@babel/regjsgen@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" @@ -2390,6 +2298,13 @@ slash "^3.0.0" strip-ansi "^6.0.0" +"@jest/create-cache-key-function@^29.7.0": + version "29.7.0" + resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-29.7.0.tgz#793be38148fab78e65f40ae30c36785f4ad859f0" + integrity sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA== + dependencies: + "@jest/types" "^29.6.3" + "@jest/environment@^29.7.0": version "29.7.0" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7" @@ -3501,11 +3416,6 @@ outvariant "^1.2.1" strict-event-emitter "^0.5.1" -"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3": - version "2.1.8-no-fsevents.3" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b" - integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ== - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -4103,6 +4013,96 @@ magic-string "^0.25.0" string.prototype.matchall "^4.0.6" +"@swc/core-darwin-arm64@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.5.24.tgz#71875695bc617e57c2d93352f48317b4c41e0240" + integrity sha512-M7oLOcC0sw+UTyAuL/9uyB9GeO4ZpaBbH76JSH6g1m0/yg7LYJZGRmplhDmwVSDAR5Fq4Sjoi1CksmmGkgihGA== + +"@swc/core-darwin-x64@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.5.24.tgz#6b4c3eb9b21ab50b7324a82c9497ffeb2e8e0a57" + integrity sha512-MfcFjGGYognpSBSos2pYUNYJSmqEhuw5ceGr6qAdME7ddbjGXliza4W6FggsM+JnWwpqa31+e7/R+GetW4WkaQ== + +"@swc/core-linux-arm-gnueabihf@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.5.24.tgz#5730ed6ad86afe4ee8df04ee6f21430daead186c" + integrity sha512-amI2pwtcWV3E/m/nf+AQtn1LWDzKLZyjCmWd3ms7QjEueWYrY8cU1Y4Wp7wNNsxIoPOi8zek1Uj2wwFD/pttNQ== + +"@swc/core-linux-arm64-gnu@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.5.24.tgz#0a2478e8601391aa88f82bfece1dbc60d27cbcfd" + integrity sha512-sTSvmqMmgT1ynH/nP75Pc51s+iT4crZagHBiDOf5cq+kudUYjda9lWMs7xkXB/TUKFHPCRK0HGunl8bkwiIbuw== + +"@swc/core-linux-arm64-musl@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.5.24.tgz#e0199092dc611ca75f8a92dcea17de44e38f3fbf" + integrity sha512-vd2/hfOBGbrX21FxsFdXCUaffjkHvlZkeE2UMRajdXifwv79jqOHIJg3jXG1F3ZrhCghCzirFts4tAZgcG8XWg== + +"@swc/core-linux-x64-gnu@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.5.24.tgz#1fe347c9f28457c593f2fda5b0d4904a2b105ecd" + integrity sha512-Zrdzi7NqzQxm2BvAG5KyOSBEggQ7ayrxh599AqqevJmsUXJ8o2nMiWQOBvgCGp7ye+Biz3pvZn1EnRzAp+TpUg== + +"@swc/core-linux-x64-musl@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.5.24.tgz#bf6ac583fac211d704d2d78cfd0b7bf751268f5e" + integrity sha512-1F8z9NRi52jdZQCGc5sflwYSctL6omxiVmIFVp8TC9nngjQKc00TtX/JC2Eo2HwvgupkFVl5YQJidAck9YtmJw== + +"@swc/core-win32-arm64-msvc@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.5.24.tgz#41b9faf4db69cc08a43c3a176df2a7b94d765637" + integrity sha512-cKpP7KvS6Xr0jFSTBXY53HZX/YfomK5EMQYpCVDOvfsZeYHN20sQSKXfpVLvA/q2igVt1zzy1XJcOhpJcgiKLg== + +"@swc/core-win32-ia32-msvc@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.5.24.tgz#e123ad00e3b28d567d3851a86697fb3c54ed817a" + integrity sha512-IoPWfi0iwqjZuf7gE223+B97/ZwkKbu7qL5KzGP7g3hJrGSKAvv7eC5Y9r2iKKtLKyv5R/T6Ho0kFR/usi7rHw== + +"@swc/core-win32-x64-msvc@1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.5.24.tgz#21fb87b1981253039e6d45255e31a875f446e397" + integrity sha512-zHgF2k1uVJL8KIW+PnVz1To4a3Cz9THbh2z2lbehaF/gKHugH4c3djBozU4das1v35KOqf5jWIEviBLql2wDLQ== + +"@swc/core@^1.5.24": + version "1.5.24" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.5.24.tgz#9ecb4601cb6a4fb19f227ec5fb59d07e23347dca" + integrity sha512-Eph9zvO4xvqWZGVzTdtdEJ0Vqf0VIML/o/e4Qd2RLOqtfgnlRi7avmMu5C0oqciJ0tk+hqdUKVUZ4JPoPaiGvQ== + dependencies: + "@swc/counter" "^0.1.3" + "@swc/types" "^0.1.7" + optionalDependencies: + "@swc/core-darwin-arm64" "1.5.24" + "@swc/core-darwin-x64" "1.5.24" + "@swc/core-linux-arm-gnueabihf" "1.5.24" + "@swc/core-linux-arm64-gnu" "1.5.24" + "@swc/core-linux-arm64-musl" "1.5.24" + "@swc/core-linux-x64-gnu" "1.5.24" + "@swc/core-linux-x64-musl" "1.5.24" + "@swc/core-win32-arm64-msvc" "1.5.24" + "@swc/core-win32-ia32-msvc" "1.5.24" + "@swc/core-win32-x64-msvc" "1.5.24" + +"@swc/counter@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" + integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== + +"@swc/jest@^0": + version "0.2.36" + resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.36.tgz#2797450a30d28b471997a17e901ccad946fe693e" + integrity sha512-8X80dp81ugxs4a11z1ka43FPhP+/e+mJNXJSxiNYk8gIX/jPBtY4gQTrKu/KIoco8bzKuPI5lUxjfLiGsfvnlw== + dependencies: + "@jest/create-cache-key-function" "^29.7.0" + "@swc/counter" "^0.1.3" + jsonc-parser "^3.2.0" + +"@swc/types@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.7.tgz#ea5d658cf460abff51507ca8d26e2d391bafb15e" + integrity sha512-scHWahbHF0eyj3JsxG9CFJgFdFNaVQCNAimBlT6PzS3n/HptxqREjsm4OH6AN3lYcffZYSPxXW8ua2BEHp0lJQ== + dependencies: + "@swc/counter" "^0.1.3" + "@testing-library/dom@^9.0.0", "@testing-library/dom@^9.3.4": version "9.3.4" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce" @@ -5771,14 +5771,6 @@ babel-jest@^29.7.0: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^9.1.3: - version "9.1.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a" - integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw== - dependencies: - find-cache-dir "^4.0.0" - schema-utils "^4.0.0" - babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" @@ -5800,17 +5792,6 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" -babel-plugin-module-resolver@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73" - integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q== - dependencies: - find-babel-config "^2.0.0" - glob "^8.0.3" - pkg-up "^3.1.0" - reselect "^4.1.7" - resolve "^1.22.1" - babel-plugin-polyfill-corejs2@^0.4.8: version "0.4.8" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269" @@ -5840,13 +5821,6 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== -babel-plugin-transform-typescript-metadata@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.2.tgz#7a327842d8c36ffe07ee1b5276434e56c297c9b7" - integrity sha512-mWEvCQTgXQf48yDqgN7CH50waTyYBeP2Lpqx4nNWab9sxEpdXVeKgfj1qYI2/TgUPQtNFZ85i3PemRtnXVYYJg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -6312,7 +6286,7 @@ charenc@0.0.2: resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.5.1, chokidar@^3.6.0: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.1, chokidar@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== @@ -6536,11 +6510,6 @@ commander@^2.16.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - commander@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" @@ -8926,22 +8895,6 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" -find-babel-config@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701" - integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw== - dependencies: - json5 "^2.1.1" - path-exists "^4.0.0" - -find-cache-dir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" - integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg== - dependencies: - common-path-prefix "^3.0.0" - pkg-dir "^7.0.0" - find-up@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -8949,13 +8902,6 @@ find-up@^2.0.0: dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -8972,14 +8918,6 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" - integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== - dependencies: - locate-path "^7.1.0" - path-exists "^5.0.0" - flat-cache@^3.0.4: version "3.2.0" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" @@ -9097,11 +9035,6 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0: dependencies: minipass "^3.0.0" -fs-readdir-recursive@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -9318,7 +9251,7 @@ glob@^10.3.10, glob@^10.3.7: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -9330,7 +9263,7 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: +glob@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -11159,7 +11092,7 @@ json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.1.1, json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3: +json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -11169,6 +11102,11 @@ jsonc-parser@3.2.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== +jsonc-parser@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a" + integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA== + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -11450,14 +11388,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -11472,13 +11402,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -locate-path@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" - integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== - dependencies: - p-locate "^6.0.0" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -12922,20 +12845,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" -p-limit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" - integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== - dependencies: - yocto-queue "^1.0.0" - p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -12943,13 +12859,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -12964,13 +12873,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-locate@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" - integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== - dependencies: - p-limit "^4.0.0" - p-map-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2" @@ -13193,11 +13095,6 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-exists@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" - integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -13315,20 +13212,6 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-dir@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" - integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== - dependencies: - find-up "^6.3.0" - -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - pluralize@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" @@ -14638,11 +14521,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -reselect@^4.1.7: - version "4.1.8" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" - integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== - reserved-words@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" @@ -14675,7 +14553,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.1, resolve@^1.22.4: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.4: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -15139,11 +15017,6 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -15738,6 +15611,13 @@ swap-case@^2.0.2: dependencies: tslib "^2.0.3" +swc-loader@^0.2.6: + version "0.2.6" + resolved "https://registry.yarnpkg.com/swc-loader/-/swc-loader-0.2.6.tgz#bf0cba8eeff34bb19620ead81d1277fefaec6bc8" + integrity sha512-9Zi9UP2YmDpgmQVbyOPJClY0dwf58JDyDMQ7uRc4krmc72twNI2fvlBWHLqVekBpPc7h5NJkGVT1zNDxFrqhvg== + dependencies: + "@swc/counter" "^0.1.3" + symbol-observable@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -17383,11 +17263,6 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -yocto-queue@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" - integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== - zod-i18n-map@^2.27.0: version "2.27.0" resolved "https://registry.yarnpkg.com/zod-i18n-map/-/zod-i18n-map-2.27.0.tgz#ad4e7f702de4d1f49e3edc79c1ac147a56f17152"