Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main' into 315-comb…
Browse files Browse the repository at this point in the history
…obox-component

# Conflicts:
#	packages/components/package.json
#	packages/components/src/components/Options/Options.tsx
#	packages/components/src/components/Select/Select.tsx
#	packages/components/src/components/propTypes/index.ts
#	packages/components/src/integrations/react-hook-form/components/Field/Field.tsx
#	packages/components/src/integrations/react-hook-form/components/Field/stories/Default.stories.tsx
#	packages/components/vite.build.config.ts
  • Loading branch information
Lisa18289 committed Oct 22, 2024
2 parents b338273 + 838350e commit 87d7dc0
Show file tree
Hide file tree
Showing 816 changed files with 42,242 additions and 26,869 deletions.
34 changes: 0 additions & 34 deletions .eslintrc.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
groups:
nx:
patterns:
- "nx/*"
- "@nx/*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules
dist
.nx/cache
.nx/workspace-data
.yarn/*
!.yarn/patches
!.yarn/plugins
Expand All @@ -13,3 +14,4 @@ nx-cloud.env
packages/docs/src/lib/liveCode/dynamicImports.ts
.idea/material_theme_project_new.xml
coverage
.nx/workspace-data
7 changes: 7 additions & 0 deletions .idea/compiler.xml

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

22,128 changes: 8,835 additions & 13,293 deletions .pnp.cjs

Large diffs are not rendered by default.

64 changes: 40 additions & 24 deletions .pnp.loader.mjs

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

Loading

0 comments on commit 87d7dc0

Please sign in to comment.