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

Release v2.0.1 #8474

Merged
merged 63 commits into from
May 13, 2024
Merged

Release v2.0.1 #8474

merged 63 commits into from
May 13, 2024

Conversation

amplication[bot] and others added 30 commits May 3, 2024 07:26
# Conflicts:
#	.vscode/settings.json
#	ee/packages/git-sync-manager/src/models.ts
#	libs/ui/design-system/src/lib/components/CircularProgress/CircularProgress.tsx
#	libs/util/billing-types/src/lib/billing-feature.types.ts
#	libs/util/code-gen-types/src/code-gen-types.ts
#	libs/util/code-gen-types/src/models.ts
#	package-lock.json
#	package.json
#	packages/amplication-build-manager/src/build-runner/build-runner.service.spec.ts
#	packages/amplication-build-manager/src/build-runner/build-runner.service.ts
#	packages/amplication-build-manager/src/code-generator/code-generator-catalog.service.spec.ts
#	packages/amplication-build-manager/src/code-generator/code-generator-catalog.service.ts
#	packages/amplication-build-manager/src/types.ts
#	packages/amplication-cli/src/models.ts
#	packages/amplication-client/src/Assistant/Assistant.scss
#	packages/amplication-client/src/Assistant/Assistant.tsx
#	packages/amplication-client/src/Assistant/AssistantMessage.tsx
#	packages/amplication-client/src/Assistant/hooks/useAssistant.tsx
#	packages/amplication-client/src/Assistant/queries/assistantQueries.ts
#	packages/amplication-client/src/Components/FeatureIndicatorContainer.tsx
#	packages/amplication-client/src/Entity/EntityERD/EntitiesERD.tsx
#	packages/amplication-client/src/Entity/EntityList.scss
#	packages/amplication-client/src/Entity/EntityList.tsx
#	packages/amplication-client/src/Entity/NewEntity.tsx
#	packages/amplication-client/src/ModuleActions/NewModuleAction.tsx
#	packages/amplication-client/src/Modules/ModulesToolbar.scss
#	packages/amplication-client/src/Modules/NewModuleChild.tsx
#	packages/amplication-client/src/Project/ProjectList.tsx
#	packages/amplication-client/src/Resource/AddResourceFunctionalityButton.tsx
#	packages/amplication-client/src/Resource/PluginsTile.scss
#	packages/amplication-client/src/Resource/PluginsTile.tsx
#	packages/amplication-client/src/Resource/ResourceOverview.tsx
#	packages/amplication-client/src/Resource/hooks/useResourceSummary.tsx
#	packages/amplication-client/src/UsageInsights/UsageInsights.tsx
#	packages/amplication-client/src/UsageInsights/UsageInsightsDataBox.scss
#	packages/amplication-client/src/UsageInsights/UsageInsightsDataBox.tsx
#	packages/amplication-client/src/VersionControl/Commit.scss
#	packages/amplication-client/src/VersionControl/Commit.tsx
#	packages/amplication-client/src/Workspaces/ResourceList.tsx
#	packages/amplication-client/src/Workspaces/WorkspaceHeader/WorkspaceHeader.tsx
#	packages/amplication-client/src/Workspaces/WorkspaceLayout.tsx
#	packages/amplication-client/src/models.ts
#	packages/amplication-client/src/util/analytics-events.types.ts
#	packages/amplication-plugin-api/prisma/schema.prisma
#	packages/amplication-plugin-api/src/plugin/base/Plugin.ts
#	packages/amplication-plugin-api/src/plugin/base/PluginCreateInput.ts
#	packages/amplication-plugin-api/src/plugin/base/PluginOrderByInput.ts
#	packages/amplication-plugin-api/src/plugin/base/PluginUpdateInput.ts
#	packages/amplication-plugin-api/src/plugin/base/PluginWhereInput.ts
#	packages/amplication-prisma-db/prisma/schema.prisma
#	packages/amplication-server/src/core/assistant/assistant.module.ts
#	packages/amplication-server/src/core/assistant/assistant.service.spec.ts
#	packages/amplication-server/src/core/assistant/assistant.service.ts
#	packages/amplication-server/src/core/assistant/dto/AssistantMessageDelta.ts
#	packages/amplication-server/src/core/build/build.service.ts
#	packages/amplication-server/src/core/entity/entity.service.ts
#	packages/amplication-server/src/core/resource/resource.resolver.ts
#	packages/amplication-server/src/core/resource/resource.service.ts
#	packages/amplication-server/src/models/Resource.ts
#	packages/amplication-server/src/schema.graphql
#	packages/amplication-server/src/services/segmentAnalytics/segmentAnalyticsEventType.types.ts
#	packages/data-service-generator-catalog-admin/Dockerfile
#	packages/data-service-generator-catalog-admin/README.md
#	packages/data-service-generator-catalog-admin/configuration/nginx.conf
#	packages/data-service-generator-catalog-admin/src/App.tsx
#	packages/data-service-generator-catalog-admin/src/api/version/Version.ts
#	packages/data-service-generator-catalog-admin/src/api/version/VersionCreateInput.ts
#	packages/data-service-generator-catalog-admin/src/api/version/VersionOrderByInput.ts
#	packages/data-service-generator-catalog-admin/src/api/version/VersionUpdateInput.ts
#	packages/data-service-generator-catalog-admin/src/api/version/VersionWhereInput.ts
#	packages/data-service-generator-catalog-admin/src/index.tsx
#	packages/data-service-generator-catalog-admin/src/user/RolesOptions.ts
#	packages/data-service-generator-catalog-admin/src/user/UserTitle.ts
#	packages/data-service-generator-catalog-admin/src/version/VersionCreate.tsx
#	packages/data-service-generator-catalog-admin/src/version/VersionEdit.tsx
#	packages/data-service-generator-catalog-admin/src/version/VersionList.tsx
#	packages/data-service-generator-catalog-admin/src/version/VersionShow.tsx
#	packages/data-service-generator-catalog-admin/src/version/VersionTitle.ts
#	packages/data-service-generator-catalog/.env
#	packages/data-service-generator-catalog/README.md
#	packages/data-service-generator-catalog/jest.config.ts
#	packages/data-service-generator-catalog/prisma/schema.prisma
#	packages/data-service-generator-catalog/src/app.module.ts
#	packages/data-service-generator-catalog/src/auth/IAuthStrategy.ts
#	packages/data-service-generator-catalog/src/auth/abac.util.ts
#	packages/data-service-generator-catalog/src/auth/acl.module.ts
#	packages/data-service-generator-catalog/src/auth/auth.module.ts
#	packages/data-service-generator-catalog/src/auth/auth.service.spec.ts
#	packages/data-service-generator-catalog/src/auth/auth.service.ts
#	packages/data-service-generator-catalog/src/auth/gqlDefaultAuth.guard.ts
#	packages/data-service-generator-catalog/src/auth/jwt/base/jwt.strategy.base.ts
#	packages/data-service-generator-catalog/src/auth/jwt/jwt.strategy.ts
#	packages/data-service-generator-catalog/src/auth/jwt/jwtSecretFactory.ts
#	packages/data-service-generator-catalog/src/auth/token.service.ts
#	packages/data-service-generator-catalog/src/constants.ts
#	packages/data-service-generator-catalog/src/grants.json
#	packages/data-service-generator-catalog/src/prisma.util.ts
#	packages/data-service-generator-catalog/src/providers/secrets/base/secretsManager.service.base.spec.ts
#	packages/data-service-generator-catalog/src/providers/secrets/base/secretsManager.service.base.ts
#	packages/data-service-generator-catalog/src/swagger/swagger.css
#	packages/data-service-generator-catalog/src/tests/auth/jwt/jwt.strategy.spec.ts
#	packages/data-service-generator-catalog/src/user/base/User.ts
#	packages/data-service-generator-catalog/src/user/base/UserCreateInput.ts
#	packages/data-service-generator-catalog/src/user/base/UserUpdateInput.ts
#	packages/data-service-generator-catalog/src/user/base/user.controller.base.spec.ts
#	packages/data-service-generator-catalog/src/user/base/user.controller.base.ts
#	packages/data-service-generator-catalog/src/user/base/user.module.base.ts
#	packages/data-service-generator-catalog/src/user/base/user.resolver.base.ts
#	packages/data-service-generator-catalog/src/user/base/user.service.base.ts
#	packages/data-service-generator-catalog/src/version/base/Version.ts
#	packages/data-service-generator-catalog/src/version/base/VersionCreateInput.ts
#	packages/data-service-generator-catalog/src/version/base/VersionOrderByInput.ts
#	packages/data-service-generator-catalog/src/version/base/VersionUpdateInput.ts
#	packages/data-service-generator-catalog/src/version/base/VersionWhereInput.ts
#	packages/data-service-generator-catalog/src/version/base/version.controller.base.spec.ts
#	packages/data-service-generator-catalog/src/version/base/version.controller.base.ts
#	packages/data-service-generator-catalog/src/version/base/version.module.base.ts
#	packages/data-service-generator-catalog/src/version/base/version.resolver.base.ts
#	packages/data-service-generator-catalog/src/version/base/version.service.base.ts
#	packages/data-service-generator-catalog/src/version/version.service.ts
#	packages/data-service-generator/src/models.ts
#	packages/data-service-generator/src/tests/appInfo.ts
#	packages/local-data-service-generator-controller/src/code-gen/code-gen.controller.ts
#	packages/local-data-service-generator-controller/src/code-gen/types.ts
…gin-api

feat(plugin-api): add generator name configuration to plugin
…or-support-sync

feat(dsg-catalog):  add multi generator support in version sync
…-nx-caching

chore(server): remove gql schema and model generation from the nx cacheable targets
@overbit overbit marked this pull request as ready for review May 13, 2024 14:17
@overbit overbit merged commit aad8cd7 into master May 13, 2024
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment