Skip to content

Commit

Permalink
Merge branch 'master' into StoryBook-8
Browse files Browse the repository at this point in the history
  • Loading branch information
TechQuery authored Nov 16, 2024
2 parents 27350d6 + 446deca commit 917236a
Show file tree
Hide file tree
Showing 34 changed files with 7,084 additions and 3,937 deletions.
17 changes: 0 additions & 17 deletions .eslintrc.json

This file was deleted.

17 changes: 17 additions & 0 deletions .github/pr-badge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- icon: visualstudio
label: 'GitHub.dev'
message: 'PR-$prNumber'
color: 'blue'
url: 'https://github.dev/$owner/$repo/pull/$prNumber'

- icon: github
label: 'GitHub codespaces'
message: 'PR-$prNumber'
color: 'black'
url: 'https://codespaces.new/$owner/$repo/pull/$prNumber'

- icon: git
label: 'GitPod.io'
message: 'PR-$prNumber'
color: 'orange'
url: 'https://gitpod.io/?autostart=true#https://github.com/$owner/$repo/pull/$prNumber'
15 changes: 9 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,30 @@ on:
jobs:
Build-and-Publish:
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org
cache: pnpm
- name: Install Dependencies
run: pnpm i --frozen-lockfile

- name: Build & Publish
run: npm publish
run: npm publish --access public --provenance
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Update document
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
publish_dir: ./docs
personal_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
24 changes: 24 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
# and commit this file to your remote git repository to share the goodness with others.

# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart

vscode:
extensions:
- yzhang.markdown-all-in-one
- jock.svg
- redhat.vscode-yaml
- clinyong.vscode-css-modules
- akamud.vscode-caniuse
- visualstudioexptteam.intellicode-api-usage-examples
- pflannery.vscode-versionlens
- christian-kohler.npm-intellisense
- esbenp.prettier-vscode
- rangav.vscode-thunder-client
- eamodio.gitlens
- github.vscode-pull-request-github
- github.vscode-github-actions
tasks:
- init: pnpm i
command: pnpm build
10 changes: 3 additions & 7 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
.eslintrc.json
.*
eslint.config.mjs
vite.config.ts
.parcel*
docs/
preview/
api-extractor.json
stories/
.storybook/
storybook-static/
.vscode/
.husky/
.github/
storybook-static/
42 changes: 24 additions & 18 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,29 @@ A **[React][1] advanced components library** based on [TypeScript][2] & [Bootstr

### Components

1. [Time Distance](source/TimeDistance.tsx)
2. [Icon](source/Icon.tsx)
3. [Avatar](source/Avatar.tsx)
4. [Nameplate](source/Nameplate.tsx)
5. [Type Echo](source/TypeEcho.tsx)
6. [Click Boundary](source/ClickBoundary.tsx)
7. [Spinner Button](source/SpinnerButton.tsx)
8. [Select](source/Select.tsx)
9. [Month Calendar](source/MonthCalendar.tsx)
10. [Code Block](source/CodeBlock.tsx)
11. [Page Nav](source/PageNav.tsx)
12. [Editor](source/Editor.tsx)
13. [Editor HTML](source/EditorHTML.tsx)
14. [Table Spinner](source/TableSpinner.tsx)
15. [Loading](source/Loading.tsx)
16. [Share Box](source/ShareBox.tsx)
17. [Overlay Box](source/OverlayBox.tsx)
18. [Dialog](source/Dialog.tsx)
1. [Time](source/Time.tsx)
2. [Time Distance](source/TimeDistance.tsx)
3. [Timeline](source/Timeline/)
4. [Icon](source/Icon.tsx)
5. [Avatar](source/Avatar.tsx)
6. [Nameplate](source/Nameplate.tsx)
7. [Type Echo](source/TypeEcho.tsx)
8. [Horizontal Marquee](source/HorizontalMarquee/)
9. [Vertical Marquee](source/VerticalMarquee/)
10. [Click Boundary](source/ClickBoundary.tsx)
11. [Spinner Button](source/SpinnerButton.tsx)
12. [Select](source/Select.tsx)
13. [Month Calendar](source/MonthCalendar.tsx)
14. [Code Block](source/CodeBlock.tsx)
15. [Page Nav](source/PageNav.tsx)
16. [Editor](source/Editor.tsx)
17. [Editor HTML](source/EditorHTML.tsx)
18. [Table Spinner](source/TableSpinner.tsx)
19. [Loading](source/Loading.tsx)
20. [Share Box](source/ShareBox.tsx)
21. [Overlay Box](source/OverlayBox.tsx)
22. [Dialog](source/Dialog.tsx)
23. [User Rank](source/UserRank/)

#### Data components

Expand Down Expand Up @@ -81,6 +86,7 @@ Open Map component & model, have been migrated to https://github.com/idea2app/Op
rel="stylesheet"
href="https://unpkg.com/[email protected]/themes/prism.min.css"
/>
<link rel="stylesheet" href="https://unpkg.com/idea-react/dist/index.css" />
```

### `tsconfig.json`
Expand Down
71 changes: 71 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// @ts-check
import { fixupPluginRules } from '@eslint/compat';
import eslint from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import reactPlugin from 'eslint-plugin-react';
import simpleImportSortPlugin from 'eslint-plugin-simple-import-sort';
import globals from 'globals';
import tsEslint from 'typescript-eslint';
import { fileURLToPath } from 'url';

const tsconfigRootDir = fileURLToPath(new URL('.', import.meta.url));

export default tsEslint.config(
// register all of the plugins up-front
{
plugins: {
'@typescript-eslint': tsEslint.plugin,
// @ts-expect-error https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
react: fixupPluginRules(reactPlugin),
'simple-import-sort': simpleImportSortPlugin
}
},
// config with just ignores is the replacement for `.eslintignore`
{ ignores: ['**/node_modules/**', '**/dist/**', '**/.parcel-cache/**'] },

// extends ...
eslint.configs.recommended,
...tsEslint.configs.recommended,

// base config
{
languageOptions: {
globals: { ...globals.es2020, ...globals.browser, ...globals.node },
parserOptions: {
projectService: true,
tsconfigRootDir,
warnOnUnsupportedTypeScriptVersion: false
}
},
rules: {
'simple-import-sort/exports': 'error',
'simple-import-sort/imports': 'error',
'react/jsx-no-target-blank': 'warn',
'react/jsx-sort-props': [
'error',
{
reservedFirst: true,
shorthandLast: true,
callbacksLast: true,
noSortAlphabetically: true
}
],
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-declaration-merging': 'warn'
}
},
{
files: ['**/*.js'],
extends: [tsEslint.configs.disableTypeChecked],
rules: {
// turn off other type-aware rules
'@typescript-eslint/internal/no-poorly-typed-ts-props': 'off',

// turn off rules that don't apply to JS code
'@typescript-eslint/explicit-function-return-type': 'off'
}
},
eslintConfigPrettier
);
72 changes: 40 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "idea-react",
"version": "2.0.0-rc.3",
"version": "2.0.0-rc.8",
"license": "LGPL-3.0-or-later",
"author": "[email protected]",
"description": "A React advanced components library based on TypeScript & Bootstrap, built by idea2app remote developers team.",
Expand All @@ -22,37 +22,40 @@
"types": "dist/index.d.ts",
"main": "dist/index.js",
"dependencies": {
"@editorjs/editorjs": "^2.30.2",
"@editorjs/editorjs": "^2.30.6",
"@editorjs/paragraph": "^2.11.6",
"@react-editor-js/core": "^2.1.0",
"@swc/helpers": "^0.5.12",
"@swc/helpers": "^0.5.13",
"classnames": "^2.5.1",
"editorjs-html": "^3.4.3",
"html2canvas": "^1.4.1",
"iterable-observer": "^1.0.1",
"iterable-observer": "^1.1.0",
"lodash": "^4.17.21",
"mobx": ">=6.11",
"mobx-react": ">=9.1",
"mobx-react-helper": "^0.3.1",
"prismjs": "^1.29.0",
"react-bootstrap": "^2.10.4",
"react-bootstrap": "^2.10.5",
"react-editor-js": "^2.1.0",
"react-element-to-jsx-string": "^15.0.0",
"web-utility": "^4.4.0"
"web-utility": "^4.4.1"
},
"peerDependencies": {
"react": ">=16",
"react-dom": ">=16"
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@microsoft/api-extractor": "^7.47.2",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/preset-typescript": "^7.26.0",
"@eslint/compat": "^1.2.1",
"@eslint/js": "^9.13.0",
"@microsoft/api-extractor": "^7.47.11",
"@parcel/config-default": "~2.12.0",
"@parcel/packager-ts": "~2.12.0",
"@parcel/transformer-less": "2.12.0",
"@parcel/transformer-typescript-tsc": "~2.12.0",
"@parcel/transformer-typescript-types": "~2.12.0",
"@storybook/addon-console": "^3.0.0",
"@softonus/prettier-plugin-duplicate-remover": "^1.0.1",
"@storybook/addon-essentials": "^8.2.5",
"@storybook/addon-interactions": "^8.2.5",
"@storybook/addon-links": "^8.2.5",
Expand All @@ -62,45 +65,50 @@
"@storybook/react": "^8.2.5",
"@storybook/react-vite": "^8.2.5",
"@storybook/test": "^8.2.5",
"@types/lodash": "^4.17.7",
"@types/node": "^18.19.41",
"@types/prismjs": "^1.26.4",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"@types/lodash": "^4.17.12",
"@types/node": "^20.17.1",
"@types/prismjs": "^1.26.5",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-simple-import-sort": "^12.1.1",
"husky": "^9.1.1",
"globals": "^15.11.0",
"husky": "^9.1.6",
"koapache": "^2.2.2",
"less": "^4.2.0",
"lint-staged": "^15.2.7",
"lint-staged": "^15.2.10",
"parcel": "~2.12.0",
"postcss-preset-env": "^9.6.0",
"postcss-preset-env": "^10.0.8",
"prettier": "^3.3.3",
"prettier-plugin-css-order": "^2.1.2",
"process": "^0.11.10",
"prop-types": "15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rimraf": "^5.0.9",
"rimraf": "^6.0.1",
"storybook": "^8.2.5",
"typedoc": "^0.26.4",
"typedoc-plugin-mdn-links": "^3.2.5",
"typescript": "~5.5.3",
"vite": "^5.3.4"
"typedoc": "^0.26.10",
"typedoc-plugin-mdn-links": "^3.3.4",
"typescript": "~5.6.3",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10"
},
"prettier": {
"singleQuote": true,
"trailingComma": "none",
"arrowParens": "avoid",
"tabWidth": 4
"tabWidth": 4,
"plugins": [
"prettier-plugin-css-order",
"@softonus/prettier-plugin-duplicate-remover"
]
},
"lint-staged": {
"*.{md,less,json,yml,ts,tsx}": "prettier --write",
"*.{js,jsx,ts,tsx}": "eslint --fix"
"*.{md,less,json,yml,js,mjs,ts,tsx}": "prettier --write",
"*.{js,ts,tsx}": "eslint --fix"
},
"browserslist": "> 0.5%, last 2 versions, not dead, IE 11",
"targets": {
Expand All @@ -114,7 +122,7 @@
"api-extractor": "tsc --project tsconfig.build.json --outDir dist/dts && api-extractor run && rimraf dist/dts",
"pack-preview": "cd preview/ && rimraf ../.parcel-cache dist/ && parcel build --public-url=. --dist-dir=../docs/preview/",
"pack-docs": "rimraf docs/ && typedoc source/",
"pack-dist": "rimraf .parcel-cache/ dist/ && parcel build",
"pack-dist": "rimraf .parcel-cache/ dist/ && parcel build && sed -i 's/^require(\"\\.\\/index\\.css\");//' dist/index.js && rimraf dist/index.js.map",
"start": "npm run pack-docs && npm run pack-preview && web-server docs/ -p 8080 -o",
"build": "npm run pack-docs && npm run pack-preview && npm run pack-dist && npm run api-extractor",
"prepublishOnly": "npm test && npm run build",
Expand Down
Loading

0 comments on commit 917236a

Please sign in to comment.