Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update @trivago/prettier-plugin-sort-imports to fix babel vulnerable to arbitrary code execution #1003

Merged
merged 3 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 30 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/configurations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"author": "LSEG",
"license": "Apache-2.0",
"peerDependencies": {
"@trivago/prettier-plugin-sort-imports": "4.1.0",
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
"@typescript-eslint/eslint-plugin": "^5.37.0",
"@typescript-eslint/parser": "^5.37.0",
"eslint": "^8.49.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/configurations/prettier-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"^@refinitiv-ui/core",
"^@refinitiv-ui/elements",
"^@refinitiv-ui/(.*)$",
"^[./]",
"<TS_TYPES>"
"^[./]"
],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/decorators/custom-element.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import type { ElementConstructor } from '../interfaces/ElementConstructor';
import { CustomStyleRegistry } from '../registries/CustomStyleRegistry.js';
import { ElementRegistry } from '../registries/ElementRegistry.js';

import type { ElementConstructor } from '../interfaces/ElementConstructor';

interface ElementOptions {
/**
* External theme is required for this element.
Expand Down
5 changes: 2 additions & 3 deletions packages/core/src/elements/BasicElement.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { CSSResultArray, LitElement, unsafeCSS } from 'lit';

import { property } from '../decorators/property.js';
import type { StyleInfo } from '../interfaces/StyleInfo';
import { ElementRegistry } from '../registries/ElementRegistry.js';
import { FocusRegistry } from '../registries/FocusRegistry.js';
import type { CSSValue } from '../types/base';
import { FocusableHelper } from '../utils/focusableHelper.js';
import { BasicElementSymbol } from '../utils/helpers.js';
import { ShadyCSS } from '../utils/shadyStyles.js';

import type { StyleInfo } from '../interfaces/StyleInfo';
import type { CSSValue } from '../types/base';

const CSS_VARIABLE_REGEXP = /^--\w/;
const CSS_VARIABLE_REPLACE_REGEXP = /['"]([^'"]+?)['"]/g;
const NOTIFY_REGEXP = /([a-zA-Z])(?=[A-Z])/g;
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/elements/ControlElement.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { PropertyValues } from 'lit';

import { property } from '../decorators/property.js';
import type { ControlProperties as IControlProperties } from '../interfaces/ControlProperties';
import { WarningNotice } from '../notices/WarningNotice.js';
import { BasicElement } from './BasicElement.js';

import type { ControlProperties as IControlProperties } from '../interfaces/ControlProperties';
import type { PropertyValues } from 'lit';

/**
* Control element base class.
* Usually used for creating form-style elements.
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
* Element base classes
*/
import { BasicElement } from './elements/BasicElement.js';
import { CustomStyleRegistry } from './registries/CustomStyleRegistry.js';
import { NativeStyleRegistry } from './registries/NativeStyleRegistry.js';
import { global } from './utils/global.js';

/**
* Common interfaces
*/
import type { MultiValue } from './interfaces/MultiValue';
import type { StyleInfo } from './interfaces/StyleInfo';
import type { StyleMap } from './interfaces/StyleMap';
import { CustomStyleRegistry } from './registries/CustomStyleRegistry.js';
import { NativeStyleRegistry } from './registries/NativeStyleRegistry.js';
import type { FocusedChangedEvent } from './types/events';
import { global } from './utils/global.js';

/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/registries/ElementRegistry.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { DuplicateElementError } from '../errors/DuplicateElementError.js';
import type { ElementConstructor } from '../interfaces/ElementConstructor';
import { ready } from '../utils/elementReady.js';
import { CustomStyleRegistry } from './CustomStyleRegistry.js';

import type { ElementConstructor } from '../interfaces/ElementConstructor';

class ElementRegistrationItem {
creations = 0;
connections = 0;
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/registries/FocusRegistry.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { isBasicElement } from '../utils/helpers.js';

import type { BasicElement } from '../elements/BasicElement';
import type { FocusedChangedEvent } from '../types/events';
import { isBasicElement } from '../utils/helpers.js';

const register = new Set<BasicElement>(); /* Track all active elements */
const focusedMap = new Map<BasicElement, 'visible' | ''>(); /* Track all focused elements */
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/utils/focusableHelper.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import type { BasicElement } from '../elements/BasicElement';
import { isBasicElement } from './helpers.js';
import { matches } from './matches.js';

import type { BasicElement } from '../elements/BasicElement';

type DelegatedList = {
element: BasicElement;
children: HTMLElement[];
Expand Down
4 changes: 2 additions & 2 deletions packages/create-efx/template/test/efx-element.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { expect, fixture } from '@refinitiv-ui/test-helpers';
import '../src/efx-element.ts';
import '../themes/halo/dark';

describe('EfxElementTest', function() {
it('Label and DOM structure is correct', async function() {
describe('EfxElementTest', function () {
it('Label and DOM structure is correct', async function () {
const el = await fixture('<efx-element></efx-element>');
await expect(el).shadowDom.to.equalSnapshot({ ignoreAttributes: ['class', 'style'] });
expect(el.count).to.equal(0);
Expand Down
3 changes: 1 addition & 2 deletions packages/elements/src/autosuggest/helpers/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { uuid } from '@refinitiv-ui/utils/uuid.js';

import { updateElementContent } from './utils.js';

import type { AutosuggestItem, AutosuggestQuery, AutosuggestRenderer, Suggestion } from './types';
import { updateElementContent } from './utils.js';

/**
* Build item element from data object
Expand Down
5 changes: 2 additions & 3 deletions packages/elements/src/autosuggest/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ import { TranslateDirective, TranslatePropertyKey, translate } from '@refinitiv-
import { AnimationTaskRunner, TimeoutTaskRunner } from '@refinitiv-ui/utils/async.js';
import { isIE, isMobile } from '@refinitiv-ui/utils/browser.js';

import type { TapEvent } from '../events';
import '../item/index.js';
import '../loader/index.js';
import { Overlay } from '../overlay/index.js';
import { VERSION } from '../version.js';
import { renderer } from './helpers/renderer.js';
import { escapeRegExp, itemHighlightable, queryWordSelect } from './helpers/utils.js';

import type { TapEvent } from '../events';
import type {
AutosuggestHighlightItemEvent,
AutosuggestHighlightable,
Expand All @@ -40,6 +38,7 @@ import type {
SuggestionsFetchRequestedEvent,
SuggestionsQueryEvent
} from './helpers/types';
import { escapeRegExp, itemHighlightable, queryWordSelect } from './helpers/utils.js';

export type {
AutosuggestTargetElement,
Expand Down
Loading
Loading