diff --git a/.gitignore b/.gitignore index b21ab3bf..a5109d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,6 @@ storybook-static .DS_Store .nyc_output /docs/.vuepress/dist/ -/packages/tailwind/COLORS.JSON # Yarn .pnp.* diff --git a/.storybook/main.ts b/.storybook/main.ts index 12f9ba17..25f74e32 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -1,7 +1,7 @@ import type { StorybookConfig } from "@storybook/react-vite"; const config: StorybookConfig = { - staticDirs: ["../packages/tailwind/build"], + staticDirs: ["../packages/tailwind-formio/build"], stories: [ "../stories/Getting-started.mdx", diff --git a/commitlint.config.cjs b/commitlint.config.cjs deleted file mode 100644 index 5073c20d..00000000 --- a/commitlint.config.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = { extends: ["@commitlint/config-conventional"] }; diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 00000000..fa584fb6 --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1 @@ +export default { extends: ["@commitlint/config-conventional"] }; diff --git a/package.json b/package.json index a87ff7f1..f746e844 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ }, "homepage": "https://github.com/TypedProject/tsed-formio", "scripts": { - "/postinstall": "lerna run build --stream", "configure": "monorepo ci configure", "test": "lerna run test --stream", "lint": "eslint", @@ -22,12 +21,12 @@ "build": "monorepo build --verbose", "publish": "monorepo publish --dry-run", "start": "lerna run start --stream --parallel", - "tailwind:build": "lerna run tailwind:build --stream --scope @tsed/tailwind", + "tailwind:build": "lerna run build --stream --scope @tsed/tailwind-formio", "release": "semantic-release", "prepare": "is-ci || husky install", - "storybook:test": "yarn test-storybook", - "storybook:test:ci": "yarn test-storybook --maxWorkers=2", - "storybook:start": "storybook dev -p 6006", + "storybook:test": "yarn build && yarn test-storybook", + "storybook:test:ci": "yarn build && yarn test-storybook --maxWorkers=2", + "storybook:start": "yarn tailwind:build && storybook dev -p 6006", "storybook:build": "yarn run tailwind:build && yarn run build-storybook", "build-storybook": "storybook build -c .storybook", "caniuse": "npx -y update-browserslist-db@latest", @@ -46,10 +45,11 @@ "@types/react-router-dom": "^5.3.3", "@types/react-table": "^7.7.14", "connected-react-router": "6.9.1", - "formiojs": "^4.14.13", + "formiojs": "4.21.6", "history": "5.3.0", "lerna": "8.1.2", "lodash": "4.17.21", + "nodemon": "3.1.9", "react": "^18.2.0", "react-dom": "^18.2.0", "react-redux": "7.2.6", @@ -76,11 +76,11 @@ "@storybook/test-runner": "0.21.0", "@swc/core": "^1.2.208", "@swc/jest": "^0.2.21", - "@testing-library/dom": "^8.14.0", - "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^12.1.5", - "@testing-library/user-event": "^14.2.1", - "@tsed/monorepo-utils": "2.1.2", + "@testing-library/dom": "10.4.0", + "@testing-library/jest-dom": "6.5.0", + "@testing-library/react": "16.1.0", + "@testing-library/user-event": "14.5.2", + "@tsed/monorepo-utils": "2.3.10", "@types/ejs": "^3.0.5", "@types/jest": "27.0.2", "@types/lodash": "4.14.168", @@ -108,19 +108,17 @@ "eslint-plugin-workspaces": "0.10.1", "fs-extra": "10.1.0", "globby": "^14.0.2", - "happy-dom": "^16.0.0", "husky": "^8.0.1", + "jsdom": "25.0.1", "lint-staged": "13.0.3", - "microbundle": "0.13.0", "playwright": "1.49.1", "postcss": "8.4.49", "postcss-nested": "7.0.2", "postcss-normalize": "13.0.1", "prettier": "3.4.2", "prop-types": "^15.8.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-svg": "10.0.23", + "react": "18.3.1", + "react-dom": "18.3.1", "rimraf": "^3.0.2", "rollup-preserve-directives": "^1.1.3", "semantic-release": "23.0.5", diff --git a/packages/integration/index.html b/packages/integration/index.html new file mode 100644 index 00000000..e4b78eae --- /dev/null +++ b/packages/integration/index.html @@ -0,0 +1,13 @@ + + +
+ + + +