From 69894d4321af2d342bb80b135f7c5a76116f1fbc Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 16:14:16 -0800 Subject: [PATCH 1/8] build: notify PR authors about potential db migration conflict --- .../workflows/check_db_migration_confict.yml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/check_db_migration_confict.yml diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml new file mode 100644 index 0000000000000..68d3a19c17b20 --- /dev/null +++ b/.github/workflows/check_db_migration_confict.yml @@ -0,0 +1,58 @@ +name: Check DB migration conflict +on: + push: + paths: + - "superset/migrations/**" + +jobs: + check_db_migration_conflict: + name: Check potential DB migration conflict + runs-on: ubuntu-20.04 + steps: + - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" + uses: actions/checkout@v2 + with: + persist-credentials: false + submodules: recursive + - name: Check and notify + uses: actions/github-script@v3 + with: + githubToken: ${{ secrets.GITHUB_TOKEN }} + script: | + // API reference: https://octokit.github.io/rest.js + + // Find all pull requests to current branch + const opts = github.pulls.list.endpoint.merge({ + owner: context.repo.owner, + repo: context.repo.repo, + base: contect.ref, + state: 'open', + sort: 'updated', + per_page: 100, + }); + const pulls = await github.paginate(opts); + + for (const pull in pulls) { + const listFilesOpts = await github.pulls.listFiles.endpoint.merge({ + owner: context.repo.owner, + repo: contet.repo.repo, + pull_number: pull.number, + }); + const files = await github.paginate(listFilesOpts); + if ( + files.some(x => x.contents_url.includes('/contents/superset/migrations')) + ) { + await github.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: pull.number, + body: + `@${pull.user.login} Your base branch just also updated \`superset/migrations\`.` + + 'It may cause db migration conflicts with your current changes.' + + '\n' + + '**Please consider rebasing your branch.**', + }); + break; + } + } From 184f3ded0e474814d51305c12355d4a86dc5e6fd Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 16:36:23 -0800 Subject: [PATCH 2/8] fix errors --- .github/workflows/check_db_migration_confict.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index 68d3a19c17b20..8f1a1cfd04c93 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -11,37 +11,39 @@ jobs: steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v2 - with: - persist-credentials: false - submodules: recursive - name: Check and notify uses: actions/github-script@v3 with: - githubToken: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} script: | // API reference: https://octokit.github.io/rest.js + const currentBranch = context.ref.replace('ref/heads', ''); // Find all pull requests to current branch const opts = github.pulls.list.endpoint.merge({ owner: context.repo.owner, repo: context.repo.repo, - base: contect.ref, + base: currentBranch, state: 'open', sort: 'updated', per_page: 100, }); const pulls = await github.paginate(opts); + if (pulls.length > 0) { + console.log(`Found ${pulls.length} open PRs for base branch "${currentBranch}"`) + } for (const pull in pulls) { const listFilesOpts = await github.pulls.listFiles.endpoint.merge({ owner: context.repo.owner, - repo: contet.repo.repo, + repo: context.repo.repo, pull_number: pull.number, }); const files = await github.paginate(listFilesOpts); if ( files.some(x => x.contents_url.includes('/contents/superset/migrations')) ) { + console.log(`Found open PR #${pull.number} that has also added db migration`) await github.issues.createComment({ issue_number: context.issue.number, owner: context.repo.owner, @@ -53,6 +55,5 @@ jobs: '\n' + '**Please consider rebasing your branch.**', }); - break; } } From e6d351435f161c4f99a36f88bc317e4fff3d2a9f Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 16:56:48 -0800 Subject: [PATCH 3/8] Fix error --- .github/workflows/check_db_migration_confict.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index 8f1a1cfd04c93..f0ba18d19536d 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -6,7 +6,7 @@ on: jobs: check_db_migration_conflict: - name: Check potential DB migration conflict + name: Check DB migration conflict runs-on: ubuntu-20.04 steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" @@ -17,13 +17,13 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} script: | // API reference: https://octokit.github.io/rest.js - const currentBranch = context.ref.replace('ref/heads', ''); + const currentBranch = context.ref.replace('refs/heads/', ''); // Find all pull requests to current branch const opts = github.pulls.list.endpoint.merge({ owner: context.repo.owner, repo: context.repo.repo, - base: currentBranch, + base: context.ref, state: 'open', sort: 'updated', per_page: 100, @@ -34,6 +34,7 @@ jobs: } for (const pull in pulls) { + console.log(pull); const listFilesOpts = await github.pulls.listFiles.endpoint.merge({ owner: context.repo.owner, repo: context.repo.repo, @@ -43,7 +44,7 @@ jobs: if ( files.some(x => x.contents_url.includes('/contents/superset/migrations')) ) { - console.log(`Found open PR #${pull.number} that has also added db migration`) + console.log(`PR #${pull.number} "${pull.title}" also added db migration`) await github.issues.createComment({ issue_number: context.issue.number, owner: context.repo.owner, From 398f7b8601a572aecb20554a35897d2ef892ae7e Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 17:00:25 -0800 Subject: [PATCH 4/8] fix errors --- .github/workflows/check_db_migration_confict.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index f0ba18d19536d..4e8f603461683 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -33,8 +33,7 @@ jobs: console.log(`Found ${pulls.length} open PRs for base branch "${currentBranch}"`) } - for (const pull in pulls) { - console.log(pull); + for (const pull of pulls) { const listFilesOpts = await github.pulls.listFiles.endpoint.merge({ owner: context.repo.owner, repo: context.repo.repo, From 92eedafa323c256017820ef1a8c46ae67080a314 Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 17:08:15 -0800 Subject: [PATCH 5/8] Add emojis --- .github/workflows/check_db_migration_confict.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index 4e8f603461683..da8d08d4abf83 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -50,10 +50,11 @@ jobs: repo: context.repo.repo, issue_number: pull.number, body: - `@${pull.user.login} Your base branch just also updated \`superset/migrations\`.` + - 'It may cause db migration conflicts with your current changes.' + + `⚠️ @${pull.user.login} Your base branch just also updated \`superset/migrations\`.\n` + '\n' + - '**Please consider rebasing your branch.**', + 'It may cause db migration conflicts with your current changes.\n' + + '\n' + + '**❗ Please consider rebasing your branch.**', }); } } From f4222964b4a5f398da2f1b06e51f350e2c919c42 Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 17:16:24 -0800 Subject: [PATCH 6/8] Reformat --- .github/workflows/check_db_migration_confict.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index da8d08d4abf83..756ab87d4ddc5 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -50,11 +50,10 @@ jobs: repo: context.repo.repo, issue_number: pull.number, body: - `⚠️ @${pull.user.login} Your base branch just also updated \`superset/migrations\`.\n` + + `⚠️ @${pull.user.login} Your base branch \`${currentBranch}\` has just ` + + 'also updated `superset/migrations`.\n' + '\n' + - 'It may cause db migration conflicts with your current changes.\n' + - '\n' + - '**❗ Please consider rebasing your branch.**', + '❗ **Please consider rebasing your branch to avoid db migration conflicts.**', }); } } From 2585f827e53059520d70096231c67e8dab43b62a Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Fri, 5 Mar 2021 16:27:55 -0800 Subject: [PATCH 7/8] Add a new migration --- superset/migrations/test_migrate_2.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 superset/migrations/test_migrate_2.py diff --git a/superset/migrations/test_migrate_2.py b/superset/migrations/test_migrate_2.py new file mode 100644 index 0000000000000..e69de29bb2d1d From 8289d8b8bc970674375ad9c6fc967cca09360bfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 08:40:59 +0000 Subject: [PATCH 8/8] build(deps-dev): bump @testing-library/user-event in /superset-frontend Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 12.7.0 to 12.8.3. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/master/CHANGELOG.md) - [Commits](https://github.com/testing-library/user-event/compare/v12.7.0...v12.8.3) Signed-off-by: dependabot[bot] --- superset-frontend/package-lock.json | 139 ++++++---------------------- superset-frontend/package.json | 2 +- 2 files changed, 30 insertions(+), 111 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 30c41d7c9f85d..1e076f651e06c 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -151,7 +151,7 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.0", "@testing-library/react-hooks": "^5.0.3", - "@testing-library/user-event": "^12.7.0", + "@testing-library/user-event": "^12.8.3", "@types/classnames": "^2.2.10", "@types/dom-to-image": "^2.6.0", "@types/enzyme": "^3.10.5", @@ -304,8 +304,6 @@ "integrity": "sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==", "dev": true, "dependencies": { - "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents", - "chokidar": "^3.4.0", "commander": "^4.0.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", @@ -7111,7 +7109,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -7715,7 +7712,6 @@ "jest-resolve": "^26.6.2", "jest-util": "^26.6.2", "jest-worker": "^26.6.2", - "node-notifier": "^8.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -7904,7 +7900,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -8336,7 +8331,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -10643,8 +10637,7 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -11978,9 +11971,6 @@ "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", "dev": true, - "dependencies": { - "clipboard": "^2.0.0" - }, "optionalDependencies": { "clipboard": "^2.0.0" } @@ -18195,9 +18185,9 @@ } }, "node_modules/@testing-library/user-event": { - "version": "12.7.0", - "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.7.0.tgz", - "integrity": "sha512-KzRM1KNDoW8pJ2HTenrUhTjV6wJMHvWAagDs8DDrYSWz6y4PN+K2jSvlm2bMHWNRk5LTJPo9jqIjNjJ3FlqXNw==", + "version": "12.8.3", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz", + "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5" @@ -18205,6 +18195,9 @@ "engines": { "node": ">=10", "npm": ">=6" + }, + "peerDependencies": { + "@testing-library/dom": ">=7.21.4" } }, "node_modules/@types/anymatch": { @@ -21942,7 +21935,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -23657,7 +23649,7 @@ }, "node_modules/chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "dependencies": { @@ -23756,7 +23748,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.0", "braces": "^2.3.0", - "fsevents": "^1.2.2", "glob-parent": "^3.1.0", "inherits": "^2.0.1", "is-binary-path": "^1.0.0", @@ -24571,7 +24562,6 @@ "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==", "dev": true, "dependencies": { - "colors": "^1.1.2", "object-assign": "^4.1.0", "string-width": "^4.2.0" }, @@ -27423,7 +27413,7 @@ }, "node_modules/dom-serializer/node_modules/domelementtype": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" }, "node_modules/dom-to-image": { @@ -28188,8 +28178,7 @@ "esprima": "^3.1.3", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -32191,7 +32180,6 @@ "version": "4.5.2", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz", "integrity": "sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==", - "dev": true, "dependencies": { "@types/html-minifier-terser": "^5.0.0", "@types/tapable": "^1.0.5", @@ -34282,7 +34270,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -35122,7 +35109,6 @@ "@jest/types": "^24.9.0", "anymatch": "^2.0.0", "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", "graceful-fs": "^4.1.15", "invariant": "^2.2.4", "jest-serializer": "^24.9.0", @@ -35896,7 +35882,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -37543,7 +37528,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -37866,7 +37850,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -38237,7 +38220,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -39398,8 +39380,7 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -39610,7 +39591,7 @@ }, "node_modules/json5": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "bin": { "json5": "lib/cli.js" @@ -39920,11 +39901,8 @@ "dependencies": { "errno": "^0.1.1", "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", "make-dir": "^2.1.0", "mime": "^1.4.1", - "native-request": "^1.0.5", - "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -42529,7 +42507,7 @@ }, "node_modules/pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true, "engines": { @@ -45622,9 +45600,6 @@ "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz", "integrity": "sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==", "dev": true, - "dependencies": { - "clipboard": "^2.0.0" - }, "optionalDependencies": { "clipboard": "^2.0.0" } @@ -47225,34 +47200,6 @@ "node": ">=0.8.0" } }, - "node_modules/react-dev-utils/node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.1" - } - }, - "node_modules/react-dev-utils/node_modules/cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true - }, "node_modules/react-dev-utils/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -48498,9 +48445,6 @@ "version": "1.22.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", - "dependencies": { - "clipboard": "^2.0.0" - }, "optionalDependencies": { "clipboard": "^2.0.0" } @@ -49185,7 +49129,7 @@ }, "node_modules/regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "dependencies": { @@ -49196,13 +49140,13 @@ }, "node_modules/regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "node_modules/regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "dependencies": { @@ -51421,8 +51365,7 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -54811,10 +54754,8 @@ "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "dependencies": { - "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" + "neo-async": "^2.5.0" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -55727,7 +55668,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -74019,9 +73959,9 @@ } }, "@testing-library/user-event": { - "version": "12.7.0", - "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.7.0.tgz", - "integrity": "sha512-KzRM1KNDoW8pJ2HTenrUhTjV6wJMHvWAagDs8DDrYSWz6y4PN+K2jSvlm2bMHWNRk5LTJPo9jqIjNjJ3FlqXNw==", + "version": "12.8.3", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz", + "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5" @@ -78896,7 +78836,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -82095,7 +82035,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } @@ -86154,7 +86094,6 @@ "version": "4.5.2", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz", "integrity": "sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==", - "dev": true, "requires": { "@types/html-minifier-terser": "^5.0.0", "@types/tapable": "^1.0.5", @@ -92156,7 +92095,7 @@ }, "json5": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" }, "jsonfile": { @@ -94636,7 +94575,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -98584,26 +98523,6 @@ } } }, - "chokidar": { - "version": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - } - }, - "cli-width": { - "version": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true - }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -100326,7 +100245,7 @@ }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { @@ -100337,13 +100256,13 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 1a00dbe884bc3..3cbb2b9869b77 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -203,7 +203,7 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.0", "@testing-library/react-hooks": "^5.0.3", - "@testing-library/user-event": "^12.7.0", + "@testing-library/user-event": "^12.8.3", "@types/classnames": "^2.2.10", "@types/dom-to-image": "^2.6.0", "@types/enzyme": "^3.10.5",