From ec9c79296fc289c5fe1dc330eadbcc852ee9c1df Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Thu, 2 May 2024 15:47:33 +0200 Subject: [PATCH 1/7] refactor: example repository to frameless --- .npmpackagejsonlintrc.json | 2 +- .stylelintrc.json | 10 +++++----- package.json | 8 ++++---- packages/components-css/package.json | 6 +++--- packages/components-react/package.json | 12 +++++------ packages/components-react/src/Button.tsx | 2 +- packages/storybook/config/preview.ts | 6 +++--- packages/storybook/package.json | 20 +++++++++---------- packages/storybook/src/css-button.stories.tsx | 8 ++++---- .../src/web-component-button.stories.tsx | 4 ++-- packages/web-components-react/package.json | 10 +++++----- packages/web-components-stencil/package.json | 12 +++++------ .../src/button/index.scss | 2 +- .../web-components-stencil/stencil.config.ts | 4 ++-- pnpm-lock.yaml | 18 ++++++++--------- proprietary/assets/package.json | 8 ++++---- proprietary/design-tokens/package.json | 10 +++++----- proprietary/font/package.json | 8 ++++---- 18 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.npmpackagejsonlintrc.json b/.npmpackagejsonlintrc.json index bcfdfae7..b0752fe6 100644 --- a/.npmpackagejsonlintrc.json +++ b/.npmpackagejsonlintrc.json @@ -34,7 +34,7 @@ "scripts-type": "error", "valid-values-author": "off", "valid-values-license": ["error", ["EUPL-1.2"]], - "valid-values-name-scope": ["error", ["@example"]], + "valid-values-name-scope": ["error", ["@frameless"]], "valid-values-private": "off", "version-format": "error", "version-type": "error" diff --git a/.stylelintrc.json b/.stylelintrc.json index 0b07c134..1151b668 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -8,13 +8,13 @@ "scss/at-rule-no-unknown": true, "scss/dollar-variable-default": true, "scss/dollar-variable-first-in-block": [true, { "ignore": ["comments", "imports"] }], - "scss/dollar-variable-pattern": "^(example|utrecht)-[a-z0-9-]+$", - "scss/percent-placeholder-pattern": "^(example|utrecht)-[a-z0-9-]+$", + "scss/dollar-variable-pattern": "^(frameless)-[a-z0-9-]+$", + "scss/percent-placeholder-pattern": "^(frameless)-[a-z0-9-]+$", "scss/operator-no-newline-after": null, "scss/at-extend-no-missing-placeholder": null, - "custom-property-pattern": "^_?(example|denhaag|utrecht)-[a-z0-9-]+$", - "selector-class-pattern": "^(example|denhaag|utrecht)-[a-z0-9_-]+$", - "keyframes-name-pattern": "^(example|utrecht)-[a-z0-9-]+$", + "custom-property-pattern": "^_?(frameless)-[a-z0-9-]+$", + "selector-class-pattern": "^(frameless)-[a-z0-9_-]+$", + "keyframes-name-pattern": "^(frameless)-[a-z0-9-]+$", "at-rule-no-unknown": null, "block-no-empty": [true], "color-no-invalid-hex": [true], diff --git a/package.json b/package.json index 5d72b555..2aa73d0a 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", - "description": "Design system based on the NL Design System architecture", + "author": "Frameless", + "description": "Frameless company website + Storybook", "license": "EUPL-1.2", - "name": "@example/design-system", + "name": "@frameless/design-system", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "engines": { diff --git a/packages/components-css/package.json b/packages/components-css/package.json index 617f6174..54cc97a0 100644 --- a/packages/components-css/package.json +++ b/packages/components-css/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "CSS Components for a design system based on the NL Design System architecture", "license": "EUPL-1.2", - "name": "@example/components-css", + "name": "@frameless/components-css", "keywords": [ - "nl-design-system" + "frameless" ], "private": true } diff --git a/packages/components-react/package.json b/packages/components-react/package.json index 2049d3e7..749127d7 100644 --- a/packages/components-react/package.json +++ b/packages/components-react/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", - "description": "React component library for the Example repository, based on the NL Design System architecture", + "author": "Frameless", + "description": "React component library for the Frameless repository, based on the NL Design System architecture", "license": "EUPL-1.2", - "name": "@example/components-react", + "name": "@frameless/components-react", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "publishConfig": { @@ -14,7 +14,7 @@ }, "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example-community.git" + "url": "git@github.com:frameless/website.git" }, "scripts": { "build": "npm-run-all clean build:**", @@ -40,7 +40,7 @@ "@babel/preset-react": "7.24.1", "@babel/preset-typescript": "7.24.1", "@babel/runtime": "7.24.4", - "@example/components-css": "workspace:*", + "@frameless/components-css": "workspace:*", "@rollup/plugin-babel": "6.0.4", "@rollup/plugin-commonjs": "25.0.7", "@rollup/plugin-node-resolve": "15.2.3", diff --git a/packages/components-react/src/Button.tsx b/packages/components-react/src/Button.tsx index e426e226..27ed73b1 100644 --- a/packages/components-react/src/Button.tsx +++ b/packages/components-react/src/Button.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; import { ButtonHTMLAttributes, ForwardedRef, forwardRef, PropsWithChildren } from 'react'; -import '@example/components-css/button/index.scss'; +import '@frameless/components-css/button/index.scss'; export type ButtonProps = ButtonHTMLAttributes; diff --git a/packages/storybook/config/preview.ts b/packages/storybook/config/preview.ts index 38154050..8bd3f9b0 100644 --- a/packages/storybook/config/preview.ts +++ b/packages/storybook/config/preview.ts @@ -1,6 +1,6 @@ -import '@example/design-tokens/dist/index.css'; -import '@example/font/src/index.scss'; -import { defineCustomElements } from '@example/web-components-stencil/loader/index.js'; +import '@frameless/design-tokens/dist/index.css'; +import '@frameless/font/src/index.scss'; +import { defineCustomElements } from '@frameless/web-components-stencil/loader/index.js'; import type { Preview } from '@storybook/react'; import { ParametersArgsDecorator } from './ParametersArgsDecorator'; diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 71cb0b90..bc96fcc7 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -1,16 +1,16 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "Storybook based on the NL Design System architecture", "license": "EUPL-1.2", - "name": "@example/storybook", + "name": "@frameless/storybook", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:frameless/website.git" }, "scripts": { "build": "storybook build --output-dir dist/ --config-dir config/", @@ -19,12 +19,12 @@ "storybook": "storybook dev --config-dir config/ --port 6006" }, "devDependencies": { - "@example/assets": "workspace:*", - "@example/components-css": "workspace:*", - "@example/design-tokens": "workspace:*", - "@example/font": "workspace:*", - "@example/web-components-react": "workspace:*", - "@example/web-components-stencil": "workspace:*", + "@frameless/assets": "workspace:*", + "@frameless/components-css": "workspace:*", + "@frameless/design-tokens": "workspace:*", + "@frameless/font": "workspace:*", + "@frameless/web-components-react": "workspace:*", + "@frameless/web-components-stencil": "workspace:*", "@storybook/addon-a11y": "8.0.9", "@storybook/addon-actions": "8.0.9", "@storybook/addon-docs": "8.0.9", diff --git a/packages/storybook/src/css-button.stories.tsx b/packages/storybook/src/css-button.stories.tsx index ec624c19..6912a51d 100644 --- a/packages/storybook/src/css-button.stories.tsx +++ b/packages/storybook/src/css-button.stories.tsx @@ -1,13 +1,13 @@ /* @license CC0-1.0 */ -import readme from '@example/components-css/button/README.md?raw'; +import readme from '@frameless/components-css/button/README.md?raw'; import type { Meta, StoryObj } from '@storybook/react'; import { PropsWithChildren } from 'react'; -import '@example/components-css/button/index.scss'; +import '@frameless/components-css/button/index.scss'; const Button = ({ children }: PropsWithChildren<{}>) => ( - ); diff --git a/packages/storybook/src/web-component-button.stories.tsx b/packages/storybook/src/web-component-button.stories.tsx index adffa951..c9c8296f 100644 --- a/packages/storybook/src/web-component-button.stories.tsx +++ b/packages/storybook/src/web-component-button.stories.tsx @@ -1,7 +1,7 @@ /* @license CC0-1.0 */ -import readme from '@example/components-css/button/README.md?raw'; -import { ExampleButton } from '@example/web-components-react'; +import readme from '@frameless/components-css/button/README.md?raw'; +import { ExampleButton } from '@frameless/web-components-react'; import type { Meta, StoryObj } from '@storybook/react'; import { PropsWithChildren } from 'react'; diff --git a/packages/web-components-react/package.json b/packages/web-components-react/package.json index b906600b..40f1efe6 100644 --- a/packages/web-components-react/package.json +++ b/packages/web-components-react/package.json @@ -1,16 +1,16 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "React web components bundle based on the NL Design System architecture", "license": "EUPL-1.2", - "name": "@example/web-components-react", + "name": "@frameless/web-components-react", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:nl-design-system/frameless.git" }, "sideEffects": false, "scripts": { @@ -28,7 +28,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "@example/web-components-stencil": "workspace:*", + "@frameless/web-components-stencil": "workspace:*", "@types/node": "20.12.7", "@types/react": "18.2.75", "@types/react-dom": "18.2.24", diff --git a/packages/web-components-stencil/package.json b/packages/web-components-stencil/package.json index 6d24660e..8e55eab1 100644 --- a/packages/web-components-stencil/package.json +++ b/packages/web-components-stencil/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "Stencil web components bundle based on the NL Design System architecture", "license": "EUPL-1.2", - "name": "@example/web-components-stencil", + "name": "@frameless/web-components-stencil", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "main": "./dist/index.cjs.js", @@ -13,14 +13,14 @@ "types": "./dist/types/components.d.ts", "collection": "./dist/collection/collection-manifest.json", "collection:main": "./dist/collection/collection-manifest.json", - "unpkg": "./dist/example/example.esm.js", + "unpkg": "./dist/frameless/frameless.esm.js", "files": [ "dist/", "loader/" ], "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:frameless/website.git" }, "scripts": { "build": "npm-run-all clean build:**", @@ -33,7 +33,7 @@ "generate": "stencil generate" }, "devDependencies": { - "@example/components-css": "workspace:*", + "@frameless/components-css": "workspace:*", "@stencil/react-output-target": "0.5.3", "@stencil/sass": "3.0.11", "@types/jest": "29.5.12", diff --git a/packages/web-components-stencil/src/button/index.scss b/packages/web-components-stencil/src/button/index.scss index 5c7ca885..1a6e8b90 100644 --- a/packages/web-components-stencil/src/button/index.scss +++ b/packages/web-components-stencil/src/button/index.scss @@ -1 +1 @@ -@import "~@example/components-css/button/index"; +@import "~@frameless/components-css/button/index"; diff --git a/packages/web-components-stencil/stencil.config.ts b/packages/web-components-stencil/stencil.config.ts index 4710d0b1..c4436793 100644 --- a/packages/web-components-stencil/stencil.config.ts +++ b/packages/web-components-stencil/stencil.config.ts @@ -3,7 +3,7 @@ import { reactOutputTarget } from '@stencil/react-output-target'; import { sass } from '@stencil/sass'; export const config: Config = { - namespace: 'example', + namespace: 'frameless', srcDir: './src/', outputTargets: [ { @@ -19,7 +19,7 @@ export const config: Config = { serviceWorker: null, // disable service workers }, reactOutputTarget({ - componentCorePackage: '@example/web-components-stencil', + componentCorePackage: '@frameless/web-components-stencil', proxiesFile: '../web-components-react/src/components.ts', }), ], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d049973..31b1e33a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,7 +114,7 @@ importers: '@babel/runtime': specifier: 7.24.4 version: 7.24.4 - '@example/components-css': + '@frameless/components-css': specifier: workspace:* version: link:../components-css '@rollup/plugin-babel': @@ -213,22 +213,22 @@ importers: packages/storybook: devDependencies: - '@example/assets': + '@frameless/assets': specifier: workspace:* version: link:../../proprietary/assets - '@example/components-css': + '@frameless/components-css': specifier: workspace:* version: link:../components-css - '@example/design-tokens': + '@frameless/design-tokens': specifier: workspace:* version: link:../../proprietary/design-tokens - '@example/font': + '@frameless/font': specifier: workspace:* version: link:../../proprietary/font - '@example/web-components-react': + '@frameless/web-components-react': specifier: workspace:* version: link:../web-components-react - '@example/web-components-stencil': + '@frameless/web-components-stencil': specifier: workspace:* version: link:../web-components-stencil '@storybook/addon-a11y': @@ -282,7 +282,7 @@ importers: packages/web-components-react: devDependencies: - '@example/web-components-stencil': + '@frameless/web-components-stencil': specifier: workspace:* version: link:../web-components-stencil '@types/node': @@ -313,7 +313,7 @@ importers: specifier: 4.15.0 version: 4.15.0 devDependencies: - '@example/components-css': + '@frameless/components-css': specifier: workspace:* version: link:../components-css '@stencil/react-output-target': diff --git a/proprietary/assets/package.json b/proprietary/assets/package.json index 0bbe6ab8..7635b0c2 100644 --- a/proprietary/assets/package.json +++ b/proprietary/assets/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "Assets", "license": "SEE LICENSE IN LICENSE.md", - "name": "@example/assets", + "name": "@frameless/assets", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "publishConfig": { @@ -14,6 +14,6 @@ "files": [], "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:frameless/website.git" } } diff --git a/proprietary/design-tokens/package.json b/proprietary/design-tokens/package.json index a038082d..1628d55c 100644 --- a/proprietary/design-tokens/package.json +++ b/proprietary/design-tokens/package.json @@ -1,11 +1,11 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", - "description": "Example design tokens", + "author": "Frameless", + "description": "Frameless design tokens", "license": "SEE LICENSE IN LICENSE.md", - "name": "@example/design-tokens", + "name": "@frameless/design-tokens", "keywords": [ - "nl-design-system" + "frameless" ], "private": false, "publishConfig": { @@ -13,7 +13,7 @@ }, "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:frameless/website.git" }, "scripts": { "clean": "rimraf dist/", diff --git a/proprietary/font/package.json b/proprietary/font/package.json index 75928a84..8b094fae 100644 --- a/proprietary/font/package.json +++ b/proprietary/font/package.json @@ -1,12 +1,12 @@ { "version": "1.0.0-alpha.0", - "author": "Community for NL Design System", + "author": "Frameless", "description": "Font assets", "license": "SEE LICENSE IN LICENSE.md", - "name": "@example/font", + "name": "@frameless/font", "main": "dist/index.css", "keywords": [ - "nl-design-system" + "frameless" ], "private": true, "publishConfig": { @@ -17,6 +17,6 @@ ], "repository": { "type": "git+ssh", - "url": "git@github.com:nl-design-system/example.git" + "url": "git@github.com:frameless/website.git" } } From 87354572dce01a2aa039560fdcf92a5e2e75fb79 Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Fri, 3 May 2024 10:09:52 +0200 Subject: [PATCH 2/7] refactor: some additional replacements of example to frameless --- packages/components-css/button/README.md | 2 +- packages/components-css/button/index.scss | 6 +++--- packages/components-react/src/Button.tsx | 2 +- packages/storybook/config/ParametersArgsDecorator.tsx | 2 +- packages/storybook/src/css-button.stories.tsx | 2 +- packages/storybook/src/documentation/introduction.mdx | 2 +- packages/storybook/src/documentation/license.mdx | 2 +- packages/storybook/src/documentation/notice.mdx | 2 +- packages/storybook/src/web-component-button.stories.tsx | 6 +++--- packages/web-components-stencil/src/button/stencil.tsx | 6 +++--- .../design-tokens/src/brand/example/color.tokens.json | 2 +- .../design-tokens/src/common/example/focus.tokens.json | 2 +- .../design-tokens/src/components/example/button.tokens.json | 6 +++--- proprietary/design-tokens/style-dictionary.config.json | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/components-css/button/README.md b/packages/components-css/button/README.md index d616c0b5..393f1ebf 100644 --- a/packages/components-css/button/README.md +++ b/packages/components-css/button/README.md @@ -1,3 +1,3 @@ -# Example Button component +# Frameless Button component diff --git a/packages/components-css/button/index.scss b/packages/components-css/button/index.scss index 080d8630..5201d484 100644 --- a/packages/components-css/button/index.scss +++ b/packages/components-css/button/index.scss @@ -3,10 +3,10 @@ * Copyright (c) 2021 Community for NL Design System */ -.example-button { - background-color: var(--example-button-background-color); +.frameless-button { + background-color: var(--frameless-button-background-color); border: 0; - color: var(--example-button-color); + color: var(--frameless-button-color); font-family: system-ui; font-size: 1rem; padding-block-end: 1ex; diff --git a/packages/components-react/src/Button.tsx b/packages/components-react/src/Button.tsx index 27ed73b1..ec755618 100644 --- a/packages/components-react/src/Button.tsx +++ b/packages/components-react/src/Button.tsx @@ -7,7 +7,7 @@ export type ButtonProps = ButtonHTMLAttributes; export const Button = forwardRef( ({ children, className, ...restProps }: PropsWithChildren, ref: ForwardedRef) => { return ( - ); diff --git a/packages/storybook/config/ParametersArgsDecorator.tsx b/packages/storybook/config/ParametersArgsDecorator.tsx index d7101c97..5922c58f 100644 --- a/packages/storybook/config/ParametersArgsDecorator.tsx +++ b/packages/storybook/config/ParametersArgsDecorator.tsx @@ -4,7 +4,7 @@ export const ParametersArgsDecorator: Decorator = (Story, context) => { context.parameters['args'] = context.args; return ( -
+
); diff --git a/packages/storybook/src/css-button.stories.tsx b/packages/storybook/src/css-button.stories.tsx index 6912a51d..3270f520 100644 --- a/packages/storybook/src/css-button.stories.tsx +++ b/packages/storybook/src/css-button.stories.tsx @@ -44,5 +44,5 @@ export default meta; type Story = StoryObj; export const Default: Story = { - name: 'Example button', + name: 'Frameless button', }; diff --git a/packages/storybook/src/documentation/introduction.mdx b/packages/storybook/src/documentation/introduction.mdx index 0eab6b89..cc7e5ce4 100644 --- a/packages/storybook/src/documentation/introduction.mdx +++ b/packages/storybook/src/documentation/introduction.mdx @@ -1,6 +1,6 @@ import { Markdown, Meta } from "@storybook/addon-docs"; import markdown from "./introduction.md?raw"; - + {markdown} diff --git a/packages/storybook/src/documentation/license.mdx b/packages/storybook/src/documentation/license.mdx index da189be4..6bc7ed06 100644 --- a/packages/storybook/src/documentation/license.mdx +++ b/packages/storybook/src/documentation/license.mdx @@ -1,6 +1,6 @@ import { Markdown, Meta } from "@storybook/addon-docs"; import markdown from "../../../../LICENSE.md?raw"; - + {markdown} diff --git a/packages/storybook/src/documentation/notice.mdx b/packages/storybook/src/documentation/notice.mdx index 48ed614d..f9c085b2 100644 --- a/packages/storybook/src/documentation/notice.mdx +++ b/packages/storybook/src/documentation/notice.mdx @@ -1,6 +1,6 @@ import { Markdown, Meta } from "@storybook/addon-docs"; import markdown from "../../../../NOTICE.md?raw"; - + {markdown} diff --git a/packages/storybook/src/web-component-button.stories.tsx b/packages/storybook/src/web-component-button.stories.tsx index c9c8296f..476d8ab0 100644 --- a/packages/storybook/src/web-component-button.stories.tsx +++ b/packages/storybook/src/web-component-button.stories.tsx @@ -1,11 +1,11 @@ /* @license CC0-1.0 */ import readme from '@frameless/components-css/button/README.md?raw'; -import { ExampleButton } from '@frameless/web-components-react'; +import { FramelessButton } from '@frameless/web-components-react'; import type { Meta, StoryObj } from '@storybook/react'; import { PropsWithChildren } from 'react'; -const Button = ({ children }: PropsWithChildren<{}>) => {children}; +const Button = ({ children }: PropsWithChildren<{}>) => {children}; const meta = { title: 'Web Component/Button', @@ -40,5 +40,5 @@ export default meta; type Story = StoryObj; export const Default: Story = { - name: 'Example button', + name: 'Frameless button', }; diff --git a/packages/web-components-stencil/src/button/stencil.tsx b/packages/web-components-stencil/src/button/stencil.tsx index f41b28d3..30f1d7aa 100644 --- a/packages/web-components-stencil/src/button/stencil.tsx +++ b/packages/web-components-stencil/src/button/stencil.tsx @@ -6,15 +6,15 @@ import { Component, h } from '@stencil/core'; @Component({ - tag: 'example-button', + tag: 'frameless-button', styleUrl: 'index.scss', shadow: true, }) export class Button { render() { return ( - diff --git a/proprietary/design-tokens/src/brand/example/color.tokens.json b/proprietary/design-tokens/src/brand/example/color.tokens.json index 3b0a6823..9821ae24 100644 --- a/proprietary/design-tokens/src/brand/example/color.tokens.json +++ b/proprietary/design-tokens/src/brand/example/color.tokens.json @@ -1,5 +1,5 @@ { - "example": { + "frameless": { "color": { "blue": { "50": { "value": "cornflowerblue" } diff --git a/proprietary/design-tokens/src/common/example/focus.tokens.json b/proprietary/design-tokens/src/common/example/focus.tokens.json index 9a2e9c87..fb6a0593 100644 --- a/proprietary/design-tokens/src/common/example/focus.tokens.json +++ b/proprietary/design-tokens/src/common/example/focus.tokens.json @@ -1,5 +1,5 @@ { - "example": { + "frameless": { "focus": { "outline-offset": { "value": "2px" } } diff --git a/proprietary/design-tokens/src/components/example/button.tokens.json b/proprietary/design-tokens/src/components/example/button.tokens.json index e22c0b10..59e7dd64 100644 --- a/proprietary/design-tokens/src/components/example/button.tokens.json +++ b/proprietary/design-tokens/src/components/example/button.tokens.json @@ -1,8 +1,8 @@ { - "example": { + "frameless": { "button": { - "background-color": { "value": "{example.color.blue.50}" }, - "color": { "value": "{example.color.grey.100}" } + "background-color": { "value": "{frameless.color.blue.50}" }, + "color": { "value": "{frameless.color.grey.100}" } } } } diff --git a/proprietary/design-tokens/style-dictionary.config.json b/proprietary/design-tokens/style-dictionary.config.json index fd2f8fca..90820056 100644 --- a/proprietary/design-tokens/style-dictionary.config.json +++ b/proprietary/design-tokens/style-dictionary.config.json @@ -50,7 +50,7 @@ "destination": "index.css", "format": "css/variables", "options": { - "selector": ".example-theme", + "selector": ".frameless-theme", "outputReferences": true } } From 8c7782cc87800af582d5a34a1221b1ddd089aa8c Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Mon, 6 May 2024 11:58:32 +0200 Subject: [PATCH 3/7] refactor: refactor: add utrecht and denhaag to stylelintrc.json --- .stylelintrc.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.stylelintrc.json b/.stylelintrc.json index 1151b668..e136eb99 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -8,13 +8,13 @@ "scss/at-rule-no-unknown": true, "scss/dollar-variable-default": true, "scss/dollar-variable-first-in-block": [true, { "ignore": ["comments", "imports"] }], - "scss/dollar-variable-pattern": "^(frameless)-[a-z0-9-]+$", - "scss/percent-placeholder-pattern": "^(frameless)-[a-z0-9-]+$", + "scss/dollar-variable-pattern": "^(frameless|utrecht)-[a-z0-9-]+$", + "scss/percent-placeholder-pattern": "^(frameless|utrecht)-[a-z0-9-]+$", "scss/operator-no-newline-after": null, "scss/at-extend-no-missing-placeholder": null, - "custom-property-pattern": "^_?(frameless)-[a-z0-9-]+$", - "selector-class-pattern": "^(frameless)-[a-z0-9_-]+$", - "keyframes-name-pattern": "^(frameless)-[a-z0-9-]+$", + "custom-property-pattern": "^_?(frameless|denhaag|utrecht)-[a-z0-9-]+$", + "selector-class-pattern": "^(frameless|utrecht)-[a-z0-9_-]+$", + "keyframes-name-pattern": "^(frameless|utrecht)-[a-z0-9-]+$", "at-rule-no-unknown": null, "block-no-empty": [true], "color-no-invalid-hex": [true], From 77fb96e3c7dcd5607baf5db34761dd4f05a02b09 Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Mon, 6 May 2024 12:01:38 +0200 Subject: [PATCH 4/7] refactor: change keywords frameless to nl-design-system --- package.json | 2 +- packages/components-css/package.json | 2 +- packages/components-react/package.json | 2 +- packages/storybook/package.json | 2 +- packages/web-components-react/package.json | 2 +- packages/web-components-stencil/package.json | 2 +- proprietary/assets/package.json | 2 +- proprietary/design-tokens/package.json | 2 +- proprietary/font/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 2aa73d0a..b9266d82 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/design-system", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "engines": { diff --git a/packages/components-css/package.json b/packages/components-css/package.json index 54cc97a0..97efbb8d 100644 --- a/packages/components-css/package.json +++ b/packages/components-css/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/components-css", "keywords": [ - "frameless" + "nl-design-system" ], "private": true } diff --git a/packages/components-react/package.json b/packages/components-react/package.json index 749127d7..81ff1a6e 100644 --- a/packages/components-react/package.json +++ b/packages/components-react/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/components-react", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "publishConfig": { diff --git a/packages/storybook/package.json b/packages/storybook/package.json index bc96fcc7..8f515ae7 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/storybook", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "repository": { diff --git a/packages/web-components-react/package.json b/packages/web-components-react/package.json index 40f1efe6..a1d65f64 100644 --- a/packages/web-components-react/package.json +++ b/packages/web-components-react/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/web-components-react", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "repository": { diff --git a/packages/web-components-stencil/package.json b/packages/web-components-stencil/package.json index 8e55eab1..a75f0c3a 100644 --- a/packages/web-components-stencil/package.json +++ b/packages/web-components-stencil/package.json @@ -5,7 +5,7 @@ "license": "EUPL-1.2", "name": "@frameless/web-components-stencil", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "main": "./dist/index.cjs.js", diff --git a/proprietary/assets/package.json b/proprietary/assets/package.json index 7635b0c2..ef6d4b26 100644 --- a/proprietary/assets/package.json +++ b/proprietary/assets/package.json @@ -5,7 +5,7 @@ "license": "SEE LICENSE IN LICENSE.md", "name": "@frameless/assets", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "publishConfig": { diff --git a/proprietary/design-tokens/package.json b/proprietary/design-tokens/package.json index 1628d55c..fc8c8c69 100644 --- a/proprietary/design-tokens/package.json +++ b/proprietary/design-tokens/package.json @@ -5,7 +5,7 @@ "license": "SEE LICENSE IN LICENSE.md", "name": "@frameless/design-tokens", "keywords": [ - "frameless" + "nl-design-system" ], "private": false, "publishConfig": { diff --git a/proprietary/font/package.json b/proprietary/font/package.json index 8b094fae..2fdb21a1 100644 --- a/proprietary/font/package.json +++ b/proprietary/font/package.json @@ -6,7 +6,7 @@ "name": "@frameless/font", "main": "dist/index.css", "keywords": [ - "frameless" + "nl-design-system" ], "private": true, "publishConfig": { From cd68fa23f922ebdef590e12863b6bc655aa697c6 Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Mon, 6 May 2024 13:23:21 +0200 Subject: [PATCH 5/7] fix: delete web component packages + adjust references in corresponding files --- packages/storybook/config/preview.ts | 4 +- packages/storybook/package.json | 2 - .../src/web-component-button.stories.tsx | 44 ----------------- packages/web-components-react/.gitignore | 3 -- packages/web-components-react/package.json | 40 --------------- packages/web-components-react/src/index.ts | 1 - packages/web-components-react/tsconfig.json | 27 ---------- packages/web-components-stencil/.gitignore | 4 -- packages/web-components-stencil/package.json | 49 ------------------- .../src/button/index.scss | 1 - .../src/button/stencil.tsx | 23 --------- .../web-components-stencil/stencil.config.ts | 28 ----------- .../web-components-stencil/tsconfig.jest.json | 9 ---- packages/web-components-stencil/tsconfig.json | 14 ------ 14 files changed, 2 insertions(+), 247 deletions(-) delete mode 100644 packages/storybook/src/web-component-button.stories.tsx delete mode 100644 packages/web-components-react/.gitignore delete mode 100644 packages/web-components-react/package.json delete mode 100644 packages/web-components-react/src/index.ts delete mode 100644 packages/web-components-react/tsconfig.json delete mode 100644 packages/web-components-stencil/.gitignore delete mode 100644 packages/web-components-stencil/package.json delete mode 100644 packages/web-components-stencil/src/button/index.scss delete mode 100644 packages/web-components-stencil/src/button/stencil.tsx delete mode 100644 packages/web-components-stencil/stencil.config.ts delete mode 100644 packages/web-components-stencil/tsconfig.jest.json delete mode 100644 packages/web-components-stencil/tsconfig.json diff --git a/packages/storybook/config/preview.ts b/packages/storybook/config/preview.ts index 8bd3f9b0..f68e6733 100644 --- a/packages/storybook/config/preview.ts +++ b/packages/storybook/config/preview.ts @@ -1,10 +1,10 @@ import '@frameless/design-tokens/dist/index.css'; import '@frameless/font/src/index.scss'; -import { defineCustomElements } from '@frameless/web-components-stencil/loader/index.js'; +// import { defineCustomElements } from '@frameless/web-components-stencil/loader/index.js'; import type { Preview } from '@storybook/react'; import { ParametersArgsDecorator } from './ParametersArgsDecorator'; -defineCustomElements(); +// defineCustomElements(); const preview: Preview = { parameters: { diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 8f515ae7..bc2ed852 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -23,8 +23,6 @@ "@frameless/components-css": "workspace:*", "@frameless/design-tokens": "workspace:*", "@frameless/font": "workspace:*", - "@frameless/web-components-react": "workspace:*", - "@frameless/web-components-stencil": "workspace:*", "@storybook/addon-a11y": "8.0.9", "@storybook/addon-actions": "8.0.9", "@storybook/addon-docs": "8.0.9", diff --git a/packages/storybook/src/web-component-button.stories.tsx b/packages/storybook/src/web-component-button.stories.tsx deleted file mode 100644 index 476d8ab0..00000000 --- a/packages/storybook/src/web-component-button.stories.tsx +++ /dev/null @@ -1,44 +0,0 @@ -/* @license CC0-1.0 */ - -import readme from '@frameless/components-css/button/README.md?raw'; -import { FramelessButton } from '@frameless/web-components-react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { PropsWithChildren } from 'react'; - -const Button = ({ children }: PropsWithChildren<{}>) => {children}; - -const meta = { - title: 'Web Component/Button', - id: 'web-component-button', - component: Button, - argTypes: { - children: { - name: 'Content', - description: 'Button text', - type: { - name: 'string', - required: true, - }, - defaultValue: '', - }, - }, - args: { - children: 'Opslaan en verder', - }, - tags: ['autodocs'], - parameters: { - docs: { - description: { - component: readme, - }, - }, - }, -} satisfies Meta; - -export default meta; - -type Story = StoryObj; - -export const Default: Story = { - name: 'Frameless button', -}; diff --git a/packages/web-components-react/.gitignore b/packages/web-components-react/.gitignore deleted file mode 100644 index 43cd66e8..00000000 --- a/packages/web-components-react/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore generated files from Stencil -src/react-component-lib/ -src/components.ts diff --git a/packages/web-components-react/package.json b/packages/web-components-react/package.json deleted file mode 100644 index a1d65f64..00000000 --- a/packages/web-components-react/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": "1.0.0-alpha.0", - "author": "Frameless", - "description": "React web components bundle based on the NL Design System architecture", - "license": "EUPL-1.2", - "name": "@frameless/web-components-react", - "keywords": [ - "nl-design-system" - ], - "private": true, - "repository": { - "type": "git+ssh", - "url": "git@github.com:nl-design-system/frameless.git" - }, - "sideEffects": false, - "scripts": { - "build": "tsc -p .", - "clean": "rimraf dist/ src/components.ts src/react-component-lib/" - }, - "main": "./dist/index.js", - "module": "./dist/index.js", - "types": "./dist/index.d.ts", - "files": [ - "dist/" - ], - "peerDependencies": { - "react": "^17.0.2", - "react-dom": "^17.0.2" - }, - "devDependencies": { - "@frameless/web-components-stencil": "workspace:*", - "@types/node": "20.12.7", - "@types/react": "18.2.75", - "@types/react-dom": "18.2.24", - "react": "18.2.0", - "react-dom": "18.2.0", - "rimraf": "5.0.5", - "typescript": "5.4.4" - } -} diff --git a/packages/web-components-react/src/index.ts b/packages/web-components-react/src/index.ts deleted file mode 100644 index 07635cbb..00000000 --- a/packages/web-components-react/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components'; diff --git a/packages/web-components-react/tsconfig.json b/packages/web-components-react/tsconfig.json deleted file mode 100644 index 7d238b2d..00000000 --- a/packages/web-components-react/tsconfig.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "compilerOptions": { - "allowUnreachableCode": false, - "allowSyntheticDefaultImports": true, - "declaration": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "esModuleInterop": true, - "lib": ["dom", "es2015"], - "module": "es2015", - "moduleResolution": "node", - "noImplicitAny": true, - "noImplicitReturns": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "outDir": "dist", - "removeComments": false, - "skipLibCheck": true, - "sourceMap": true, - "jsx": "react", - "target": "es2015" - }, - "include": ["src/**/*.ts", "src/**/*.tsx"], - "exclude": ["**/__tests__/**"], - "compileOnSave": false, - "buildOnSave": false -} diff --git a/packages/web-components-stencil/.gitignore b/packages/web-components-stencil/.gitignore deleted file mode 100644 index 11efc511..00000000 --- a/packages/web-components-stencil/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore generated files from Stencil -dist/ -loader/ -www/ diff --git a/packages/web-components-stencil/package.json b/packages/web-components-stencil/package.json deleted file mode 100644 index a75f0c3a..00000000 --- a/packages/web-components-stencil/package.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": "1.0.0-alpha.0", - "author": "Frameless", - "description": "Stencil web components bundle based on the NL Design System architecture", - "license": "EUPL-1.2", - "name": "@frameless/web-components-stencil", - "keywords": [ - "nl-design-system" - ], - "private": true, - "main": "./dist/index.cjs.js", - "module": "./dist/index.js", - "types": "./dist/types/components.d.ts", - "collection": "./dist/collection/collection-manifest.json", - "collection:main": "./dist/collection/collection-manifest.json", - "unpkg": "./dist/frameless/frameless.esm.js", - "files": [ - "dist/", - "loader/" - ], - "repository": { - "type": "git+ssh", - "url": "git@github.com:frameless/website.git" - }, - "scripts": { - "build": "npm-run-all clean build:**", - "build:stencil": "stencil build", - "build:typescript": "tsc", - "clean": "rimraf dist/ ../web-components-react/src/components.ts ../web-components-react/src/react-component-lib/", - "start": "stencil build --dev --watch --serve", - "watch": "npm-run-all --parallel watch:**", - "watch:stencil": "chokidar --follow-symlinks --initial --command 'pnpm run build:stencil' '../../components/**/*.(js|jsx|ts|tsx)'", - "generate": "stencil generate" - }, - "devDependencies": { - "@frameless/components-css": "workspace:*", - "@stencil/react-output-target": "0.5.3", - "@stencil/sass": "3.0.11", - "@types/jest": "29.5.12", - "chokidar-cli": "3.0.0", - "npm-run-all": "4.1.5", - "rimraf": "5.0.5", - "tslib": "2.6.2", - "typescript": "5.4.4" - }, - "dependencies": { - "@stencil/core": "4.15.0" - } -} diff --git a/packages/web-components-stencil/src/button/index.scss b/packages/web-components-stencil/src/button/index.scss deleted file mode 100644 index 1a6e8b90..00000000 --- a/packages/web-components-stencil/src/button/index.scss +++ /dev/null @@ -1 +0,0 @@ -@import "~@frameless/components-css/button/index"; diff --git a/packages/web-components-stencil/src/button/stencil.tsx b/packages/web-components-stencil/src/button/stencil.tsx deleted file mode 100644 index 30f1d7aa..00000000 --- a/packages/web-components-stencil/src/button/stencil.tsx +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @license EUPL-1.2 - * Copyright (c) 2021 Community for NL Design System - */ - -import { Component, h } from '@stencil/core'; - -@Component({ - tag: 'frameless-button', - styleUrl: 'index.scss', - shadow: true, -}) -export class Button { - render() { - return ( - - ); - } -} diff --git a/packages/web-components-stencil/stencil.config.ts b/packages/web-components-stencil/stencil.config.ts deleted file mode 100644 index c4436793..00000000 --- a/packages/web-components-stencil/stencil.config.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Config } from '@stencil/core'; -import { reactOutputTarget } from '@stencil/react-output-target'; -import { sass } from '@stencil/sass'; - -export const config: Config = { - namespace: 'frameless', - srcDir: './src/', - outputTargets: [ - { - type: 'dist', - esmLoaderPath: '../loader', - }, - { - type: 'dist-custom-elements', - customElementsExportBehavior: 'bundle', - }, - { - type: 'www', - serviceWorker: null, // disable service workers - }, - reactOutputTarget({ - componentCorePackage: '@frameless/web-components-stencil', - proxiesFile: '../web-components-react/src/components.ts', - }), - ], - plugins: [sass()], - extras: { enableImportInjection: true }, -}; diff --git a/packages/web-components-stencil/tsconfig.jest.json b/packages/web-components-stencil/tsconfig.jest.json deleted file mode 100644 index 89f06994..00000000 --- a/packages/web-components-stencil/tsconfig.jest.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "types": ["jest"], - "include": ["src/**/*.spec.ts", "src/**/*.spec.tsx"], - "exclude": ["**/node_modules/*"] -} diff --git a/packages/web-components-stencil/tsconfig.json b/packages/web-components-stencil/tsconfig.json deleted file mode 100644 index b2854954..00000000 --- a/packages/web-components-stencil/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "declaration": true, - "outDir": "dist", - "target": "es2017", - "jsx": "react", - "jsxFactory": "h", - "skipLibCheck": true - }, - "include": ["src", "stencil.config.ts"], - "exclude": ["**/node_modules/*", "**/*.spec.ts", "**/*.spec.tsx"] -} From 62ca5044c1886dfed3e1a1cd486721fa46e35964 Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Mon, 6 May 2024 13:35:50 +0200 Subject: [PATCH 6/7] refactor: change additional files to remove web components --- .eslintignore | 12 ++-- .eslintrc.json | 5 +- .prettierignore | 8 +-- pnpm-lock.yaml | 149 +++--------------------------------------------- 4 files changed, 19 insertions(+), 155 deletions(-) diff --git a/.eslintignore b/.eslintignore index 1e134f8f..28a0926e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -9,9 +9,9 @@ dist/ tmp/ # Ignore generated files from Stencil -components/components.d.ts -packages/web-components-angular/src/directives/angular-component-lib/utils.ts -packages/web-components-angular/src/directives/proxies.ts -packages/web-components-stencil/loader -packages/web-components-react/src/react-component-lib/ -packages/web-components-react/src/components.ts +# components/components.d.ts +# packages/web-components-angular/src/directives/angular-component-lib/utils.ts +# packages/web-components-angular/src/directives/proxies.ts +# packages/web-components-stencil/loader +# packages/web-components-react/src/react-component-lib/ +# packages/web-components-react/src/components.ts diff --git a/.eslintrc.json b/.eslintrc.json index 56cd708f..51c7de09 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -80,11 +80,8 @@ "parserOptions": { "project": [ "packages/storybook/tsconfig.json", - "packages/web-components-react/tsconfig.json", "packages/components-react/tsconfig.json", - "packages/components-react/tsconfig.test.json", - "packages/web-components-stencil/tsconfig.json", - "packages/web-components-stencil/tsconfig.jest.json" + "packages/components-react/tsconfig.test.json" ] }, "plugins": ["@typescript-eslint"] diff --git a/.prettierignore b/.prettierignore index 4472642c..5dbc25d1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -19,7 +19,7 @@ pnpm-lock.yaml # Ignore generated files from Stencil -components/components.d.ts -packages/web-components-stencil/loader -packages/web-components-react/src/react-component-lib/ -packages/web-components-react/src/components.ts +# components/components.d.ts +# packages/web-components-stencil/loader +# packages/web-components-react/src/react-component-lib/ +# packages/web-components-react/src/components.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31b1e33a..76b5e852 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -225,12 +225,6 @@ importers: '@frameless/font': specifier: workspace:* version: link:../../proprietary/font - '@frameless/web-components-react': - specifier: workspace:* - version: link:../web-components-react - '@frameless/web-components-stencil': - specifier: workspace:* - version: link:../web-components-stencil '@storybook/addon-a11y': specifier: 8.0.9 version: 8.0.9 @@ -278,68 +272,7 @@ importers: version: 5.4.4 vite: specifier: 5.2.10 - version: 5.2.10 - - packages/web-components-react: - devDependencies: - '@frameless/web-components-stencil': - specifier: workspace:* - version: link:../web-components-stencil - '@types/node': - specifier: 20.12.7 - version: 20.12.7 - '@types/react': - specifier: 18.2.75 - version: 18.2.75 - '@types/react-dom': - specifier: 18.2.24 - version: 18.2.24 - react: - specifier: 18.2.0 - version: 18.2.0 - react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) - rimraf: - specifier: 5.0.5 - version: 5.0.5 - typescript: - specifier: 5.4.4 - version: 5.4.4 - - packages/web-components-stencil: - dependencies: - '@stencil/core': - specifier: 4.15.0 - version: 4.15.0 - devDependencies: - '@frameless/components-css': - specifier: workspace:* - version: link:../components-css - '@stencil/react-output-target': - specifier: 0.5.3 - version: 0.5.3(@stencil/core@4.15.0) - '@stencil/sass': - specifier: 3.0.11 - version: 3.0.11(@stencil/core@4.15.0) - '@types/jest': - specifier: 29.5.12 - version: 29.5.12 - chokidar-cli: - specifier: 3.0.0 - version: 3.0.0 - npm-run-all: - specifier: 4.1.5 - version: 4.1.5 - rimraf: - specifier: 5.0.5 - version: 5.0.5 - tslib: - specifier: 2.6.2 - version: 2.6.2 - typescript: - specifier: 5.4.4 - version: 5.4.4 + version: 5.2.10(@types/node@20.12.7) proprietary/assets: {} @@ -2490,7 +2423,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.4.4) typescript: 5.4.4 - vite: 5.2.10 + vite: 5.2.10(@types/node@20.12.7) dev: true /@jridgewell/gen-mapping@0.3.3: @@ -3377,20 +3310,6 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils@5.0.2: - resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@types/estree': 1.0.1 - estree-walker: 2.0.2 - picomatch: 2.3.1 - dev: true - /@rollup/pluginutils@5.0.2(rollup@4.14.1): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} @@ -3619,28 +3538,6 @@ packages: '@sinonjs/commons': 3.0.0 dev: true - /@stencil/core@4.15.0: - resolution: {integrity: sha512-C5syM3chCyxX0Os5M+ZWrBujjqwUfrTb87YiLr8RC+kMTmIpnRvvtj8/s3QYDGdDENGRxGkBpeboVh82IGqk0w==} - engines: {node: '>=16.0.0', npm: '>=7.10.0'} - hasBin: true - - /@stencil/react-output-target@0.5.3(@stencil/core@4.15.0): - resolution: {integrity: sha512-68jwRp35CjAcwhTJ9yFD/3n+jrHOqvEH2jreVuPVvZK+4tkhPlYlwz0d1E1RlF3jyifUSfdkWUGgXIEy8Fo3yw==} - peerDependencies: - '@stencil/core': '>=2.0.0 || >=3 || >= 4.0.0-beta.0 || >= 4.0.0' - dependencies: - '@stencil/core': 4.15.0 - dev: true - - /@stencil/sass@3.0.11(@stencil/core@4.15.0): - resolution: {integrity: sha512-YzKBKuV2wYf2aCM2Or8DbksX+8DQKOYFe2QMNAV+LFzyexhiYDz5/Tq04CDtc8xTXmzqC0J8U79GB8Vvz9myAQ==} - engines: {node: '>=12.0.0', npm: '>=6.0.0'} - peerDependencies: - '@stencil/core': '>=2.0.0 || >=3.0.0-beta.0 || >= 4.0.0-beta.0 || >= 4.0.0' - dependencies: - '@stencil/core': 4.15.0 - dev: true - /@storybook/addon-a11y@8.0.9: resolution: {integrity: sha512-HgIlhOI3yBS3ztnuqOquGztnju7LE+BgCMYbDQEZjQkddiQPtjwLC6h0/LkvHL5993avbq1vYEWfUGHLtGzYfQ==} dependencies: @@ -3828,7 +3725,7 @@ packages: magic-string: 0.30.5 ts-dedent: 2.2.0 typescript: 5.4.4 - vite: 5.2.10 + vite: 5.2.10(@types/node@20.12.7) transitivePeerDependencies: - encoding - supports-color @@ -4191,7 +4088,7 @@ packages: vite: ^4.0.0 || ^5.0.0 dependencies: '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.4.4)(vite@5.2.10) - '@rollup/pluginutils': 5.0.2 + '@rollup/pluginutils': 5.0.2(rollup@4.14.1) '@storybook/builder-vite': 8.0.9(typescript@5.4.4)(vite@5.2.10) '@storybook/node-logger': 8.0.9 '@storybook/react': 8.0.9(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.4) @@ -4202,7 +4099,7 @@ packages: react-dom: 18.2.0(react@18.2.0) resolve: 1.22.8 tsconfig-paths: 4.2.0 - vite: 5.2.10 + vite: 5.2.10(@types/node@20.12.7) transitivePeerDependencies: - '@preact/preset-vite' - encoding @@ -4284,7 +4181,7 @@ packages: '@storybook/instrumenter': 8.0.9 '@storybook/preview-api': 8.0.9 '@testing-library/dom': 9.3.4 - '@testing-library/jest-dom': 6.4.2 + '@testing-library/jest-dom': 6.4.2(@types/jest@29.5.12)(jest@29.7.0) '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.4) '@vitest/expect': 1.3.1 '@vitest/spy': 1.5.2 @@ -4365,37 +4262,6 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/jest-dom@6.4.2: - resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==} - engines: {node: '>=14', npm: '>=6', yarn: '>=1'} - peerDependencies: - '@jest/globals': '>= 28' - '@types/bun': latest - '@types/jest': '>= 28' - jest: '>= 28' - vitest: '>= 0.32' - peerDependenciesMeta: - '@jest/globals': - optional: true - '@types/bun': - optional: true - '@types/jest': - optional: true - jest: - optional: true - vitest: - optional: true - dependencies: - '@adobe/css-tools': 4.3.2 - '@babel/runtime': 7.24.4 - aria-query: 5.1.3 - chalk: 3.0.0 - css.escape: 1.5.1 - dom-accessibility-api: 0.6.3 - lodash: 4.17.21 - redent: 3.0.0 - dev: true - /@testing-library/jest-dom@6.4.2(@types/jest@29.5.12)(jest@29.7.0): resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} @@ -16014,7 +15880,7 @@ packages: vite: 5.2.8(@types/node@20.12.7)(sass@1.74.1) dev: true - /vite@5.2.10: + /vite@5.2.10(@types/node@20.12.7): resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -16042,6 +15908,7 @@ packages: terser: optional: true dependencies: + '@types/node': 20.12.7 esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.14.1 From cda683cbd4fc232fc022e29e34a111e8e5b66dd9 Mon Sep 17 00:00:00 2001 From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com> Date: Mon, 6 May 2024 14:42:20 +0200 Subject: [PATCH 7/7] refactor: remove commented out code --- .eslintignore | 8 -------- .prettierignore | 5 ----- packages/storybook/config/preview.ts | 3 --- 3 files changed, 16 deletions(-) diff --git a/.eslintignore b/.eslintignore index 28a0926e..eefe17a4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,11 +7,3 @@ build/ coverage/ dist/ tmp/ - -# Ignore generated files from Stencil -# components/components.d.ts -# packages/web-components-angular/src/directives/angular-component-lib/utils.ts -# packages/web-components-angular/src/directives/proxies.ts -# packages/web-components-stencil/loader -# packages/web-components-react/src/react-component-lib/ -# packages/web-components-react/src/components.ts diff --git a/.prettierignore b/.prettierignore index 5dbc25d1..47c39651 100644 --- a/.prettierignore +++ b/.prettierignore @@ -18,8 +18,3 @@ yarn.lock pnpm-lock.yaml -# Ignore generated files from Stencil -# components/components.d.ts -# packages/web-components-stencil/loader -# packages/web-components-react/src/react-component-lib/ -# packages/web-components-react/src/components.ts diff --git a/packages/storybook/config/preview.ts b/packages/storybook/config/preview.ts index f68e6733..be090165 100644 --- a/packages/storybook/config/preview.ts +++ b/packages/storybook/config/preview.ts @@ -1,11 +1,8 @@ import '@frameless/design-tokens/dist/index.css'; import '@frameless/font/src/index.scss'; -// import { defineCustomElements } from '@frameless/web-components-stencil/loader/index.js'; import type { Preview } from '@storybook/react'; import { ParametersArgsDecorator } from './ParametersArgsDecorator'; -// defineCustomElements(); - const preview: Preview = { parameters: { controls: { expanded: false },