diff --git a/.eslintrc.cjs b/.eslintrc.cjs index d0c38aca6..92c01bfb4 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -6,8 +6,6 @@ module.exports = { }, extends: [ '@nuxtjs/eslint-config-typescript', - // Enable typescript-specific recommended rules - 'plugin:@typescript-eslint/recommended', 'plugin:nuxt/recommended', // Turns off all rules that are unnecessary or might conflict with Prettier (needs to be last) 'prettier', @@ -81,19 +79,35 @@ module.exports = { parser: '@typescript-eslint/parser', // Correct root tsconfigRootDir: __dirname, - // Path to tsconfig to enable rules that require type information - project: './tsconfig.json', + // Enable rules that require type information + project: true, // Correctly handle vue files extraFileExtensions: ['.vue'], }, extends: [ - // Enable recommended rules for typescript that use typing information (may be CPU intensive) - 'plugin:@typescript-eslint/recommended-requiring-type-checking', + // Enable typescript-specific stylistic rules + 'plugin:@typescript-eslint/stylistic-type-checked', + // Enable strict rules for typescript that use typing information (may be CPU intensive) + 'plugin:@typescript-eslint/strict-type-checked', ], rules: { // The graphql processor disables the vue processor, so some rules need to be disenabled // TODO: Remove this once https://github.com/eslint/eslint/issues/14745 is fixed and we can use multiple processors 'vue/comment-directive': 'off', + // Allow any type (for now) + '@typescript-eslint/no-explicit-any': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-unsafe-call': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-unsafe-member-access': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-unsafe-argument': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-unsafe-return': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-unsafe-assignment': 'warn', + // TODO: Remove this once all errors are fixed + '@typescript-eslint/no-redundant-type-constituents': 'warn', }, }, { diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f643376fb..60cdc80b5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -38,18 +38,34 @@ updates: patterns: - 'storybook' - '@storybook/*' + - 'chromatic' nuxt: patterns: - 'nuxt' - 'nuxt-*' - '@nuxt/*' - '@nuxtjs/*' + - 'pinia' - '@pinia/nuxt' + - '@bg-dev/nuxt-naiveui' + - 'vee-validate' + - '@vee-validate/nuxt' + - '@vee-validate/zod' + - 'zod' + - 'ufo' vue: patterns: - 'vue' - '@vue/*' - 'vue-*' + - 'unplugin-vue-components' + - '@vueuse/core' + - '@he-tree/vue' + - '@tailwindcss/forms' + prisma: + patterns: + - 'prisma' + - '@prisma/*' types: patterns: - '@types/*' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc2827f3d..7613133bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v3.6.0 with: fetch-depth: 0 - name: Setup Node.js - uses: actions/setup-node@v3.7.0 + uses: actions/setup-node@v3.8.1 with: node-version: 16 cache: 'yarn' @@ -82,12 +82,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v3.6.0 with: fetch-depth: 0 - name: Setup Node.js - uses: actions/setup-node@v3.7.0 + uses: actions/setup-node@v3.8.1 with: node-version: ${{ matrix.node }} cache: 'yarn' diff --git a/.github/workflows/deploy-preview-close.yml b/.github/workflows/deploy-preview-close.yml new file mode 100644 index 000000000..06eb8f509 --- /dev/null +++ b/.github/workflows/deploy-preview-close.yml @@ -0,0 +1,37 @@ +name: CD Azure (close preview) + +on: + pull_request_target: + types: [closed] + branches: + - main + +permissions: + pull-requests: write + id-token: write + +jobs: + close_pr_preview: + name: Close PR preview + + runs-on: ubuntu-latest + + steps: + - name: Delete WebApp environment + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_PEBBLE_0224C3803 }} + action: 'close' + + - name: Login to Azure + uses: Azure/login@v1 + with: + client-id: ${{ secrets.AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + + - name: Delete Function App + run: az functionapp delete --name jabref-function-${{ github.event.pull_request.number }} --resource-group JabRefOnline + + - name: Delete test database + run: az postgres flexible-server db delete --server-name jabrefdb --resource-group JabRefOnline --database-name postgres_test_${{ github.event.pull_request.number }} -y diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml new file mode 100644 index 000000000..864f1b0ae --- /dev/null +++ b/.github/workflows/deploy-preview.yml @@ -0,0 +1,137 @@ +name: CD Azure (preview) + +on: + pull_request_target: + types: [opened, synchronize, reopened, labeled] + branches: + - main + workflow_dispatch: + inputs: + preview_name: + description: 'Name of the deployment environment' + type: string + required: true + +permissions: + pull-requests: write + id-token: write + +jobs: + preview: + name: Build & Deploy to preview + + runs-on: windows-latest + + env: + PREVIEW_NAME: ${{ github.event.pull_request.number || github.event.inputs.preview_name }} + GITHUB_REPO_TOKEN: ${{ secrets.GITHUBS_REPO_TOKEN }} + + steps: + # We could also add these checks to a job-wide if condition, to skip the workflow if its unsecure to run. + # However, Github views skipped workflows as "successful" and thus one could merge a PR without running this workflow first. + - name: Fail if unsecure + if: "github.event_name != 'workflow_dispatch' && !contains(github.event.pull_request.labels.*.name, 'status: safe to test') && github.actor != 'tobiasdiez'" + run: exit 1 + + - name: Checkout + uses: actions/checkout@v3.6.0 + with: + ref: ${{ github.event.pull_request.head.sha || github.ref }} + + - name: Setup Node.js + uses: actions/setup-node@v3.8.1 + with: + node-version: 18 + cache: 'yarn' + + - name: Build + run: | + yarn install + yarn build:azure + + - name: Login to Azure + uses: Azure/login@v1 + with: + client-id: ${{ secrets.AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + + - name: Deploy Web App + id: deploy_web + run: | + # Delete old deployment (otherwise we get a spawn EBUSY error when running the workflow again) + az staticwebapp environment delete --name jabref-online --environment-name $env:PREVIEW_NAME --yes || true + # Workaround for https://github.com/Azure/static-web-apps-cli/issues/557 and https://github.com/Azure/static-web-apps-cli/issues/565 + $output = yarn swa deploy .output\public --env $env:PREVIEW_NAME --verbose=silly 2>&1 | Out-String + Write-Host $output + $match = $output | Select-String -Pattern 'Project deployed to (?.*) ' + if ($match -eq $null) { exit 1 } + $url = $match.Matches[0].Groups['url'].Value + echo "url=$url" >> $env:GITHUB_OUTPUT + env: + SWA_CLI_DEPLOYMENT_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_PEBBLE_0224C3803 }} + + - name: Install Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Create test database on Azure + run: | + $name = "postgres_test_$env:PREVIEW_NAME" + $pwd = az account get-access-token --resource-type oss-rdbms --output tsv --query accessToken + # az postgres flexible-server db create --server-name jabrefdb --resource-group JabRefOnline --database-name $name --charset utf8 --collation en_US.utf8 + # For some reason the public schema is not created automatically or without the default permissions, so we need to do it manually + # TODO: Remove this workaround once https://github.com/Azure/azure-cli/issues/26772 is fixed + # We also need to manually install an old version of rdbms due to https://github.com/Azure/azure-cli/issues/25067 + # az extension add --name rdbms-connect --version 1.0.3 --debug + # az postgres flexible-server execute --name jabrefdb -u "Github" -p "$pwd" --database-name $name -q "ALTER DATABASE $name OWNER TO azure_pg_admin; create schema public;" --output table + # az postgres flexible-server execute --name jabrefdb -u "Github" -p "$pwd" --database-name $name -q "grant usage on schema public to public; grant create on schema public to public;" --output table + # az postgres flexible-server execute --name jabrefdb -u "Github" -p "$pwd" --database-name $name -q "SELECT schema_name FROM information_schema.schemata;" --output table + # Login to the database using the Github user + $connection_string = "postgresql://Github:$pwd@$($env:DB_NAME).postgres.database.azure.com:5432/$($name)?sslmode=require" + echo "::add-mask::$connection_string" + echo "DATABASE_URL=$connection_string" >> $env:GITHUB_ENV + $Env:DATABASE_URL = $connection_string + # Finally, run the migrations (this also creates the db) + yarn prisma:migrate:reset --force + env: + DB_NAME: ${{ secrets.AZURE_DATABASE_NAME }} + + - name: Create & Link Function App + run: | + pip install azure-identity azure-mgmt-web azure-mgmt-storage azure-mgmt-applicationinsights azure-mgmt-redis azure-mgmt-communication + python .github\scripts\deploy.py --env $env:PREVIEW_NAME + env: + SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + AZURE_SESSION_SECRET: ${{ secrets.AZURE_SESSION_SECRET }} + + - name: Deploy Function App + run: | + Compress-Archive -Path .output\server\* -DestinationPath .output\server.zip + az functionapp deployment source config-zip -g JabRefOnline -n jabref-function-$env:PREVIEW_NAME --src .output\server.zip + + - name: Check HTTP status + run: | + Start-Sleep -Seconds 30 + curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ steps.deploy_web.outputs.url }} || true + curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ steps.deploy_web.outputs.url }}/api || true + # The api returns 400 status code for some reason + # uses: gerdemann/http-status-code@1.0.0 + # with: + # url: ${{ steps.deploy_web.outputs.url }}/api + # code: 200 + # timeout: 300 # initial warm up can take quite some time + # interval: 30 + + - name: Report URL as PR comment + if: github.event_name == 'pull_request_target' + uses: marocchino/sticky-pull-request-comment@v2 + with: + message: | + Deployed ${{ github.sha }} to ${{ steps.deploy_web.outputs.url }} + + - name: Run API tests + run: yarn test:api + env: + TEST_URL: ${{ steps.deploy_web.outputs.url }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dbf25c194..32259531f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,134 +4,16 @@ on: push: branches: - main - pull_request_target: - types: [opened, synchronize, reopened, closed, labeled] - branches: - - main - workflow_dispatch: permissions: pull-requests: write id-token: write jobs: - pr_preview: - name: Build & Deploy to PR preview - - runs-on: ubuntu-latest - - if: github.event_name == 'pull_request_target' && github.event.action != 'closed' - - env: - DATABASE_URL: ${{ format(secrets.AZURE_PR_DATABASE_URL, github.event.pull_request.number) }} - GITHUB_REPO_TOKEN: ${{ secrets.GITHUBS_REPO_TOKEN }} - - steps: - # We could also add these checks to the above if condition, to skip the workflow if its unsecure to run. - # However, Github views skipped workflows as "successful" and thus one could merge a PR without running this workflow first. - - name: Fail if unsecure - if: "!contains(github.event.pull_request.labels.*.name, 'status: safe to test') && github.actor != 'tobiasdiez'" - run: exit 1 - - - name: Checkout - uses: actions/checkout@v3.5.3 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Setup Node.js - uses: actions/setup-node@v3.7.0 - with: - node-version: 18 - cache: 'yarn' - - - name: Build - run: | - yarn install - yarn build:azure - - - name: Login to Azure - uses: Azure/login@v1 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - - - name: Deploy Web App - id: deploy_web - run: | - # Delete old deployment (otherwise we get a spawn EBUSY error when running the workflow again) - az staticwebapp environment delete --name jabref-online --environment-name ${{ github.event.pull_request.number }} --yes || true - # Workaround for https://github.com/Azure/static-web-apps-cli/issues/557 and https://github.com/Azure/static-web-apps-cli/issues/565 - $output = yarn swa deploy .output/public --env ${{ github.event.pull_request.number }} --verbose=silly 2>&1 | Out-String - Write-Host $output - $match = $output | Select-String -Pattern 'Project deployed to (?.*) ' - if ($match -eq $null) { exit 1 } - $url = $match.Matches[0].Groups['url'].Value - echo "url=$url" >> $env:GITHUB_OUTPUT - env: - SWA_CLI_DEPLOYMENT_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_PEBBLE_0224C3803 }} - shell: pwsh - - - name: Install Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - - name: Create test database on Azure - run: | - $name = "postgres_test_${{ github.event.pull_request.number }}" - az postgres flexible-server db create --server-name jabrefdb --resource-group JabRefOnline --database-name $name --charset utf8 --collation en_US.utf8 - $pwd = az account get-access-token --resource-type oss-rdbms --output tsv --query accessToken - # For some reason the public schema is not created automatically, so we need to do it manually - # We also need to manually install an old version of rdbms due to https://github.com/Azure/azure-cli/issues/25067 - az extension add --name rdbms-connect --version 1.0.3 --debug - az postgres flexible-server execute --name jabrefdb -u "Github" -p "$pwd" --database-name $name -q "GRANT CREATE ON DATABASE $name TO azure_pg_admin; create schema public;" --output table - yarn prisma:migrate:reset --force - shell: pwsh - - name: Create & Link Function App - run: | - pip install azure-identity azure-mgmt-web azure-mgmt-storage azure-mgmt-applicationinsights azure-mgmt-redis azure-mgmt-communication - python .github/scripts/deploy.py --env ${{ github.event.pull_request.number }} - env: - SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - AZURE_SESSION_SECRET: ${{ secrets.AZURE_SESSION_SECRET }} - - - name: Deploy Function App - run: | - Compress-Archive -Path .output/server/* -DestinationPath .output/server.zip - az functionapp deployment source config-zip -g JabRefOnline -n jabref-function-${{ github.event.pull_request.number }} --src .output/server.zip - shell: pwsh - - name: Check HTTP status - shell: bash - run: | - sleep 30 - curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ steps.deploy_web.outputs.url }} || true - curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ steps.deploy_web.outputs.url }}/api || true - # The api returns 400 status code for some reason - # uses: gerdemann/http-status-code@1.0.0 - # with: - # url: ${{ steps.deploy_web.outputs.url }}/api - # code: 200 - # timeout: 300 # initial warm up can take quite some time - # interval: 30 - - - name: Report URL as PR comment - uses: marocchino/sticky-pull-request-comment@v2 - with: - message: | - Deployed ${{ github.sha }} to ${{ steps.deploy_web.outputs.url }} - - - name: Run API tests - run: yarn test:api - env: - TEST_URL: ${{ steps.deploy_web.outputs.url }} - build_and_deploy: name: Build & Deploy to ${{ matrix.environment }} - runs-on: ubuntu-latest - - if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' + runs-on: windows-latest strategy: fail-fast: false @@ -157,10 +39,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v3.6.0 - name: Setup Node.js - uses: actions/setup-node@v3.7.0 + uses: actions/setup-node@v3.8.1 with: node-version: 18 cache: 'yarn' @@ -191,7 +73,7 @@ jobs: # Delete old deployment (otherwise we get a spawn EBUSY error when running the workflow again) az staticwebapp environment delete --name jabref-online --environment-name ${{ matrix.deployment_environment }} --yes || true - yarn swa deploy .output/public --env ${{ matrix.deployment_environment }} + yarn swa deploy .output\public --env ${{ matrix.deployment_environment }} env: SWA_CLI_DEPLOYMENT_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_PEBBLE_0224C3803 }} @@ -203,20 +85,19 @@ jobs: - name: Create & Link Function App run: | pip install azure-identity azure-mgmt-web azure-mgmt-storage azure-mgmt-applicationinsights azure-mgmt-redis azure-mgmt-communication - python .github/scripts/deploy.py --env ${{ matrix.deployment_environment }} + python .github\scripts\deploy.py --env ${{ matrix.deployment_environment }} env: SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_SESSION_SECRET: ${{ secrets.AZURE_SESSION_SECRET }} - name: Deploy Function App run: | - Compress-Archive -Path .output/server/* -DestinationPath .output/server.zip - az functionapp deployment source config-zip -g JabRefOnline -n jabref-function-${{ matrix.deployment_environment }} --src .output/server.zip - shell: pwsh + Compress-Archive -Path .output\server\* -DestinationPath .output\server.zip + az functionapp deployment source config-zip -g JabRefOnline -n jabref-function-${{ matrix.deployment_environment }} --src .output\server.zip + - name: Check HTTP status - shell: bash run: | - sleep 30 + Start-Sleep -Seconds 30 curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ matrix.url }} || true curl -s -w 'Establish Connection: %{time_connect}s\nTTFB: %{time_starttransfer}s\nTotal: %{time_total}s\n' ${{ matrix.url }}/api || true # The api returns 400 status code for some reason @@ -229,31 +110,4 @@ jobs: - name: Run API tests run: yarn test:api env: - TEST_URL: ${{ matrix.url }} - - close_pr_preview: - name: Close PR preview - - if: github.event_name == 'pull_request_target' && github.event.action == 'closed' - - runs-on: ubuntu-latest - - steps: - - name: Delete WebApp environment - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_PEBBLE_0224C3803 }} - action: 'close' - - - name: Login to Azure - uses: Azure/login@v1 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - - - name: Delete Function App - run: az functionapp delete --name jabref-function-${{ github.event.pull_request.number }} --resource-group JabRefOnline - - - name: Delete test database - run: az postgres flexible-server db delete --server-name jabrefdb --resource-group JabRefOnline --database-name postgres_test_${{ github.event.pull_request.number }} -y + TEST_URL: ${{ matrix.url }} \ No newline at end of file diff --git a/.prettierrc b/.prettierrc index 2fb5885d3..93e6f2745 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "semi": false, "singleQuote": true, - "singleAttributePerLine": true + "singleAttributePerLine": true, + "plugins": ["prettier-plugin-organize-imports"] } diff --git a/.yarn/patches/@bg-dev-nuxt-naiveui-npm-1.2.1-69980da2af.patch b/.yarn/patches/@bg-dev-nuxt-naiveui-npm-1.2.1-69980da2af.patch new file mode 100644 index 000000000..0327a3328 --- /dev/null +++ b/.yarn/patches/@bg-dev-nuxt-naiveui-npm-1.2.1-69980da2af.patch @@ -0,0 +1,23 @@ +diff --git a/dist/runtime/components/NaiveIcon.vue b/dist/runtime/components/NaiveIcon.vue +index 52f2327bdfd2e2cc880fe5cdb03b007579411952..f05a210e249b0ad894e7b191c4dd5d930b8e6e36 100644 +--- a/dist/runtime/components/NaiveIcon.vue ++++ b/dist/runtime/components/NaiveIcon.vue +@@ -1,5 +1,5 @@ + +diff --git a/dist/runtime/components/NaiveNavbar.vue b/dist/runtime/components/NaiveNavbar.vue +index 56254eccf8b3eed296abb359fe2696727158bc38..e36d5ab5887b1d204c43c46400c92f9ad3d73eca 100644 +--- a/dist/runtime/components/NaiveNavbar.vue ++++ b/dist/runtime/components/NaiveNavbar.vue +@@ -117,6 +117,7 @@ const menuOptions = computed(() => { + const menuOption: MenuOption = + { + label: route.path ? () => h(NuxtLink, { to: route.path }, { default: () => route.label }) : route.label, ++ // @ts-ignore: https://github.com/becem-gharbi/nuxt-naiveui/issues/18 + icon: route.icon ? () => h(NaiveIcon, { name: route.icon }) : undefined, + key: route.path || route.label, + } diff --git a/.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch b/.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch deleted file mode 100644 index 6f03a43bd..000000000 --- a/.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/package.json b/package.json -index 737ba3874b19590bd4d8626f9faf0e237422406f..0b12dbb6555f3f9a5850fad8de25007538ed97e9 100644 ---- a/package.json -+++ b/package.json -@@ -9,6 +9,41 @@ - "import": "./lib/index.js", - "require": "./dist/eslint-scope.cjs" - }, -+ "./lib/definition": { -+ "import": "./lib/definition.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/pattern-visitor": { -+ "import": "./lib/pattern-visitor.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/reference": { -+ "import": "./lib/reference.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/referencer": { -+ "import": "./lib/referencer.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/scope-manager": { -+ "import": "./lib/scope-manager.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/scope": { -+ "import": "./lib/scope.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, -+ "./lib/variable": { -+ "import": "./lib/variable.js", -+ "require": "./dist/eslint-scope.cjs", -+ "_comment": "needed due issues with @typescript-eslint, should be fixed in their next major release" -+ }, - "./package.json": "./package.json" - }, - "version": "7.1.1", diff --git a/patches/redis-mock+0.56.3.patch b/.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch similarity index 68% rename from patches/redis-mock+0.56.3.patch rename to .yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch index 052f24f11..b022ec7a1 100644 --- a/patches/redis-mock+0.56.3.patch +++ b/.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/redis-mock/lib/server/redis-db.js b/node_modules/redis-mock/lib/server/redis-db.js -index 35583cc..2eea5df 100644 ---- a/node_modules/redis-mock/lib/server/redis-db.js -+++ b/node_modules/redis-mock/lib/server/redis-db.js +diff --git a/lib/server/redis-db.js b/lib/server/redis-db.js +index 35583cc92b5d0b26ac9e8373a2808b133c188552..2eea5dfa3b11ca76891dc11cd8e936533fa1d28b 100644 +--- a/lib/server/redis-db.js ++++ b/lib/server/redis-db.js @@ -28,7 +28,8 @@ class RedisDb { * * The server contains a log of logic. It only feels natural to split it into multiple files diff --git a/app.vue b/app.vue index 94d8166f6..2d9ebd462 100644 --- a/app.vue +++ b/app.vue @@ -5,8 +5,8 @@