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

Fix all style linting errors + enforce in CI #32

Merged
merged 5 commits into from
Nov 20, 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
31 changes: 31 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: CI

on:
push:
branches: [ "**" ]
pull_request:
branches: [ "**" ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm run ci-project
#- run: npm run build --if-present
- run: npm test
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
"editor.trimAutoWhitespace": false,
"files.eol": "\n",
"javascript.preferences.quoteStyle": "single",
"typescript.tsdk": "node_modules/typescript/lib", // Use the TypeScript SDK from the current project
}
10 changes: 5 additions & 5 deletions package-lock.json

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

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"scripts": {
"gen-package": "node package.json.js",
"install-project": "npm run gen-package && npm install --force",
"ci-project": "npm ci --force",
"node": "node --import=tsx",
"repl": "tsx",
"plop": "NODE_OPTIONS=\"--import tsx\" plop",
Expand All @@ -41,11 +42,11 @@
"build": "vite --config=./vite.config.ts --emptyOutDir build",
"storybook:serve": "storybook dev -p 6006",
"storybook:build": "storybook build --docs",
"check-types": "tsc --noEmit",
"check:types": "tsc --noEmit",
"lint:style": "stylelint 'src/**/*.scss'",
"lint:script": "biome",
"lint": "npm run list:style && npm run lint:script",
"test": "vitest run --root=.",
"lint:script": "biome lint",
"lint": "npm run lint:style && npm run lint:script",
"test": "npm run check:types && npm run lint:style",
"test-ui": "vitest --ui",
"coverage": "vitest run --coverage",
"start": "npm run storybook:serve",
Expand All @@ -61,6 +62,7 @@
"vite-plugin-lib-inject-css": "^2.1.1",
"vite-plugin-svg-icons": "^2.0.1",
"typescript": "^5.6.3",
"@types/node": "^22.9.0",
"stylelint": "^16.10.0",
"stylelint-config-standard-scss": "^13.1.0",
"@biomejs/biome": "^1.9.4",
Expand Down
12 changes: 8 additions & 4 deletions package.json.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ const packageConfig = {
scripts: {
// Utilities
'gen-package': 'node package.json.js', // Update `package.json`
// Use --force currently since we're using React v19 rc. Once peer deps are updated remove this.
'install-project': 'npm run gen-package && npm install --force',
'ci-project': 'npm ci --force',

// CLI
'node': 'node --import=tsx',
Expand All @@ -59,14 +61,15 @@ const packageConfig = {
'storybook:build': 'storybook build --docs',

// Static analysis
'check-types': 'tsc --noEmit',
'check:types': 'tsc --noEmit',
'lint:style': `stylelint 'src/**/*.scss'`,
'lint:script': 'biome',
'lint': 'npm run list:style && npm run lint:script',
'lint:script': 'biome lint',
'lint': 'npm run lint:style && npm run lint:script',

// Test
// Note: use `vitest run --root=. src/...` to run a single test file
'test': 'vitest run --root=.', // Need to specify `--root=.` since the vite root is set to `./app`
//'test': 'vitest run --root=.', // Need to specify `--root=.` since the vite root is set to `./app`
'test': 'npm run check:types && npm run lint:style',
'test-ui': 'vitest --ui',
'coverage': 'vitest run --coverage',

Expand All @@ -93,6 +96,7 @@ const packageConfig = {

// Static analysis
'typescript': '^5.6.3',
'@types/node': '^22.9.0',
'stylelint': '^16.10.0',
'stylelint-config-standard-scss': '^13.1.0',
'@biomejs/biome': '^1.9.4',
Expand Down
4 changes: 2 additions & 2 deletions scripts/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const getServices = () => {

type ScriptArgs = {
values: {
help: boolean | undefined,
silent: boolean | undefined,
help?: undefined | boolean,
silent?: undefined | boolean,
},
positionals: Array<string>,
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/forms/context/Form/Form.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ type FormArgs = React.ComponentProps<typeof Form>;
type Story = StoryObj<FormArgs>;

const FormWithState = (props: React.ComponentProps<typeof Form>) => {
const action = async (previousState: unknown, formData: FormData) => {
const action = async (previousState: unknown, formData: FormData): Promise<null> => {
if (typeof props.action === 'function') {
return props.action?.(formData);
return props.action?.(formData) ?? null;
}
return null;
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/forms/context/Form/FormOptics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export { cl as FormClassNames };

export type FormContext<T> = {
formId: string,
accessor: O.OpticFor<T>,
//accessor: O.OpticFor<T>,
};
export const FormContext = React.createContext<null | FormContext<unknown>>(null);
export const useFormContext = <T,>(): FormContext<T> => {
Expand All @@ -43,7 +43,7 @@ export const Form = (props: FormProps) => {
const [wrapperRef, setWrapperRef] = React.useState<null | React.ComponentRef<'div'>>(null);

// Memoize to keep a stable reference
const context: FormContext = React.useMemo(() => ({ formId }), [formId]);
const context: FormContext<unknown> = React.useMemo(() => ({ formId }), [formId]);

const renderForm = ({ children }: { children: React.ReactNode }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigations/Stepper/Stepper.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

&.bk-stepper--vertical {
.bk-stepper__item {
&:not(:first-child):not(:first-child) {
&:not(:first-child) {
margin-top: bk.$spacing-9;

.bk-stepper__item__circle {
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigations/Tabs/Tabs.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type DefaultTabOption = {
className?: string,
};
const defaultTabOptions: DefaultTabOption[] = [1,2,3,4].map(index => {
return { index }
return { index };
});

type TabWithTriggerProps = React.PropsWithChildren<Partial<TabsArgs>> & {
Expand Down
17 changes: 8 additions & 9 deletions src/components/overlays/Toast/Toast.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

@layer baklava.components {
.bk-toast {
width: auto !important; // Override style for .Toastify__toast-container
padding: 0 !important; // Override style for .Toastify__toast-container
width: 400px !important; // Override style for .Toastify__toast-container

Expand All @@ -15,7 +14,7 @@
margin-right: bk.$spacing-4 !important; // Override style for .Toastify__toast-body
}
}

.bk-toast--success,
.bk-toast--info,
.bk-toast--error {
Expand All @@ -42,21 +41,21 @@
// Override style for .Toastify__toast-theme--light
background-color: #{bk.$theme-notification-alert-background-default} !important;
}

.bk-toast__icon--success,
.bk-toast__icon--info,
.bk-toast__icon--error {
font-size: 18px;
}

.bk-toast__icon--success {
color: #{bk.$theme-notification-success-border-default};
}

.bk-toast__icon--info {
color: #{bk.$theme-notification-informational-border-default};
}

.bk-toast__icon--error {
color: #{bk.$theme-notification-alert-border-default};
}
Expand All @@ -83,7 +82,7 @@
flex-direction: column;
gap: bk.$spacing-1;
}

.bk-toast__message__title {
font-weight: bk.$font-weight-semibold;
}
Expand All @@ -107,15 +106,15 @@
opacity: 1 !important; // Override style for .Toastify__progress-bar
background-color: #{bk.$theme-progress-bar-fill} !important; // Override style for .Toastify__progress-bar
}

.bk-toast__button,
.bk-toast__copy-button {
padding: 0;
color: bk.$theme-notification-text-link;
font-size: 12px;
font-weight: bk.$font-weight-semibold;
}

.bk-toast__link {
font-weight: bk.$font-weight-semibold;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/overlays/Toast/ToastyOverride.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
|* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of
|* the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */

/* stylelint-disable selector-class-pattern */

@use '../../../styling/defs.scss' as bk;

// Define styling to override react-toastify's styles, as overriding directly from Toast.module.scss is not possible.
Expand Down
18 changes: 9 additions & 9 deletions src/components/overlays/Tooltip/Tooltip.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
background: var(--c1);

&::before {
content: "";
content: '';
position: absolute;
z-index: -1;
inset: 0;
Expand Down Expand Up @@ -72,16 +72,16 @@
100% min(100%,var(--p) + var(--h)*tan(var(--a)/2)),
calc(100% + var(--h)) var(--p),
100% max(0% ,var(--p) - var(--h)*tan(var(--a)/2)));
border-image: conic-gradient(var(--c1) 0 0) fill 0/
max(0%,var(--p) - var(--h)*tan(var(--a)/2)) 0 max(0%,100% - var(--p) - var(--h)*tan(var(--a)/2)) var(--r)/0 var(--h) 0 0;
border-image: conic-gradient(var(--c1) 0 0) fill 0
/ max(0%,var(--p) - var(--h)*tan(var(--a)/2)) 0 max(0%,100% - var(--p) - var(--h)*tan(var(--a)/2)) var(--r)/0 var(--h) 0 0;

&::before {
clip-path: polygon(100% 0,0 0,0 100%,100% 100%,
calc(100% - var(--b)) min(100% - var(--b),var(--p) + var(--h)*tan(var(--a)/2) - var(--b)*tan(45deg - var(--a)/4)),
calc(100% + var(--h) - var(--b)/sin(var(--a)/2)) var(--p),
calc(100% - var(--b)) max( var(--b),var(--p) - var(--h)*tan(var(--a)/2) + var(--b)*tan(45deg - var(--a)/4)));
border-image: conic-gradient(var(--c2) 0 0) fill 0/
max(var(--b),var(--p) - var(--h)*tan(var(--a)/2)) 0 max(var(--b),100% - var(--p) - var(--h)*tan(var(--a)/2)) var(--r)/0 var(--h) 0 0;
border-image: conic-gradient(var(--c2) 0 0) fill 0
/ max(var(--b),var(--p) - var(--h)*tan(var(--a)/2)) 0 max(var(--b),100% - var(--p) - var(--h)*tan(var(--a)/2)) var(--r)/0 var(--h) 0 0;
}
}
@mixin bk-tooltip-arrow-bottom {
Expand All @@ -108,16 +108,16 @@
0 min(100%,var(--p) + var(--h)*tan(var(--a)/2)),
calc(-1*var(--h)) var(--p),
0 max(0% ,var(--p) - var(--h)*tan(var(--a)/2)));
border-image: conic-gradient(var(--c1) 0 0) fill 0/
max(0%,var(--p) - var(--h)*tan(var(--a)/2)) var(--r) max(0%,100% - var(--p) - var(--h)*tan(var(--a)/2)) 0/0 0 0 var(--h);
border-image: conic-gradient(var(--c1) 0 0) fill 0
/ max(0%,var(--p) - var(--h)*tan(var(--a)/2)) var(--r) max(0%,100% - var(--p) - var(--h)*tan(var(--a)/2)) 0/0 0 0 var(--h);

&::before {
clip-path: polygon(0 0,100% 0,100% 100%,0 100%,
var(--b) min(100% - var(--b),var(--p) + var(--h)*tan(var(--a)/2) - var(--b)*tan(45deg - var(--a)/4)),
calc(var(--b)/sin(var(--a)/2) - var(--h)) var(--p),
var(--b) max( var(--b),var(--p) - var(--h)*tan(var(--a)/2) + var(--b)*tan(45deg - var(--a)/4)));
border-image: conic-gradient(var(--c2) 0 0) fill 0/
max(var(--b),var(--p) - var(--h)*tan(var(--a)/2)) var(--r) max(var(--b),100% - var(--p) - var(--h)*tan(var(--a)/2)) 0/0 0 0 var(--h);
border-image: conic-gradient(var(--c2) 0 0) fill 0
/ max(var(--b),var(--p) - var(--h)*tan(var(--a)/2)) var(--r) max(var(--b),100% - var(--p) - var(--h)*tan(var(--a)/2)) 0/0 0 0 var(--h);
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/layouts/AppLayout/Sidebar/Sidebar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
transition: all 300ms ease-in-out;
transition-property: width, grid-template-columns;

&.-collapsed {
width: var(--bk-sizing-5);
}

.bk-app-layout-sidebar__action-collapse {
margin: var(--bk-sizing-2);
padding: var(--bk-sizing-1) var(--bk-sizing-2);
Expand Down
2 changes: 1 addition & 1 deletion stylelint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default {
'rules': {
// Override `stylelint-config-standard-scss` rules
'scss/load-partial-extension': 'always',
'scss/at-import-partial-extension': 'always',
//'scss/at-import-partial-extension': 'always',
'comment-empty-line-before': null,
'comment-whitespace-inside': null,
'scss/comment-no-empty': null,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
"exclude": [
"node_modules",
"**/*.spec.ts",
"src/components/navigations/Tabs/Tabs.stories.tsx", // TEMP: need to fix a few type errors
],
"include": [
//"vite.config.ts",
"app/**/*",
"src/**/*",
"scripts/**/*",
],
"references": [{ "path": "./tsconfig.node.json" }],
}
2 changes: 2 additions & 0 deletions tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"emitDeclarationOnly": true,
"composite": true,
"skipLibCheck": true,
"target": "es2022",
"module": "ESNext",
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
Expand All @@ -19,5 +20,6 @@
},
"include": [
"vite.config.ts",
"scripts/**/*",
],
}