diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml index 115c2c61..a1489fb0 100644 --- a/.github/workflows/continuous-deployment.yml +++ b/.github/workflows/continuous-deployment.yml @@ -125,6 +125,18 @@ jobs: run: | pnpm run --if-present build + - name: "Continuous Integration: lint build" + env: + BASE_URL: "/utrecht/" + run: | + pnpm run --if-present lint-build + + - name: "Continuous Integration: test build" + env: + BASE_URL: "/utrecht/" + run: | + pnpm run --if-present test-build + - name: "Retain build artifact: storybook" uses: actions/upload-artifact@v3 with: diff --git a/.stylelintrc.json b/.stylelintrc.json index 4edae3e0..7f3acc66 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -2,131 +2,156 @@ "extends": ["stylelint-config-standard-scss"], "plugins": ["stylelint-order"], "rules": { - "alpha-value-notation": ["percentage"], - "at-rule-empty-line-before": null, - "at-rule-name-case": null, - "at-rule-name-newline-after": null, - "at-rule-name-space-after": ["always"], + "order/order": ["custom-properties", "declarations"], + "order/properties-alphabetical-order": true, + "scss/at-mixin-pattern": "^[a-z][a-z0-9-_]*$", + "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": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$", + "scss/percent-placeholder-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$", + "scss/operator-no-newline-after": null, + "scss/at-extend-no-missing-placeholder": null, + "custom-property-pattern": "^_?(denhaag|example|nl|utrecht)-[a-z0-9-]+$", + "selector-class-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9_-]+$", + "keyframes-name-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$", "at-rule-no-unknown": null, - "at-rule-semicolon-newline-after": null, - "at-rule-semicolon-space-before": ["never"], - "block-closing-brace-empty-line-before": null, - "block-closing-brace-newline-after": null, - "block-closing-brace-newline-before": null, - "block-closing-brace-space-after": null, - "block-closing-brace-space-before": null, "block-no-empty": [true], - "block-opening-brace-newline-after": null, - "block-opening-brace-newline-before": null, - "block-opening-brace-space-after": null, - "block-opening-brace-space-before": null, - "color-function-notation": ["modern"], - "color-hex-case": null, "color-no-invalid-hex": [true], "comment-no-empty": [true], - "custom-property-pattern": "^_?(example|nl|utrecht)-[a-z0-9-]+$", - "declaration-bang-space-after": ["never"], - "declaration-bang-space-before": ["always"], - "declaration-block-no-duplicate-properties": [true], - "declaration-block-no-redundant-longhand-properties": null, + "declaration-block-no-duplicate-properties": [true, { "ignore": ["consecutive-duplicates-with-different-values"] }], "declaration-block-no-shorthand-property-overrides": [true], - "declaration-block-semicolon-newline-after": null, - "declaration-block-semicolon-newline-before": null, - "declaration-block-semicolon-space-after": null, - "declaration-block-semicolon-space-before": null, - "declaration-block-trailing-semicolon": null, - "declaration-colon-newline-after": null, - "declaration-colon-space-after": null, - "declaration-colon-space-before": null, - "declaration-property-value-disallowed-list": [ - { - "text-align": ["left", "right"] - } - ], - "font-family-name-quotes": ["always-unless-keyword"], "font-family-no-duplicate-names": [true], "font-family-no-missing-generic-family-keyword": [true], - "font-weight-notation": [ - "numeric", - { - "ignore": ["relative"] - } - ], "function-calc-no-unspaced-operator": [true], - "function-comma-newline-after": null, - "function-comma-newline-before": null, - "function-comma-space-after": null, - "function-comma-space-before": null, "function-linear-gradient-no-nonstandard-direction": [true], - "function-max-empty-lines": null, - "function-parentheses-newline-inside": null, - "function-parentheses-space-inside": null, - "function-url-no-scheme-relative": [true], - "function-url-quotes": ["always"], - "hue-degree-notation": ["number"], - "indentation": null, "keyframe-declaration-no-important": [true], - "keyframes-name-pattern": "^(example|nl|utrecht)-[a-z0-9-]+$", - "length-zero-no-unit": [ - true, - { - "ignore": ["custom-properties"] - } - ], - "linebreaks": null, - "max-empty-lines": null, - "max-line-length": null, - "media-feature-colon-space-after": ["always"], - "media-feature-colon-space-before": ["never"], - "media-feature-name-case": null, "media-feature-name-no-unknown": [true], - "media-feature-parentheses-space-inside": ["never"], - "media-query-list-comma-newline-after": null, - "media-query-list-comma-newline-before": null, - "media-query-list-comma-space-after": null, - "media-query-list-comma-space-before": null, "no-descending-specificity": [true], "no-duplicate-at-import-rules": [true], "no-duplicate-selectors": [true], - "no-empty-first-line": null, "no-empty-source": [true], - "no-eol-whitespace": null, "no-extra-semicolons": null, "no-invalid-double-slash-comments": [true], - "no-missing-end-of-source-newline": null, + "property-no-unknown": [true], + "selector-pseudo-class-no-unknown": [true], + "selector-pseudo-element-no-unknown": [true], + "string-no-newline": [true], + "unit-no-unknown": [true], + "alpha-value-notation": ["percentage"], + "hue-degree-notation": ["number"], + "color-function-notation": ["modern"], + "length-zero-no-unit": [ + true, + { + "ignore": ["custom-properties"] + } + ], + "font-weight-notation": [ + "numeric", + { + "ignore": ["relative"] + } + ], + "function-url-no-scheme-relative": [true], + "unit-disallowed-list": [["s"]], + "font-family-name-quotes": ["always-unless-keyword"], + "function-url-quotes": ["always"], "number-leading-zero": null, "number-no-trailing-zeros": null, - "order/order": ["custom-properties", "declarations"], - "order/properties-alphabetical-order": true, - "property-case": null, + "declaration-property-value-disallowed-list": [ + { + "text-align": ["left", "right"] + } + ], "property-disallowed-list": [ [ + "border-bottom", + "border-bottom-color", + "border-bottom-left-radius", + "border-bottom-right-radius", + "border-bottom-style", + "border-bottom-width", + "border-left", + "border-left-color", + "border-left-style", + "border-left-width", + "border-right", + "border-right-color", + "border-right-style", + "border-right-width", + "border-top", + "border-top-color", + "border-top-left-radius", + "border-top-right-radius", + "border-top-style", + "border-top-width", + "bottom", + "contain-intrinsic-height", + "contain-intrinsic-width", + "height", + "left", "margin", "margin-bottom", "margin-left", "margin-right", "margin-top", + "max-height", + "max-width", + "min-height", + "min-width", "padding", "padding-bottom", "padding-left", "padding-right", - "padding-top" + "padding-top", + "right", + "scroll-margin-bottom", + "scroll-margin-left", + "scroll-margin-right", + "scroll-margin-top", + "scroll-padding-bottom", + "scroll-padding-left", + "scroll-padding-right", + "scroll-padding-top", + "top", + "width" ] ], - "property-no-unknown": [true], - "property-no-vendor-prefix": null, - "rule-empty-line-before": null, - "scss/at-extend-no-missing-placeholder": null, - "scss/at-mixin-pattern": "^[a-z][a-z0-9-_]*$", - "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|nl|utrecht)-[a-z0-9-]+$", - "scss/operator-no-newline-after": null, - "scss/percent-placeholder-pattern": "^(example|nl|utrecht)-[a-z0-9-]+$", - "selector-attribute-brackets-space-inside": ["never"], + "selector-max-id": [0], + "indentation": null, + "linebreaks": null, + "max-line-length": null, + "function-comma-newline-after": null, + "function-comma-newline-before": null, + "function-comma-space-after": null, + "function-comma-space-before": null, + "function-max-empty-lines": null, + "function-parentheses-newline-inside": null, + "function-parentheses-space-inside": null, + "value-list-comma-newline-after": null, + "value-list-comma-newline-before": null, + "value-list-comma-space-after": null, + "value-list-comma-space-before": null, + "value-list-max-empty-lines": null, + "declaration-colon-newline-after": null, + "declaration-colon-space-after": null, + "declaration-colon-space-before": null, + "declaration-block-semicolon-newline-after": null, + "declaration-block-semicolon-newline-before": null, + "declaration-block-semicolon-space-after": null, + "declaration-block-semicolon-space-before": null, + "declaration-block-trailing-semicolon": null, + "block-closing-brace-empty-line-before": null, + "block-closing-brace-newline-after": null, + "block-closing-brace-newline-before": null, + "block-closing-brace-space-after": null, + "block-closing-brace-space-before": null, + "block-opening-brace-newline-after": null, + "block-opening-brace-newline-before": null, + "block-opening-brace-space-after": null, + "block-opening-brace-space-before": null, "selector-attribute-quotes": ["always"], - "selector-class-pattern": "^(example|nl|utrecht)-[a-z0-9_-]+$", "selector-combinator-space-after": null, "selector-combinator-space-before": null, "selector-descendant-combinator-no-non-space": null, @@ -134,24 +159,30 @@ "selector-list-comma-newline-before": null, "selector-list-comma-space-after": null, "selector-list-comma-space-before": null, - "selector-max-empty-lines": null, - "selector-max-id": [0], + "media-query-list-comma-newline-after": null, + "media-query-list-comma-newline-before": null, + "media-query-list-comma-space-after": null, + "media-query-list-comma-space-before": null, + "at-rule-empty-line-before": null, + "at-rule-name-newline-after": null, + "at-rule-semicolon-newline-after": null, + "max-empty-lines": null, + "no-eol-whitespace": null, + "no-missing-end-of-source-newline": null, + "no-empty-first-line": null, + "unicode-bom": null, + "rule-empty-line-before": null, + "color-hex-case": null, + "unit-case": null, + "property-case": null, "selector-pseudo-class-case": null, - "selector-pseudo-class-no-unknown": [true], - "selector-pseudo-class-parentheses-space-inside": ["never"], "selector-pseudo-element-case": null, - "selector-pseudo-element-no-unknown": [true], - "string-no-newline": [true], + "selector-max-empty-lines": null, + "media-feature-name-case": null, + "at-rule-name-case": null, "string-quotes": null, - "unicode-bom": null, - "unit-case": null, - "unit-disallowed-list": [["s"]], - "unit-no-unknown": [true], + "property-no-vendor-prefix": null, "value-keyword-case": ["lower", { "camelCaseSvgKeywords": true }], - "value-list-comma-newline-after": null, - "value-list-comma-newline-before": null, - "value-list-comma-space-after": null, - "value-list-comma-space-before": null, - "value-list-max-empty-lines": null + "declaration-block-no-redundant-longhand-properties": null } } diff --git a/package.json b/package.json index 4628c9b9..526e507a 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "eslint-plugin-json": "3.1.0", "eslint-plugin-mdx": "2.2.0", "eslint-plugin-react": "7.33.2", - "html-validate": "8.7.3", "husky": "8.0.3", "lint-staged": "15.1.0", "markdownlint-cli": "0.37.0", @@ -48,7 +47,6 @@ "lint": "npm-run-all --continue-on-error lint:** lint-workspaces", "lint:css": "stylelint --allow-empty-input '**/*.{css,scss}'", "lint:js": "eslint --ext '.js,.json,.jsx,.mdx,.ts,.tsx' --report-unused-disable-directives .", - "lint:html": "find . -type d \\( -name coverage -or -name dist -or -name node_modules -or -name build -or -name tmp \\) -prune -false -o -name '*.html' -print0 | xargs -0 npx html-validate", "lint:md": "markdownlint '**/*.md'", "lint:package-json": "npmPkgJsonLint '**/package.json'", "lint:package-lock": "pnpm ls --recursive", @@ -57,6 +55,7 @@ "lint-fix:js": "eslint --ext '.js,.json,.jsx,.mdx,.ts,.tsx' --fix --report-unused-disable-directives .", "lint-fix:md": "markdownlint --fix '**/*.md'", "lint-workspaces": "lerna run --no-bail lint", + "lint-build": "lerna run --no-bail lint-build", "prepare": "husky install", "prettier": "prettier --write .", "publish": "lerna publish from-package --yes", diff --git a/packages/storybook/config/preview.tsx b/packages/storybook/config/preview.tsx index 38c7f432..d999cbae 100644 --- a/packages/storybook/config/preview.tsx +++ b/packages/storybook/config/preview.tsx @@ -1,69 +1,60 @@ import '@example/design-tokens/dist/index.css'; import '@example/font/src/index.scss'; - import { defineCustomElements } from '@example/web-components-stencil/loader/index.js'; +import type { Preview, StoryContext } from '@storybook/react'; defineCustomElements(); -export const decorators = [ - // Enable `utrecht-document` component as backdrop - // Enable `utrecht-theme` to configure the design tokens - // Ensure old html templates will be rendered as react component - (Story, storyContext) => { - // Hack to make current args for a story available in the transformSource of the docs addon - storyContext.parameters.args = storyContext.args; - - return ( -
- -
- ); - }, -]; +const preview: Preview = { + decorators: [ + // Enable `utrecht-document` component as backdrop + // Enable `utrecht-theme` to configure the design tokens + // Ensure old html templates will be rendered as react component + (Story: any, storyContext: StoryContext) => { + // Hack to make current args for a story available in the transformSource of the docs addon + storyContext.parameters['args'] = storyContext.args; -// Configure @etchteam/storybook-addon-status -const addonStatus = { - status: { - statuses: { - PRODUCTION: { - background: '#088008', - color: '#ffffff', - description: - 'Used in production in a variety of situations, well tested, stable APIs, mostly patches and minor releases.', - }, - BETA: { - background: '#3065ee', - color: '#ffffff', - description: - 'Used in production in a specific situation, evolving APIs based on feedback, breaking changes are still likely.', - }, - ALPHA: { - background: '#e0bc2e', - color: '#000000', - description: - 'Used in prototypes and in projects that are still in development, breaking changes occur frequently and are not communicated.', - }, - 'WORK IN PROGRESS': { - background: '#cc0000', - color: '#ffffff', - description: - 'Do not use in production. Does not follow semantic versioning and any published packages are for internal use only.', + return ( +
+ +
+ ); + }, + ], + parameters: { + controls: { expanded: false }, + status: { + statuses: { + PRODUCTION: { + background: '#088008', + color: '#ffffff', + description: + 'Used in production in a variety of situations, well tested, stable APIs, mostly patches and minor releases.', + }, + BETA: { + background: '#3065ee', + color: '#ffffff', + description: + 'Used in production in a specific situation, evolving APIs based on feedback, breaking changes are still likely.', + }, + ALPHA: { + background: '#e0bc2e', + color: '#000000', + description: + 'Used in prototypes and in projects that are still in development, breaking changes occur frequently and are not communicated.', + }, + 'WORK IN PROGRESS': { + background: '#cc0000', + color: '#ffffff', + description: + 'Do not use in production. Does not follow semantic versioning and any published packages are for internal use only.', + }, }, }, + options: { + panelPosition: 'right', + }, }, }; -const previewTabs = { - 'storybookjs/notes/panel': { title: 'Documentation' }, - 'storybook/docs/panel': { title: 'API' }, - canvas: { title: 'Design Tokens' }, -}; - -export const parameters = { - controls: { expanded: false }, - previewTabs, - addonStatus, - options: { - panelPosition: 'right', - }, -}; +export default preview; diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 1c3f0ec6..d8647ddc 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -15,6 +15,7 @@ "scripts": { "build": "storybook build --output-dir dist/ --config-dir config/", "clean": "rimraf dist/", + "lint-build": "tsc --noEmit --project tsconfig.json", "storybook": "storybook dev --config-dir config/ --port 6006" }, "devDependencies": { @@ -27,6 +28,7 @@ "@example/components-css": "workspace:*", "@example/design-tokens": "workspace:*", "@example/font": "workspace:*", + "@example/web-components-react": "workspace:*", "@example/web-components-stencil": "workspace:*", "@storybook/addon-a11y": "7.6.1", "@storybook/addon-actions": "7.6.1", diff --git a/packages/storybook/src/bem.stories.tsx b/packages/storybook/src/css-button.stories.tsx similarity index 67% rename from packages/storybook/src/bem.stories.tsx rename to packages/storybook/src/css-button.stories.tsx index c8ca4c40..ec624c19 100644 --- a/packages/storybook/src/bem.stories.tsx +++ b/packages/storybook/src/css-button.stories.tsx @@ -2,12 +2,12 @@ import readme from '@example/components-css/button/README.md?raw'; import type { Meta, StoryObj } from '@storybook/react'; -import React from 'react'; +import { PropsWithChildren } from 'react'; import '@example/components-css/button/index.scss'; -const Button = ({ textContent }) => ( +const Button = ({ children }: PropsWithChildren<{}>) => ( ); @@ -16,7 +16,8 @@ const meta = { id: 'css-button', component: Button, argTypes: { - textContent: { + children: { + name: 'Content', description: 'Button text', type: { name: 'string', @@ -26,7 +27,7 @@ const meta = { }, }, args: { - textContent: 'Opslaan en verder', + children: 'Opslaan en verder', }, tags: ['autodocs'], parameters: { @@ -36,10 +37,12 @@ const meta = { }, }, }, -} as Meta; +} satisfies Meta; export default meta; -export const Default: StoryObj = { +type Story = StoryObj; + +export const Default: Story = { name: 'Example button', }; diff --git a/packages/storybook/src/markdown.d.ts b/packages/storybook/src/markdown.d.ts new file mode 100644 index 00000000..9dbabb50 --- /dev/null +++ b/packages/storybook/src/markdown.d.ts @@ -0,0 +1,4 @@ +declare module '*.md?raw' { + const content: string; + export default content; +} diff --git a/packages/storybook/src/button.stories.tsx b/packages/storybook/src/react-button.stories.tsx similarity index 61% rename from packages/storybook/src/button.stories.tsx rename to packages/storybook/src/react-button.stories.tsx index 77e0d0c8..9f16151e 100644 --- a/packages/storybook/src/button.stories.tsx +++ b/packages/storybook/src/react-button.stories.tsx @@ -1,4 +1,3 @@ -import { ArgsTable, Primary, PRIMARY_STORY, Stories } from '@storybook/addon-docs'; import { Meta, StoryObj } from '@storybook/react'; import { Button } from '../../components-react/src/Button'; @@ -9,26 +8,16 @@ const meta = { args: { children: 'Read more...', }, - parameters: { - docs: { - page: () => ( - <> - - - - - ), - }, - }, argTypes: { type: { control: { type: 'select' }, options: [undefined, 'button', 'submit', 'reset'], }, }, -} as Meta; +} satisfies Meta; export default meta; type Story = StoryObj; + export const Default: Story = {}; diff --git a/packages/storybook/src/stencil.stories.tsx b/packages/storybook/src/web-component-button.stories.tsx similarity index 60% rename from packages/storybook/src/stencil.stories.tsx rename to packages/storybook/src/web-component-button.stories.tsx index 31be37a8..adffa951 100644 --- a/packages/storybook/src/stencil.stories.tsx +++ b/packages/storybook/src/web-component-button.stories.tsx @@ -1,17 +1,19 @@ /* @license CC0-1.0 */ import readme from '@example/components-css/button/README.md?raw'; +import { ExampleButton } from '@example/web-components-react'; import type { Meta, StoryObj } from '@storybook/react'; -import React from 'react'; +import { PropsWithChildren } from 'react'; -const Button = ({ textContent }) => {textContent}; +const Button = ({ children }: PropsWithChildren<{}>) => {children}; const meta = { title: 'Web Component/Button', id: 'web-component-button', component: Button, argTypes: { - textContent: { + children: { + name: 'Content', description: 'Button text', type: { name: 'string', @@ -21,7 +23,7 @@ const meta = { }, }, args: { - textContent: 'Opslaan en verder', + children: 'Opslaan en verder', }, tags: ['autodocs'], parameters: { @@ -31,10 +33,12 @@ const meta = { }, }, }, -} as Meta; +} satisfies Meta; export default meta; -export const Default: StoryObj = { +type Story = StoryObj; + +export const Default: Story = { name: 'Example button', }; diff --git a/packages/storybook/tsconfig.json b/packages/storybook/tsconfig.json index 66a4de60..e462b1c1 100644 --- a/packages/storybook/tsconfig.json +++ b/packages/storybook/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { "jsx": "react-jsx", - "allowSyntheticDefaultImports": true + "allowSyntheticDefaultImports": true, + "skipLibCheck": true }, "extends": "../../tsconfig.json", "include": ["config/**/*.ts", "config/**/*.tsx", "src/**/*.ts", "src/**/*.tsx", "vite.config.ts"], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 636339e2..a559b9a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,9 +45,6 @@ importers: eslint-plugin-react: specifier: 7.33.2 version: 7.33.2(eslint@8.54.0) - html-validate: - specifier: 8.7.3 - version: 8.7.3 husky: specifier: 8.0.3 version: 8.0.3 @@ -271,6 +268,9 @@ importers: '@example/font': specifier: workspace:* version: link:../../proprietary/font + '@example/web-components-react': + specifier: workspace:* + version: link:../web-components-react '@example/web-components-stencil': specifier: workspace:* version: link:../web-components-stencil @@ -2456,13 +2456,6 @@ packages: resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==} dev: true - /@html-validate/stylish@4.1.0: - resolution: {integrity: sha512-f2MOKJ2HVdLxpOOg2jD6hjDTDJic3wpb8/UdDDIic5jTvgfMMPN3PoiNWlqDg/mCzLIj1b/p1hCRx4Kz5lbVjw==} - engines: {node: '>= 14.0'} - dependencies: - kleur: 4.1.5 - dev: true - /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} engines: {node: '>=10.10.0'} @@ -4063,17 +4056,6 @@ packages: dev: true optional: true - /@sidvind/better-ajv-errors@2.1.0(ajv@8.12.0): - resolution: {integrity: sha512-JuIb009FhHuL9priFBho2kv7QmZOydj0LgYvj+h1t0mMCmhM/YmQNRlJR5wVtBZya6wrVFK5Hi5TIbv5BKEx7w==} - engines: {node: '>= 14.0.0'} - peerDependencies: - ajv: 4.11.8 - 8 - dependencies: - '@babel/code-frame': 7.23.5 - ajv: 8.12.0 - chalk: 4.1.2 - dev: true - /@sigstore/protobuf-specs@0.1.0: resolution: {integrity: sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -7160,7 +7142,7 @@ packages: normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /chownr@1.1.4: @@ -9460,14 +9442,6 @@ packages: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} dev: true - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - dev: true - optional: true - /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -9675,18 +9649,6 @@ packages: path-scurry: 1.10.1 dev: true - /glob@10.3.3: - resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==} - engines: {node: '>=16 || 14 >=14.17'} - hasBin: true - dependencies: - foreground-child: 3.1.1 - jackspeak: 2.2.1 - minimatch: 9.0.3 - minipass: 7.0.2 - path-scurry: 1.10.1 - dev: true - /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: @@ -10017,38 +9979,6 @@ packages: engines: {node: '>=8'} dev: true - /html-validate@8.7.3: - resolution: {integrity: sha512-nDJmMTdH3hXv/nCOfedhgVsPivHjYHCiT9TSC3U/DCC10F8OJtBJEPHY/cU7MViwIdu3RfOmU4EoPE02ku/aug==} - engines: {node: '>= 16.0'} - hasBin: true - peerDependencies: - jest: ^27.1 || ^28.1.3 || ^29.0.3 - jest-diff: ^27.1 || ^28.1.3 || ^29.0.3 - jest-snapshot: ^27.1 || ^28.1.3 || ^29.0.3 - vitest: ^0.34 - peerDependenciesMeta: - jest: - optional: true - jest-diff: - optional: true - jest-snapshot: - optional: true - vitest: - optional: true - dependencies: - '@babel/code-frame': 7.23.5 - '@html-validate/stylish': 4.1.0 - '@sidvind/better-ajv-errors': 2.1.0(ajv@8.12.0) - ajv: 8.12.0 - deepmerge: 4.3.1 - glob: 10.3.3 - ignore: 5.3.0 - kleur: 4.1.5 - minimist: 1.2.8 - prompts: 2.4.2 - semver: 7.5.4 - dev: true - /html-webpack-plugin@5.5.3(webpack@5.89.0): resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} engines: {node: '>=10.13.0'} @@ -10918,15 +10848,6 @@ packages: set-function-name: 2.0.1 dev: true - /jackspeak@2.2.1: - resolution: {integrity: sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==} - engines: {node: '>=14'} - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - dev: true - /jackspeak@2.3.6: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} @@ -11152,7 +11073,7 @@ packages: micromatch: 4.0.5 walker: 1.0.8 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /jest-haste-map@29.7.0: @@ -11171,7 +11092,7 @@ packages: micromatch: 4.0.5 walker: 1.0.8 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /jest-leak-detector@29.7.0: @@ -15357,7 +15278,7 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /rollup@4.6.1: @@ -15377,7 +15298,7 @@ packages: '@rollup/rollup-win32-arm64-msvc': 4.6.1 '@rollup/rollup-win32-ia32-msvc': 4.6.1 '@rollup/rollup-win32-x64-msvc': 4.6.1 - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /run-applescript@5.0.0: diff --git a/proprietary/font/src/index.scss b/proprietary/font/src/index.scss index 9480dc8b..eefea7c4 100644 --- a/proprietary/font/src/index.scss +++ b/proprietary/font/src/index.scss @@ -7,5 +7,6 @@ Here's "Open Sans", for example. https://fontsource.org/fonts/open-sans */ -// @import "~@fontsource/open-sans/400.css"; -// @import "~@fontsource/open-sans/700.css"; +/* @import "~@fontsource/open-sans/400.css"; */ + +/* @import "~@fontsource/open-sans/700.css"; */