Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch round 2024-03 #643

Merged
merged 8 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 38 additions & 104 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
uses: actions/checkout@v4.1.1

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

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

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v4
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
uses: actions/checkout@v4.1.1

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

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

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v4
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-file: ".nvmrc"
uses: actions/[email protected]

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

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v4
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@v4
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
uses: actions/checkout@v4.1.1

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

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

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v4
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 @@ -191,10 +139,10 @@ jobs:

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

- name: "Restore build artifact: Storybook"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.4
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -212,34 +160,20 @@ 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-file: ".nvmrc"

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

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"

- uses: actions/cache@v4
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: "Continuous Deployment: install"
run: |
Expand Down
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

4 changes: 1 addition & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
#!/bin/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"]
}
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
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@
"./proprietary/*"
],
"devDependencies": {
"@lerna-lite/cli": "3.2.1",
"@lerna-lite/publish": "3.2.1",
"@lerna-lite/run": "3.2.1",
"@lerna-lite/version": "3.2.1",
"@types/node": "20.11.16",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"eslint": "8.56.0",
"@lerna-lite/cli": "3.3.1",
"@lerna-lite/publish": "3.3.1",
"@lerna-lite/run": "3.3.1",
"@lerna-lite/version": "3.3.1",
"@types/node": "20.11.24",
"@typescript-eslint/eslint-plugin": "7.1.1",
"@typescript-eslint/parser": "7.1.1",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-mdx": "3.1.5",
"eslint-plugin-react": "7.33.2",
"husky": "9.0.10",
"lint-staged": "15.2.1",
"eslint-plugin-react": "7.34.0",
"husky": "9.0.11",
"lint-staged": "15.2.2",
"markdownlint-cli": "0.39.0",
"npm-check-updates": "16.14.14",
"npm-check-updates": "16.14.15",
"npm-package-json-lint": "7.1.0",
"npm-run-all": "4.1.5",
"postcss": "8.4.33",
"prettier": "3.2.4",
"postcss": "8.4.35",
"prettier": "3.2.5",
"stylelint": "16.2.1",
"stylelint-config-standard-scss": "13.0.0",
"stylelint-order": "6.0.4",
Expand All @@ -48,13 +48,13 @@
"clean": "lerna run clean",
"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:js": "eslint --ext .js,.cjs,.json,.jsx,.mdx,.ts,.tsx --report-unused-disable-directives .",
"lint:md": "markdownlint '**/*.md'",
"lint:package-json": "npmPkgJsonLint '**/package.json'",
"lint:package-lock": "pnpm ls --recursive",
"lint-fix": "npm-run-all --continue-on-error lint-fix:** prettier",
"lint-fix:css": "stylelint --fix '**/*.{css,scss}'",
"lint-fix:js": "eslint --ext '.js,.json,.jsx,.mdx,.ts,.tsx' --fix --report-unused-disable-directives .",
"lint-fix:js": "eslint --ext .js,.cjs,.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",
Expand Down
22 changes: 11 additions & 11 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,43 @@
"clsx": "2.1.0"
},
"devDependencies": {
"@babel/core": "7.23.9",
"@babel/plugin-transform-runtime": "7.23.9",
"@babel/preset-env": "7.23.9",
"@babel/core": "7.24.0",
"@babel/plugin-transform-runtime": "7.24.0",
"@babel/preset-env": "7.24.0",
"@babel/preset-react": "7.23.3",
"@babel/preset-typescript": "7.23.3",
"@babel/runtime": "7.23.9",
"@babel/runtime": "7.24.0",
"@example/components-css": "workspace:*",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "25.0.7",
"@rollup/plugin-node-resolve": "15.2.3",
"@testing-library/dom": "9.3.4",
"@testing-library/jest-dom": "6.4.1",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "14.2.1",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/react": "18.2.51",
"@types/react": "18.2.63",
"@types/testing-library__jest-dom": "5.14.9",
"@vitejs/plugin-react": "4.2.1",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"next": "14.1.0",
"next": "14.1.2",
"npm-run-all": "4.1.5",
"postcss": "8.4.33",
"postcss": "8.4.35",
"react": "18.2.0",
"react-dom": "18.2.0",
"rimraf": "5.0.5",
"rollup": "4.9.6",
"rollup": "4.12.1",
"rollup-plugin-filesize": "10.0.0",
"rollup-plugin-node-externals": "7.0.1",
"rollup-plugin-node-polyfills": "0.2.1",
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-postcss": "4.0.2",
"rollup-plugin-typescript2": "0.36.0",
"sass": "1.70.0",
"sass": "1.71.1",
"tslib": "2.6.2",
"typescript": "5.3.3",
"vite": "5.0.12",
"vite": "5.1.5",
"vite-plugin-runtime-config": "1.0.2"
},
"peerDependencies": {
Expand Down
Loading