Skip to content

Commit

Permalink
Merge branch 'main' into datetime-control
Browse files Browse the repository at this point in the history
  • Loading branch information
TrangPham committed Mar 20, 2024
2 parents fbece4d + d570957 commit 0409860
Show file tree
Hide file tree
Showing 79 changed files with 4,553 additions and 1,715 deletions.
15 changes: 13 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,18 @@ module.exports = {
],
ignorePatterns: ["dist", ".eslintrc.cjs", "lib"],
parser: "@typescript-eslint/parser",
plugins: ["react-refresh"],
plugins: ["react-refresh", "testing-library"],
overrides: [
{
files: ["./src/**/*.test.tsx"],
extends: ["plugin:testing-library/react"],
rules: {
"testing-library/prefer-implicit-assert": "error",
"testing-library/prefer-presence-queries": "error",
"testing-library/prefer-user-event": "error",
},
},
],
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
Expand All @@ -29,4 +40,4 @@ module.exports = {
version: "detect",
},
},
};
}
12 changes: 8 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: Release
on:
push:
Expand Down Expand Up @@ -26,12 +25,17 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
run_install: false
- name: Install dependencies
run: npm clean-install
run: pnpm i --frozen-lockfile
- name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
run: npm audit signatures
run: pnpm audit signatures
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release
run: npx semantic-release
10 changes: 10 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,15 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Dry-run of build
shell: bash
run: pnpm pack

- name: Run lint
run: pnpm lint

- name: Run format
run: pnpm format:check

- name: Run tests
run: pnpm test
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore artifacts:
pnpm-lock.yaml
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"semi": false
}
8 changes: 4 additions & 4 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { StorybookConfig } from "@storybook/react-vite";
import type { StorybookConfig } from "@storybook/react-vite"

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-onboarding",
"@storybook/addon-onboarding",
],
framework: {
name: "@storybook/react-vite",
Expand All @@ -14,5 +14,5 @@ const config: StorybookConfig = {
docs: {
autodocs: "tag",
},
};
export default config;
}
export default config
6 changes: 3 additions & 3 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Preview } from "@storybook/react";
import type { Preview } from "@storybook/react"

const preview: Preview = {
parameters: {
Expand All @@ -10,6 +10,6 @@ const preview: Preview = {
},
},
},
};
}

export default preview;
export default preview
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"editor.tabSize": 2,
}
"editor.tabSize": 2
}
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ $ npm install jsonforms-antd-renderers
```

```tsx
import { JsonForms } from "@jsonforms/react";
import { JsonForms } from "@jsonforms/react"
import {
rendererRegistryEntries,
cellRegistryEntries,
} from "jsonforms-antd-renderers";

<JsonForms
} from "jsonforms-antd-renderers"
;<JsonForms
schema={schema}
renderers={rendererRegistryEntries}
cells={cellRegistryEntries}
/>;
/>
```

## Contributing
Expand Down
31 changes: 20 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@great-expectations/jsonforms-antd-renderers",
"private": false,
"version": "0.1.0",
"files": [
"lib/**/*"
],
"version": "0.0.0-semantic-release",
"files": ["lib/**/*"],
"main": "./lib/cjs/index.js",
"types": "./lib/cjs/index.d.ts",
"exports": {
"require": {
"types": "./lib/cjs/index.d.ts",
Expand All @@ -21,9 +21,7 @@
"access": "public"
},
"release": {
"branches": [
"main"
]
"branches": ["main"]
},
"repository": {
"type": "git",
Expand All @@ -38,6 +36,8 @@
"test": "vitest",
"tsc": "tsc",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"format:write": "prettier . --write",
"format:check": "prettier . --check",
"preview": "vite preview",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build",
Expand All @@ -47,7 +47,6 @@
"@ant-design/icons": "^5.3.0",
"@jsonforms/core": "^3.2.1",
"@jsonforms/react": "^3.2.1",
"lodash.isempty": "^4.4.0",
"antd": "^5.14.0",
"date-fns": "^3.3.1",
"rc-picker": "^4.2.0",
Expand All @@ -69,6 +68,9 @@
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/lodash.isempty": "^4.4.9",
"@types/lodash.merge": "^4.6.9",
"@types/lodash.range": "^3.2.9",
"@types/lodash.startcase": "^4.4.9",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@typescript-eslint/eslint-plugin": "^6.14.0",
Expand All @@ -81,16 +83,23 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-testing-library": "^6.2.0",
"jsdom": "^24.0.0",
"json-schema-to-ts": "^3.0.0",
"lodash.isempty": "^4.4.0",
"rc-picker": "^4.2.0",
"prettier": "3.2.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"semantic-release": "^23.0.2",
"storybook": "^7.6.8",
"storybook": "^7.6.17",
"typescript": "^5.2.2",
"vite": "^5.0.11",
"vite": "^5.0.12",
"vitest": "^1.2.2"
},
"dependencies": {
"lodash.isempty": "^4.4.0",
"lodash.merge": "^4.6.2",
"lodash.range": "^3.2.0",
"lodash.startcase": "^4.4.0"
}
}
Loading

0 comments on commit 0409860

Please sign in to comment.