Skip to content

Commit

Permalink
Merge branch 'main' into Rozerin/heading-tokens-toevoegen
Browse files Browse the repository at this point in the history
  • Loading branch information
Ruben Smit committed Aug 9, 2024
2 parents e5ed21f + ddc7184 commit ca3a2b8
Show file tree
Hide file tree
Showing 21 changed files with 242 additions and 164 deletions.
42 changes: 0 additions & 42 deletions .npmpackagejsonlintrc.json

This file was deleted.

5 changes: 3 additions & 2 deletions apps/rvs.rivm.nl/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/rvs.rivm.nl",
"version": "1.0.0-alpha.0",
"author": "Community for NL Design System",
"description": "Storybook based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/rvs.rivm.nl",
"keywords": [
"nl-design-system"
],
Expand All @@ -14,7 +14,8 @@
},
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "apps/rvs.rivm.nl"
},
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 2 additions & 0 deletions apps/rvs.rivm.nl/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use client';

import { Article, Button, ButtonGroup, Heading1, Link, Paragraph } from '@utrecht/component-library-react';
import { Logo } from '@rijkshuisstijl-community/components-react';
import './page.css';
Expand Down
19 changes: 19 additions & 0 deletions npmpackagejsonlint.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = {
rules: {
'no-caret-version-dependencies': 'error',
'no-caret-version-devDependencies': 'error',
'no-tilde-version-dependencies': 'error',
'no-tilde-version-devDependencies': 'error',
'require-repository-directory': 'error',
'valid-values-license': ['error', ['EUPL-1.2']],
'valid-values-name-scope': ['error', ['@rijkshuisstijl-community']],
},
overrides: [
{
patterns: ['proprietary/**/package.json'],
rules: {
'valid-values-license': ['error', ['SEE LICENSE IN LICENSE.md']],
},
},
],
};
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"name": "@rijkshuisstijl-community/design-system",
"version": "1.0.0-alpha.0",
"author": "Community for NL Design System",
"description": "Design system based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/design-system",
"keywords": [
"nl-design-system"
],
"private": true,
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "."
},
"engines": {
"node": "^20",
"pnpm": "^9"
Expand Down
7 changes: 6 additions & 1 deletion packages/components-css/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{
"name": "@rijkshuisstijl-community/components-css",
"version": "1.0.0-alpha.23",
"author": "Community for NL Design System",
"description": "CSS Components for a design system based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/components-css",
"keywords": [
"nl-design-system"
],
"private": false,
"publishConfig": {
"access": "restricted",
"registry": "https://registry.npmjs.org/"
},
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "packages/components-css"
}
}
6 changes: 4 additions & 2 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/components-react",
"version": "1.0.0-alpha.0",
"author": "Community for NL Design System",
"description": "React component library for the Rijkshuisstijl Community repository, based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/components-react",
"keywords": [
"nl-design-system"
],
Expand All @@ -14,7 +14,8 @@
},
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "packages/components-react"
},
"scripts": {
"prebuild": "npm run clean",
Expand All @@ -33,6 +34,7 @@
],
"sideEffects": false,
"dependencies": {
"@utrecht/component-library-react": "5.0.0",
"clsx": "2.1.1",
"date-fns": "3.6.0",
"lodash.chunk": "4.2.0"
Expand Down
3 changes: 3 additions & 0 deletions packages/components-react/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Export all Utrecht components
export * from '@utrecht/component-library-react/dist/css-module';

export { Button } from './Button';
export { Logo } from './Logo';
export type { LogoProps } from './Logo';
5 changes: 3 additions & 2 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/storybook",
"version": "1.0.0-alpha.0",
"author": "Community for NL Design System",
"description": "Storybook based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/storybook",
"keywords": [
"nl-design-system"
],
Expand All @@ -14,7 +14,8 @@
},
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "packages/storybook"
},
"scripts": {
"build": "storybook build --output-dir dist/ --config-dir config/",
Expand Down
5 changes: 3 additions & 2 deletions packages/web-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/web-components-react",
"version": "1.0.0-alpha.5",
"author": "Community for NL Design System",
"description": "React web components bundle based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/web-components-react",
"keywords": [
"nl-design-system"
],
Expand All @@ -14,7 +14,8 @@
},
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "packages/web-components-react"
},
"sideEffects": false,
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions packages/web-components-stencil/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/web-components-stencil",
"version": "1.0.0-alpha.5",
"author": "Community for NL Design System",
"description": "Stencil web components bundle based on the NL Design System architecture",
"license": "EUPL-1.2",
"name": "@rijkshuisstijl-community/web-components-stencil",
"keywords": [
"nl-design-system"
],
Expand All @@ -26,7 +26,8 @@
],
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "packages/web-components-stencil"
},
"scripts": {
"prebuild": "npm run clean",
Expand Down
30 changes: 30 additions & 0 deletions pnpm-lock.yaml

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

5 changes: 0 additions & 5 deletions proprietary/.npmpackagejsonlintrc.json

This file was deleted.

5 changes: 3 additions & 2 deletions proprietary/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rijkshuisstijl-community/assets",
"version": "1.0.0-alpha.23",
"author": "Community for NL Design System",
"description": "Assets",
"license": "SEE LICENSE IN LICENSE.md",
"name": "@rijkshuisstijl-community/assets",
"keywords": [
"nl-design-system"
],
Expand All @@ -15,6 +15,7 @@
"files": [],
"repository": {
"type": "git+ssh",
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git"
"url": "[email protected]:nl-design-system/rijkshuisstijl-community.git",
"directory": "proprietary/assets"
}
}
Loading

0 comments on commit ca3a2b8

Please sign in to comment.