Skip to content

Commit

Permalink
Merge branch 'main' into F/perf/exclude-discarded-tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
fregante authored Oct 10, 2023
2 parents 4a103ed + 9bf6ecd commit 59d1db9
Show file tree
Hide file tree
Showing 54 changed files with 1,873 additions and 925 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ module.exports = {
extends: ["pixiebrix/server"],
rules: {
"import/no-restricted-paths": "off",
"@typescript-eslint/no-non-null-assertion": "off", // TODO: Move to shared config
},
},
{
Expand Down
8 changes: 5 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ updates:
open-pull-requests-limit: 30
assignees:
- grahamlangford
ignore:
# Update it manually instead https://github.com/pixiebrix/pixiebrix-extension/issues/4436
- dependency-name: "@storybook/*"
groups:
storybook:
patterns:
- "@storybook/*"
- "storybook"
- package-ecosystem: github-actions
directory: /
schedule:
Expand Down
1,090 changes: 779 additions & 311 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@apidevtools/json-schema-ref-parser": "^10.1.0",
"@atlaskit/tree": "^8.8.6",
"@cfworker/json-schema": "^1.12.7",
"@datadog/browser-rum": "^4.50.0",
"@datadog/browser-rum": "^4.50.1",
"@emotion/react": "^11.11.1",
"@floating-ui/dom": "^1.5.3",
"@fortawesome/fontawesome-svg-core": "1.2.36",
Expand All @@ -43,20 +43,20 @@
"@fortawesome/react-fontawesome": "^0.1.14",
"@mozilla/readability": "^0.4.4",
"@pixiebrix/jq-web": "^0.5.1",
"@reduxjs/toolkit": "^1.9.6",
"@reduxjs/toolkit": "^1.9.7",
"@rjsf/bootstrap-4": "^4.2.3",
"@rjsf/core": "^4.2.3",
"@types/use-sync-external-store": "^0.0.4",
"@uipath/robot": "1.3.1",
"@vespaiach/axios-fetch-adapter": "^0.3.1",
"@xobotyi/scrollbar-width": "^1.9.5",
"ace-builds": "^1.28.0",
"ace-builds": "^1.29.0",
"autocompleter": "^9.1.0",
"axios": "^0.27.2",
"bootstrap": "^4.6.0",
"bootstrap-icons": "^1.11.1",
"bootstrap-switch-button-react": "^1.2.0",
"canvas-confetti": "^1.6.1",
"canvas-confetti": "^1.9.0",
"chrono-node": "^2.7.0",
"classnames": "^2.3.1",
"connected-react-router": "^6.9.1",
Expand All @@ -68,8 +68,8 @@
"downloadjs": "^1.4.7",
"escape-string-regexp": "^5.0.0",
"eslint-plugin-unicorn": "^48.0.1",
"exifreader": "^4.13.0",
"export-to-csv": "^1.0.0",
"exifreader": "^4.13.2",
"export-to-csv": "^1.2.0",
"filenamify": "^6.0.0",
"fit-textarea": "^3.0.0",
"formik": "^2.4.5",
Expand Down Expand Up @@ -97,7 +97,7 @@
"kbar": "^0.1.0-beta.43",
"lodash-es": "^4.17.21",
"mark.js": "^8.11.1",
"marked": "^9.0.3",
"marked": "^9.1.0",
"memoize-one": "^6.0.0",
"mustache": "^4.2.0",
"nunjucks": "^3.2.4",
Expand Down Expand Up @@ -130,7 +130,7 @@
"react-redux": "^7.2.4",
"react-router": "5.3.4",
"react-router-dom": "^5.3.4",
"react-select": "^5.7.5",
"react-select": "^5.7.7",
"react-select-virtualized": "^5.5.0",
"react-shadow": "^20.4.0",
"react-spinners": "^0.13.0",
Expand Down Expand Up @@ -175,7 +175,7 @@
"devDependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.36",
"@shopify/jest-dom-mocks": "^5.0.0",
"@sindresorhus/tsconfig": "^4.0.0",
"@sindresorhus/tsconfig": "^5.0.0",
"@sinonjs/fake-timers": "^11.1.0",
"@storybook/addon-actions": "^6.5.15",
"@storybook/addon-essentials": "^6.5.15",
Expand All @@ -185,7 +185,7 @@
"@storybook/manager-webpack5": "^6.5.15",
"@storybook/react": "^6.5.15",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.3.91",
"@swc/core": "^1.3.92",
"@swc/jest": "^0.2.29",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^12.1.5",
Expand All @@ -203,7 +203,7 @@
"@types/iframe-resizer": "^3.5.10",
"@types/intro.js": "^5.1.2",
"@types/jest": "^29.5.5",
"@types/jquery": "^3.5.20",
"@types/jquery": "^3.5.22",
"@types/js-beautify": "^1.14.1",
"@types/js-cookie": "^3.0.4",
"@types/js-yaml": "^4.0.6",
Expand All @@ -230,7 +230,7 @@
"@types/redux-state-sync": "^3.1.6",
"@types/semver": "^7.5.3",
"@types/sinonjs__fake-timers": "^8.1.3",
"@types/uuid": "^9.0.4",
"@types/uuid": "^9.0.5",
"@types/webextension-polyfill": "^0.10.4",
"@types/webpack": "^5.28.3",
"@types/webpack-env": "^1.18.2",
Expand All @@ -244,15 +244,15 @@
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^3.4.1",
"dotenv": "^16.3.1",
"eslint": "^8.50.0",
"eslint-config-pixiebrix": "^0.27.2",
"eslint": "^8.51.0",
"eslint-config-pixiebrix": "^0.28.1",
"eslint-config-pixiebrix-extension": "file:./eslint-plugin-pixiebrix-extension",
"eslint-plugin-pixiebrix-extension": "file:./eslint-plugin-pixiebrix-extension",
"fake-indexeddb": "^4.0.2",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-extended": "^4.0.1",
"jest-extended": "^4.0.2",
"jest-location-mock": "^2.0.0",
"jest-webextension-mock": "^3.8.9",
"jsdom": "^22.1.0",
Expand All @@ -261,7 +261,7 @@
"mini-css-extract-plugin": "^2.6.1",
"mockdate": "^3.0.5",
"msw": "^1.3.2",
"msw-storybook-addon": "^1.8.0",
"msw-storybook-addon": "^1.9.0",
"node-polyfill-webpack-plugin": "^2.0.0",
"raw-loader": "^4.0.1",
"react-docgen-typescript-plugin": "^1.0.5",
Expand All @@ -271,8 +271,8 @@
"style-loader": "^3.3.3",
"svg-inline-loader": "^0.8.2",
"terser-webpack-plugin": "^5.3.9",
"ts-loader": "^9.4.4",
"type-fest": "^4.3.3",
"ts-loader": "^9.5.0",
"type-fest": "^4.4.0",
"typescript": "^5.1.6",
"typescript-plugin-css-modules": "^5.0.1",
"webpack": "^5.88.2",
Expand Down
11 changes: 5 additions & 6 deletions src/__mocks__/@/telemetry/reportEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@

import { JsonObject } from "type-fest";

export default function reportEvent(
event: string,
data: JsonObject = {}
): void {
console.debug(...arguments);
}
const reportEvent = jest.fn((event: string, data: JsonObject = {}) => {
console.debug({ event, data });
});

export default reportEvent;
3 changes: 2 additions & 1 deletion src/analysis/analysisVisitors/formBrickAnalysis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { type BrickConfig, type BrickPosition } from "@/bricks/types";
import { type VisitBlockExtra } from "@/bricks/PipelineVisitor";
import { FORM_MODAL_ID } from "@/pageEditor/fields/FormModalOptions";
import { AnnotationType } from "@/types/annotationTypes";
import { PipelineFlavor } from "@/pageEditor/pageEditorTypes";

class FormBrickAnalysis extends AnalysisVisitorABC {
get id() {
Expand All @@ -40,7 +41,7 @@ class FormBrickAnalysis extends AnalysisVisitorABC {
// The other direction (not placing the renderer form in an action, is already handled by brickTypeAnalysis.ts)

if (
extra.pipelineFlavor === "noEffect" &&
extra.pipelineFlavor === PipelineFlavor.NoEffect &&
blockConfig.id === FORM_MODAL_ID
) {
this.annotations.push({
Expand Down
Loading

0 comments on commit 59d1db9

Please sign in to comment.