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

feat: merge the studio next and studio apps #1141

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Disable specific file since it would introduce more complexity to reduce it - mainly code complexity and complex template literals
sonar.exclusions=apps/studio/public/js/monaco/**,apps/studio/src/tailwind.css,apps/studio/src/components/SplitPane/**,apps/studio-next/cypress/**,apps/studio-next/Dockerfile
sonar.exclusions=apps/studio/public/js/monaco/**,apps/studio/src/tailwind.css,apps/studio/src/components/SplitPane/**,apps/studio/cypress/**,apps/studio/Dockerfile
# Disable duplicate code in tests since it would introduce more complexity to reduce it.
sonar.cpd.exclusions=apps/studio/**,apps/studio-next/src/components/Navigationv3.tsx,apps/studio-next/src/components/Navigation.tsx,apps/studio-next/cypress/**,apps/studio-next/src/helpers/driver.ts
sonar.cpd.exclusions=apps/studio/**,apps/studio/src/components/Navigationv3.tsx,apps/studio/src/components/Navigation.tsx,apps/studio/cypress/**,apps/studio/src/helpers/driver.ts
catosaurusrex2003 marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 0 additions & 6 deletions apps/studio-next/netlify.toml

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/studio-next/CHANGELOG.md → apps/studio/CHANGELOG.md
catosaurusrex2003 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# studio-next
# studio

## 0.1.4

Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions apps/studio/netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[devs]
functions = "apps/studio/src/netlify/functions"
targetPort = 3001

[build]
functions = "apps/studio/src/netlify/functions"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@asyncapi/studio-next",
"name": "@asyncapi/studio",
"version": "0.1.4",
catosaurusrex2003 marked this conversation as resolved.
Show resolved Hide resolved
"description": "One place that allows you to develop an AsyncAPI document, validate it, convert it to the latest version, preview the documentation and visualize the events flow.",
"license": "Apache-2.0",
Expand Down Expand Up @@ -103,6 +103,7 @@
"browserify-zlib": "^0.2.0",
"buffer": "^6.0.3",
"cypress": "^13.10.0",
"eslint-config-custom": "workspace:*",
"eslint-config-next": "14.1.4",
"eslint-plugin-security": "^1.5.0",
"eslint-plugin-sonarjs": "^0.16.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { Metadata } from 'next';
import ogImage from '@/img/meta-studio-og-image.jpeg';

export const metadata: Metadata = {
metadataBase: new URL('https://studio-next.netlify.app'),
metadataBase: new URL('https://studio.netlify.app'),
openGraph: {
type: 'website',
title: 'AsyncAPI Studio',
description: 'Studio for AsyncAPI specification, where you can validate, view preview documentation, and generate templates from AsyncAPI document.',
url: 'https://studio-next.netlify.app',
url: 'https://studio.netlify.app',
images: [
{
url: ogImage.src,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": "turbo run lint",
"dev": "turbo run dev",
"ds": "turbo run dev --no-cache --continue --filter=design-system...",
"studio": "turbo run dev --no-cache --filter=studio-next...",
"studio": "turbo run dev --no-cache --filter=studio...",
"clean": "turbo run clean && rm -rf node_modules",
"build": "turbo run build",
"test": "turbo run test",
Expand All @@ -17,7 +17,6 @@
"publish-packages": "turbo run build && changeset publish",
"build:studio": "turbo run build --no-cache --filter=studio...",
"build:ds": "turbo run build --filter=design-system...",
"build:studio-next": "turbo run build --no-cache --filter=studio-next...",
"generate:assets": "turbo run generate:assets"
},
"devDependencies": {
Expand Down
Loading
Loading