Skip to content

Commit

Permalink
feat(build): Rename @kaoto-next scope to @kaoto
Browse files Browse the repository at this point in the history
With the upcoming 2.0 GA release, we need to use the official package
name and leave `@kaoto-next` for experimental topics.

fix: #1009
  • Loading branch information
lordrip committed Apr 29, 2024
1 parent 4a0fdaf commit 2260f06
Show file tree
Hide file tree
Showing 119 changed files with 262 additions and 272 deletions.
11 changes: 5 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ body:
value: |
Thank you for reporting an issue :pray:.
- This issue tracker is for reporting bugs found in [Kaoto UI](https://github.com/KaotoIO/kaoto-next)
- This issue tracker is for reporting bugs found in [Kaoto UI](https://github.com/KaotoIO/kaoto)
- If you have a question about how to achieve something and are struggling, please post a question
inside of Kaoto's [Discussions](https://github.com/KaotoIO/kaoto-next/discussions)
inside of Kaoto's [Discussions](https://github.com/KaotoIO/kaoto/discussions)
- If it's an issue about the website please go to the [kaoto.io website repo](https://github.com/KaotoIO/kaoto.io)
- If it's an issue about the backend or API, please go to [that repo](https://github.com/KaotoIO/kaoto-backend)
Before submitting a new bug/issue, please check the links below to see if there is a solution or question posted there already:
- [Kaoto's Open Issues](https://github.com/KaotoIO/kaoto-next/issues?q=is%3Aissue+sort%3Aupdated-desc+position)
- [Kaoto's Closed Issues](https://github.com/KaotoIO/kaoto-next/issues?q=is%3Aissue+sort%3Aupdated-desc+position+is%3Aclosed)
- [Kaoto Discussions](https://github.com/KaotoIO/kaoto-next/discussions)
- [Kaoto's Open Issues](https://github.com/KaotoIO/kaoto/issues?q=is%3Aissue+sort%3Aupdated-desc+position)
- [Kaoto's Closed Issues](https://github.com/KaotoIO/kaoto/issues?q=is%3Aissue+sort%3Aupdated-desc+position+is%3Aclosed)
- [Kaoto Discussions](https://github.com/KaotoIO/kaoto/discussions)
The more information you fill in, the better the community can help you.
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 🤔 Questions & Discussions
url: https://github.com/KaotoIO/kaoto-next/discussions
url: https://github.com/KaotoIO/kaoto/discussions
about: Please ask and answer questions here.
12 changes: 6 additions & 6 deletions .github/workflows/build-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
scope: '@kaoto-next'
scope: '@kaoto'
cache: 'yarn'

- uses: actions/setup-java@v4
Expand All @@ -34,16 +34,16 @@ jobs:

# Lint style files
- name: 💅 Run stylelint
run: yarn workspace @kaoto-next/ui run lint:style
run: yarn workspace @kaoto/kaoto run lint:style

# Run tests
- name: 🧪 Run tests
run: yarn workspaces foreach --verbose --topological-dev run test

# Build packages excluding @kaoto-next/camel-catalog since it was build during installing dependencies
# Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
- name: Build packages
run: yarn workspaces foreach --verbose --topological-dev --exclude @kaoto-next/camel-catalog run build
run: yarn workspaces foreach --verbose --topological-dev --exclude @kaoto/camel-catalog run build

# Build lib
- name: Build @kaoto-next/ui package in lib mode
run: yarn workspace @kaoto-next/ui run build:lib
- name: Build @kaoto/kaoto package in lib mode
run: yarn workspace @kaoto/kaoto run build:lib
8 changes: 4 additions & 4 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
# List of jobs
jobs:
chromatic-deployment:
if: github.repository == 'KaotoIO/kaoto-next' && github.actor != 'renovate[bot]' && !github.event.pull_request.draft
if: github.repository == 'KaotoIO/kaoto' && github.actor != 'renovate[bot]' && !github.event.pull_request.draft
# Operating System
runs-on: ubuntu-latest
# Job steps
Expand All @@ -34,7 +34,7 @@ jobs:
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
scope: '@kaoto-next'
scope: '@kaoto'
cache: 'yarn'

- uses: actions/setup-java@v4
Expand All @@ -47,9 +47,9 @@ jobs:
- name: Install dependencies
run: yarn

# 👇 Builds the kaoto-next/ui in library mode
# 👇 Builds the kaoto/ui in library mode
- name: Build ui library
run: yarn workspace @kaoto-next/ui run build:lib
run: yarn workspace @kaoto/kaoto run build:lib

# 👇 Adds Chromatic as a step in the workflow
- name: Publish to Chromatic
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
scope: "@kaoto-next"
scope: "@kaoto"
cache: "yarn"

- name: "🛰️ Setup Java"
Expand All @@ -41,10 +41,10 @@ jobs:
- name: "🔧 Install dependencies"
run: yarn

# Build packages excluding @kaoto-next/camel-catalog since it was build during installing dependencies
# Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
- name: "🔧 Build packages"
run: |
yarn workspaces foreach --verbose --topological-dev --exclude @kaoto-next/camel-catalog run build
yarn workspaces foreach --verbose --topological-dev --exclude @kaoto/camel-catalog run build
- name: "🔧 Tar UI Dist"
shell: bash
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
mkdir -p packages/ui/dist
tar -xzf "${{ runner.temp }}/kaoto-ui.tgz" -C packages/ui/dist
- name: "📤 Upload artifact @kaoto-next/ui web application"
- name: "📤 Upload artifact @kaoto/kaoto web application"
uses: actions/upload-pages-artifact@v3
with:
path: "packages/ui/dist"
Expand All @@ -92,7 +92,7 @@ jobs:
uses: actions/deploy-pages@v4

deploy-images:
if: github.repository == 'KaotoIO/kaoto-next'
if: github.repository == 'KaotoIO/kaoto'
runs-on: ubuntu-latest
needs:
- build-distribution
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ jobs:
# Install dependencies
- run: yarn install --immutable

# Build packages excluding @kaoto-next/camel-catalog since it was build during installing dependencies
# Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
- name: Build packages
run: yarn workspaces foreach --verbose --topological-dev --exclude @kaoto-next/camel-catalog run build
run: yarn workspaces foreach --verbose --topological-dev --exclude @kaoto/camel-catalog run build

# Build lib
- name: Build @kaoto-next/ui package in lib mode
run: yarn workspace @kaoto-next/ui run build:lib
- name: Build @kaoto/kaoto package in lib mode
run: yarn workspace @kaoto/kaoto run build:lib

- name: 💾 Save build folder
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
browser: firefox
# we have already installed all dependencies above
# install: false
start: yarn workspace @kaoto-next/ui run preview
start: yarn workspace @kaoto/kaoto run preview
config: baseUrl=http://localhost:4173
working-directory: packages/ui-tests
wait-on: 'http://localhost:4173'
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
browser: chrome
# we have already installed all dependencies above
# install: false
start: yarn workspace @kaoto-next/ui run preview
start: yarn workspace @kaoto/kaoto run preview
config: baseUrl=http://localhost:4173
working-directory: packages/ui-tests
wait-on: 'http://localhost:4173'
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
browser: edge
# we have already installed all dependencies above
# install: false
start: yarn workspace @kaoto-next/ui run preview
start: yarn workspace @kaoto/kaoto run preview
config: baseUrl=http://localhost:4173
working-directory: packages/ui-tests
wait-on: 'http://localhost:4173'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
scope: '@kaoto-next'
scope: '@kaoto'
cache: 'yarn'

- uses: actions/setup-java@v4
Expand All @@ -65,8 +65,8 @@ jobs:
run: yarn

# Build lib
- name: Build @kaoto-next/ui package in lib mode
run: yarn workspace @kaoto-next/ui run build:lib
- name: Build @kaoto/kaoto package in lib mode
run: yarn workspace @kaoto/kaoto run build:lib

# Version and publish
- name: 'Version and publish'
Expand All @@ -91,7 +91,7 @@ jobs:
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
scope: '@kaoto-next'
scope: '@kaoto'
cache: 'yarn'

- uses: actions/setup-java@v4
Expand All @@ -105,7 +105,7 @@ jobs:

- name: "🔧 Build packages"
run: |
yarn workspaces foreach --verbose --topological-dev --exclude @kaoto-next/camel-catalog run build
yarn workspaces foreach --verbose --topological-dev --exclude @kaoto/camel-catalog run build
- name: "🛰️ Login to Container Registry"
uses: docker/login-action@v3
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to Kaoto-Next
# Contributing to Kaoto

Thank you for considering contributing to Kaoto-next! Community contributions are essential for the project's success, and we welcome bug fixes, documentation improvements, feature additions, and more.
Thank you for considering contributing to Kaoto! Community contributions are essential for the project's success, and we welcome bug fixes, documentation improvements, feature additions, and more.

## Getting Started

Expand All @@ -18,7 +18,7 @@ Before you start contributing, ensure that you have the following installed:
- Fork the project to your GitHub account by clicking the 'Fork' button on the project's GitHub page.

2. **Clone Your Fork**:
- Clone your fork using `git clone https://github.com/YOUR_USERNAME/kaoto-next.git`.
- Clone your fork using `git clone https://github.com/YOUR_USERNAME/kaoto.git`.

3. **Install Dependencies**:
- Navigate to the cloned folder and run `yarn install` to install all necessary dependencies.
Expand All @@ -30,7 +30,7 @@ Before you start contributing, ensure that you have the following installed:

### Find or Create an Issue

- Look for existing issues on the [GitHub Issues page](https://github.com/KaotoIO/kaoto-next/issues).
- Look for existing issues on the [GitHub Issues page](https://github.com/KaotoIO/kaoto/issues).
- If you want to work on something new, feel free to create a new issue and discuss it with the team.

### Create a Feature Branch
Expand All @@ -49,7 +49,7 @@ Before you start contributing, ensure that you have the following installed:

### Submit a Pull Request (PR)

- Create a pull request from your fork to the main Kaoto-next repository.
- Create a pull request from your fork to the main Kaoto repository.
- Provide a detailed description of your changes, referencing any related issues.
- Await feedback or approval from the maintainers.

Expand All @@ -71,12 +71,12 @@ Before you start contributing, ensure that you have the following installed:

---

Your contributions make Kaoto-next better, and we sincerely appreciate your support and collaboration. Happy coding!
Your contributions make Kaoto better, and we sincerely appreciate your support and collaboration. Happy coding!

## Questions or Need Help?

If you have any questions or need assistance, feel free to create an issue on GitHub or contact the project maintainers directly.

---

Your contributions make Kaoto-next better, and we sincerely appreciate your support and collaboration. Happy coding!
Your contributions make Kaoto better, and we sincerely appreciate your support and collaboration. Happy coding!
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# kaoto-next
# kaoto
The next version of the UI for the Kaoto project.

https://kaotoio.github.io/kaoto/
Expand All @@ -8,7 +8,7 @@ https://kaotoio.github.io/kaoto/
- [Getting Started](#getting-started)
- [Clone the Repository](#clone-the-repository)
- [Install Dependencies](#install-dependencies)
- [Running kaoto-next with Docker](#running-kaoto-next-with-docker)
- [Running kaoto with Docker](#running-kaoto-with-docker)
- [Development](#development)
- [Web Application](#web-application)
- [Run](#run)
Expand All @@ -30,50 +30,50 @@ _For more information on Vite, check [Vite's documentation](https://vitejs.dev/c
First, clone the repository to your local machine.

```sh
git clone https://github.com/KaotoIO/kaoto-next
git clone https://github.com/KaotoIO/kaoto
```
### Install Dependencies

Navigate to the cloned directory and install the necessary packages.

```sh
cd kaoto-next
cd kaoto
yarn install
```
_Note: By default, `@kaoto-next/camel-catalog` will also be built using the `mvn` wrapper._
_Note: By default, `@kaoto/camel-catalog` will also be built using the `mvn` wrapper._

## Running kaoto-next with Docker
## Running kaoto with Docker
For trial purposes, there is a docker image that can be run locally:

```sh
docker run --rm -p 8080:8080 --name kaoto-next quay.io/kaotoio/kaoto-app:main
docker run --rm -p 8080:8080 --name kaoto quay.io/kaotoio/kaoto-app:main
```

## Development
### Web Application
#### Run
To start the development server, execute the following command:
```sh
yarn workspace @kaoto-next/ui run start
yarn workspace @kaoto/kaoto run start
```
The application will be accessible at `http://localhost:5173` by default.

#### Build
To build the web application, execute:
```sh
yarn workspace @kaoto-next/ui run build
yarn workspace @kaoto/kaoto run build
```

### Public Components
To build the public components, execute:
```sh
yarn workspace @kaoto-next/ui run build:lib
yarn workspace @kaoto/kaoto run build:lib
```

## Camel Catalog and Supporting Schemas
To build the Camel Catalog and the supporting schemas, run:
```sh
yarn workspace @kaoto-next/camel-catalog run build
yarn workspace @kaoto/camel-catalog run build
```
_Optional: You can update the Camel version in the `pom.xml` file and then run the build command again._

Expand All @@ -84,9 +84,9 @@ To view the storybook stories, go to [Chromatic](https://main--64ef22df8bb709ffa
To run Storybook locally:
``` bash
# first build the ui library
yarn workspace @kaoto-next/ui build:lib
yarn workspace @kaoto/kaoto build:lib

# run the storybook
yarn workspace @kaoto-next/ui-tests storybook
yarn workspace @kaoto/kaoto-tests storybook
```
To publish to Chromatic: `yarn workspace @kaoto-next/ui-tests chromatic`
To publish to Chromatic: `yarn workspace @kaoto/kaoto-tests chromatic`
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# kaoto-next
# kaoto
The next version of the UI for the Kaoto project.

## How to do a release
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "kaoto-next",
"name": "kaoto",
"version": "2.0.0-dev",
"description": "Next version of the UI of the Kaoto project",
"repository": "https://github.com/KaotoIO/kaoto-next",
"repository": "https://github.com/KaotoIO/kaoto",
"author": "The Kaoto Team",
"license": "Apache License v2.0",
"workspaces": [
Expand All @@ -25,7 +25,7 @@
"typescript": "5.4.5"
},
"scripts": {
"postinstall": "yarn workspace @kaoto-next/camel-catalog run build",
"postinstall": "yarn workspace @kaoto/camel-catalog run build",
"version": "lerna version",
"publish": "lerna publish from-package"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void populateDefinitions(ObjectNode schema, ObjectNode definitions) {
/**
* Extract single OneOf definition from AnyOf definition and put it into the root definitions.
* It's a workaround for the current Camel YAML DSL JSON schema, where some AnyOf definition
* contains only one OneOf definition. This can be removed once https://github.com/KaotoIO/kaoto-next/issues/948
* contains only one OneOf definition. This can be removed once https://github.com/KaotoIO/kaoto/issues/948
* is resolved.
* This is done mostly for the errorHandler definition, f.i.
* ```
Expand Down
4 changes: 2 additions & 2 deletions packages/camel-catalog/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@kaoto-next/camel-catalog",
"name": "@kaoto/camel-catalog",
"version": "2.0.0-dev",
"type": "commonjs",
"description": "Camel Catalog and schemas for Kaoto",
"repository": "https://github.com/KaotoIO/kaoto-next",
"repository": "https://github.com/KaotoIO/kaoto",
"repositoryDirectory": "packages/camel-catalog",
"author": "The Kaoto Team",
"license": "Apache License v2.0",
Expand Down
Loading

0 comments on commit 2260f06

Please sign in to comment.