Skip to content

Commit

Permalink
Merge branch 'main' of github.com:nl-design-system/lux into feat/new-…
Browse files Browse the repository at this point in the history
…component-list-item
  • Loading branch information
Remy committed Mar 19, 2024
2 parents f702a97 + 30a3dac commit 468f21d
Show file tree
Hide file tree
Showing 25 changed files with 3,370 additions and 3,916 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
versioning-strategy: "increase-if-necessary"
open-pull-requests-limit: 20
reviewers:
- "nl-design-system/kernteam-sysadmin"
- "nl-design-system/kernteam-dependabot"
139 changes: 36 additions & 103 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,18 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
uses: actions/[email protected]

- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v3.0.0
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false
version: 8.14

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
name: Setup pnpm cache
- name: Set up Node.js version
uses: actions/[email protected]
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version-file: .nvmrc
cache: pnpm

- name: Install dependencies
run: |
Expand All @@ -49,31 +36,18 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
uses: actions/[email protected]

- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v3.0.0
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false
version: 8.14

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
name: Setup pnpm cache
- name: Set up Node.js version
uses: actions/[email protected]
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version-file: .nvmrc
cache: pnpm

- name: Install dependencies
run: |
Expand All @@ -89,31 +63,18 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
uses: actions/[email protected]

- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v3.0.0
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false
version: 8.14

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
name: Setup pnpm cache
- name: Set up Node.js version
uses: actions/[email protected]
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version-file: .nvmrc
cache: pnpm

- name: Install dependencies
run: |
Expand All @@ -138,7 +99,7 @@ jobs:
pnpm run --if-present test-build
- name: "Retain build artifact: storybook"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.1
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -150,31 +111,18 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
uses: actions/[email protected]

- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v3.0.0
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false
version: 8.14

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
name: Setup pnpm cache
- name: Set up Node.js version
uses: actions/[email protected]
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version-file: .nvmrc
cache: pnpm

- name: Install dependencies
run: |
Expand All @@ -194,7 +142,7 @@ jobs:
uses: actions/checkout@v4

- name: "Restore build artifact: Storybook"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.4
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -212,34 +160,19 @@ jobs:

steps:
- name: Checkout release branch
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
token: ${{ secrets.GH_TOKEN }}

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"

- uses: pnpm/[email protected]
- uses: pnpm/[email protected]
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false
version: 8.14

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
name: Setup pnpm cache
- name: Set up Node.js version
uses: actions/[email protected]
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version-file: .nvmrc

- name: "Continuous Deployment: install"
run: |
Expand Down
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install lint-staged
npx --no-install lint-staged
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"composer.json": "composer validate",
"package.json": "npmPkgJsonLint --allowEmptyTargets",
"*.md": ["markdownlint", "prettier --check"],
"*.{js,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
"*.{js,cjs,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
"*.{css,scss}": ["stylelint --allow-empty-input", "prettier --check"]
}
7 changes: 7 additions & 0 deletions .ncurc.major.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const minorConfig = require('./.ncurc.minor.cjs');

module.exports = {
...minorConfig,
reject: [...minorConfig.reject, 'storybook', '@storybook/*'],
target: 'latest',
};
5 changes: 0 additions & 5 deletions .ncurc.major.js

This file was deleted.

7 changes: 7 additions & 0 deletions .ncurc.minor.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const patchConfig = require('./.ncurc.patch.cjs');

module.exports = {
...patchConfig,
reject: [...patchConfig.reject],
target: 'minor',
};
5 changes: 0 additions & 5 deletions .ncurc.minor.js

This file was deleted.

9 changes: 9 additions & 0 deletions .ncurc.patch.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
dep: ['dev', 'prod'],
install: 'always',
reject: [],
root: true,
target: 'patch',
upgrade: true,
workspaces: true,
};
3 changes: 0 additions & 3 deletions .ncurc.patch.js

This file was deleted.

2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"overrides": [
{
"files": ["*.js", "*.jsx"],
"files": ["*.js", "*.jsx", "*.cjs"],
"options": {
"parser": "flow",
"printWidth": 120,
Expand Down
65 changes: 0 additions & 65 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"scss/dollar-variable-first-in-block": [true, { "ignore": ["comments", "imports"] }],
"scss/dollar-variable-pattern": "^(lux)-[a-z0-9-]+$",
"scss/percent-placeholder-pattern": "^(lux)-[a-z0-9-]+$",
"scss/operator-no-newline-after": null,
"scss/at-extend-no-missing-placeholder": null,
"custom-property-pattern": "^_?(lux)-[a-z0-9-]+$",
"selector-class-pattern": "^(lux)-[a-z0-9_-]+$",
Expand All @@ -31,7 +30,6 @@
"no-duplicate-at-import-rules": [true],
"no-duplicate-selectors": [true],
"no-empty-source": [true],
"no-extra-semicolons": null,
"no-invalid-double-slash-comments": [true],
"property-no-unknown": [true],
"selector-pseudo-class-no-unknown": [true],
Expand All @@ -57,8 +55,6 @@
"unit-disallowed-list": [["s"]],
"font-family-name-quotes": ["always-unless-keyword"],
"function-url-quotes": ["always"],
"number-leading-zero": null,
"number-no-trailing-zeros": null,
"declaration-property-value-disallowed-list": [
{
"text-align": ["left", "right"]
Expand Down Expand Up @@ -119,68 +115,7 @@
]
],
"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-combinator-space-after": null,
"selector-combinator-space-before": null,
"selector-descendant-combinator-no-non-space": null,
"selector-list-comma-newline-after": null,
"selector-list-comma-newline-before": null,
"selector-list-comma-space-after": null,
"selector-list-comma-space-before": null,
"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-element-case": null,
"selector-max-empty-lines": null,
"media-feature-name-case": null,
"at-rule-name-case": null,
"string-quotes": null,
"property-no-vendor-prefix": null,
"value-keyword-case": ["lower", { "camelCaseSvgKeywords": true }],
"declaration-block-no-redundant-longhand-properties": null
Expand Down
Loading

0 comments on commit 468f21d

Please sign in to comment.