From 27c86e71e89ae7d897af690e6a11b61a0eea38ae Mon Sep 17 00:00:00 2001 From: Thijs Louisse Date: Mon, 30 May 2022 17:27:14 +0200 Subject: [PATCH] chore: keep prod dependencies limited and simple --- .changeset/little-melons-lay.md | 2 +- .changeset/nervous-cobras-know.md | 2 +- packages/accordion/package.json | 3 +-- packages/accordion/src/LionAccordion.js | 4 ++-- packages/collapsible/package.json | 3 +-- packages/collapsible/src/LionCollapsible.js | 3 +-- packages/core/index.d.ts | 1 + packages/core/index.js | 1 + packages/{helpers/uuid => core/src}/uuid.js | 2 +- packages/form-core/package.json | 1 - packages/form-core/src/FormControlMixin.js | 3 +-- packages/helpers/index.js | 1 - packages/listbox/package.json | 3 +-- packages/listbox/src/ListboxMixin.js | 3 +-- packages/switch/package.json | 3 +-- packages/tabs/package.json | 3 +-- packages/tabs/src/LionTabs.js | 3 +-- 17 files changed, 16 insertions(+), 25 deletions(-) rename packages/{helpers/uuid => core/src}/uuid.js (78%) diff --git a/.changeset/little-melons-lay.md b/.changeset/little-melons-lay.md index 30a29e3a2..4c8a346bb 100644 --- a/.changeset/little-melons-lay.md +++ b/.changeset/little-melons-lay.md @@ -2,4 +2,4 @@ '@lion/input-tel': patch --- -Make use of awsome-phonenumber, remove local copy +Make use of awesome-phonenumber, remove local copy diff --git a/.changeset/nervous-cobras-know.md b/.changeset/nervous-cobras-know.md index a0c2252c9..0129ad1c1 100644 --- a/.changeset/nervous-cobras-know.md +++ b/.changeset/nervous-cobras-know.md @@ -1,5 +1,5 @@ --- -'@lion/helpers': minor +'@lion/core': patch '@lion/accordion': patch '@lion/collapsible': patch '@lion/form-core': patch diff --git a/packages/accordion/package.json b/packages/accordion/package.json index 60a6b0040..ce2f48b53 100644 --- a/packages/accordion/package.json +++ b/packages/accordion/package.json @@ -36,8 +36,7 @@ "lion-accordion.js" ], "dependencies": { - "@lion/core": "^0.22.0", - "@lion/helpers": "^0.11.0" + "@lion/core": "^0.22.0" }, "keywords": [ "accordion", diff --git a/packages/accordion/src/LionAccordion.js b/packages/accordion/src/LionAccordion.js index 22593c582..5d762c0e8 100644 --- a/packages/accordion/src/LionAccordion.js +++ b/packages/accordion/src/LionAccordion.js @@ -1,6 +1,6 @@ /* eslint-disable class-methods-use-this */ -import { LitElement, css, html } from '@lion/core'; -import { uuid } from '@lion/helpers'; +import { LitElement, css, html, uuid } from '@lion/core'; + /** * @typedef {Object} StoreEntry * @property {string} uid Unique ID for the entry diff --git a/packages/collapsible/package.json b/packages/collapsible/package.json index eb6779ff0..15fd7de9c 100644 --- a/packages/collapsible/package.json +++ b/packages/collapsible/package.json @@ -38,8 +38,7 @@ "demo/custom-collapsible.js" ], "dependencies": { - "@lion/core": "^0.22.0", - "@lion/helpers": "^0.11.0" + "@lion/core": "^0.22.0" }, "keywords": [ "collapsible", diff --git a/packages/collapsible/src/LionCollapsible.js b/packages/collapsible/src/LionCollapsible.js index b228e2935..31ddb5d7b 100644 --- a/packages/collapsible/src/LionCollapsible.js +++ b/packages/collapsible/src/LionCollapsible.js @@ -1,5 +1,4 @@ -import { LitElement, html, css } from '@lion/core'; -import { uuid } from '@lion/helpers'; +import { LitElement, html, css, uuid } from '@lion/core'; /** * `LionCollapsible` is a class for custom collapsible element (`` web component). * diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts index deb55a0df..212b498f1 100644 --- a/packages/core/index.d.ts +++ b/packages/core/index.d.ts @@ -85,3 +85,4 @@ export { SlotMixin } from './src/SlotMixin.js'; export { UpdateStylesMixin } from './src/UpdateStylesMixin.js'; export { browserDetection } from './src/browserDetection.js'; export { EventTargetShim } from './src/EventTargetShim.js'; +export { uuid } from './src/uuid.js'; diff --git a/packages/core/index.js b/packages/core/index.js index 2105742b6..def37febf 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -76,3 +76,4 @@ export { SlotMixin } from './src/SlotMixin.js'; export { UpdateStylesMixin } from './src/UpdateStylesMixin.js'; export { browserDetection } from './src/browserDetection.js'; export { EventTargetShim } from './src/EventTargetShim.js'; +export { uuid } from './src/uuid.js'; diff --git a/packages/helpers/uuid/uuid.js b/packages/core/src/uuid.js similarity index 78% rename from packages/helpers/uuid/uuid.js rename to packages/core/src/uuid.js index f9e92cee3..cc70b5f30 100644 --- a/packages/helpers/uuid/uuid.js +++ b/packages/core/src/uuid.js @@ -4,6 +4,6 @@ * @return {string} unique id */ export function uuid(prefix = '') { - const elementName = prefix.length > 1 ? `${prefix}-` : ''; + const elementName = prefix.length > 0 ? `${prefix}-` : ''; return `${elementName}${Math.random().toString(36).substr(2, 10)}`; } diff --git a/packages/form-core/package.json b/packages/form-core/package.json index 7b492fe71..3a67dd001 100644 --- a/packages/form-core/package.json +++ b/packages/form-core/package.json @@ -40,7 +40,6 @@ ], "dependencies": { "@lion/core": "^0.22.0", - "@lion/helpers": "^0.11.0", "@lion/localize": "^0.24.0" }, "keywords": [ diff --git a/packages/form-core/src/FormControlMixin.js b/packages/form-core/src/FormControlMixin.js index a8a2b7ecc..9215f5e4a 100644 --- a/packages/form-core/src/FormControlMixin.js +++ b/packages/form-core/src/FormControlMixin.js @@ -1,5 +1,4 @@ -import { css, dedupeMixin, html, nothing, SlotMixin, DisabledMixin } from '@lion/core'; -import { uuid } from '@lion/helpers'; +import { css, dedupeMixin, html, nothing, SlotMixin, DisabledMixin, uuid } from '@lion/core'; import { getAriaElementsInRightDomOrder } from './utils/getAriaElementsInRightDomOrder.js'; import { Unparseable } from './validate/Unparseable.js'; import { FormRegisteringMixin } from './registration/FormRegisteringMixin.js'; diff --git a/packages/helpers/index.js b/packages/helpers/index.js index 286bf00ee..b00e4c480 100644 --- a/packages/helpers/index.js +++ b/packages/helpers/index.js @@ -1,7 +1,6 @@ // Utilities export { renderLitAsNode } from './renderLitAsNode/src/renderLitAsNode.js'; export { sortEachDepth } from './sortEachDepth/src/sortEachDepth.js'; -export { uuid } from './uuid/uuid.js'; // Components export { SbActionLogger } from './sb-action-logger/src/SbActionLogger.js'; diff --git a/packages/listbox/package.json b/packages/listbox/package.json index 9c7e2a50c..9ba9fa3b9 100644 --- a/packages/listbox/package.json +++ b/packages/listbox/package.json @@ -40,8 +40,7 @@ ], "dependencies": { "@lion/core": "^0.22.0", - "@lion/form-core": "^0.17.1", - "@lion/helpers": "^0.11.0" + "@lion/form-core": "^0.17.1" }, "keywords": [ "form", diff --git a/packages/listbox/src/ListboxMixin.js b/packages/listbox/src/ListboxMixin.js index 090bbb01a..0643c74fb 100644 --- a/packages/listbox/src/ListboxMixin.js +++ b/packages/listbox/src/ListboxMixin.js @@ -1,6 +1,5 @@ -import { css, dedupeMixin, html, ScopedElementsMixin, SlotMixin } from '@lion/core'; +import { css, dedupeMixin, html, ScopedElementsMixin, SlotMixin, uuid } from '@lion/core'; import { ChoiceGroupMixin, FormControlMixin, FormRegistrarMixin } from '@lion/form-core'; -import { uuid } from '@lion/helpers'; import { LionOptions } from './LionOptions.js'; // TODO: extract ListNavigationWithActiveDescendantMixin that can be reused in [role="menu"] diff --git a/packages/switch/package.json b/packages/switch/package.json index be776a3b3..49e073b8a 100644 --- a/packages/switch/package.json +++ b/packages/switch/package.json @@ -39,8 +39,7 @@ ], "dependencies": { "@lion/core": "^0.22.0", - "@lion/form-core": "^0.17.1", - "@lion/helpers": "^0.11.0" + "@lion/form-core": "^0.17.1" }, "keywords": [ "lion", diff --git a/packages/tabs/package.json b/packages/tabs/package.json index b6bd42699..b11dd7ac3 100644 --- a/packages/tabs/package.json +++ b/packages/tabs/package.json @@ -36,8 +36,7 @@ "lion-tabs.js" ], "dependencies": { - "@lion/core": "^0.22.0", - "@lion/helpers": "^0.11.0" + "@lion/core": "^0.22.0" }, "keywords": [ "lion", diff --git a/packages/tabs/src/LionTabs.js b/packages/tabs/src/LionTabs.js index 2918a2c22..8a9757dab 100644 --- a/packages/tabs/src/LionTabs.js +++ b/packages/tabs/src/LionTabs.js @@ -1,5 +1,4 @@ -import { css, html, LitElement } from '@lion/core'; -import { uuid } from '@lion/helpers'; +import { css, html, LitElement, uuid } from '@lion/core'; /** * @typedef {Object} StoreEntry