diff --git a/.github/workflows/build-next.yml b/.github/workflows/build.yml
similarity index 96%
rename from .github/workflows/build-next.yml
rename to .github/workflows/build.yml
index e318485e3..2c61fae44 100644
--- a/.github/workflows/build-next.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Oruga (next)
+name: Build Oruga
on:
push:
branches: [ develop ]
diff --git a/.github/workflows/ts-next-check.yml b/.github/workflows/ts-check.yml
similarity index 95%
rename from .github/workflows/ts-next-check.yml
rename to .github/workflows/ts-check.yml
index 83013a48c..1f261956a 100644
--- a/.github/workflows/ts-next-check.yml
+++ b/.github/workflows/ts-check.yml
@@ -1,4 +1,4 @@
-name: TS Check (next)
+name: TS Check
on:
push:
branches: [ develop ]
diff --git a/.gitignore b/.gitignore
index 72153c729..cb7150eba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,12 @@
.DS_Store
node_modules
-packages/docs/.vuepress/dist/
-packages/storybook/.dist/
-packages/storybook/*
-packages/demo-vue3/*
-packages/oruga-next/README.md
-packages/docs-next/.vitepress/cache/
-packages/docs-next/.vitepress/.cache/
-packages/docs-next/.vitepress/.temp/
-packages/docs-next/.vitepress/dist/
-packages/demo-vue3/*
.changelogs
*.json.lerna_backup
.idea
.nyc_output
.vscode
+packages/docs/.vitepress/cache/
+packages/docs/.vitepress/.cache/
+packages/docs/.vitepress/.temp/
+packages/docs/.vitepress/dist/
+packages/oruga/README.md
diff --git a/.scripts/config-sync.js b/.scripts/config-sync.js
index a5d3d2449..2bb72ea48 100755
--- a/.scripts/config-sync.js
+++ b/.scripts/config-sync.js
@@ -1,10 +1,10 @@
const replace = require('replace-in-file')
const jsonPaths = [
- 'packages/docs-next/package.json',
- 'packages/docs-next/package-lock.json',
- 'packages/oruga-next/package.json',
- 'packages/oruga-next/package-lock.json',
+ 'packages/docs/package.json',
+ 'packages/docs/package-lock.json',
+ 'packages/oruga/package.json',
+ 'packages/oruga/package-lock.json',
]
const version = require('../package.json').version
diff --git a/.scripts/gen-comp-types.mjs b/.scripts/gen-comp-types.mjs
index dd07eaa8f..afc199432 100644
--- a/.scripts/gen-comp-types.mjs
+++ b/.scripts/gen-comp-types.mjs
@@ -3,7 +3,7 @@ import fs from 'fs-extra'
import path from 'path'
import process from 'process'
-import { createComponentMetaChecker } from '../packages/oruga-next/node_modules/vue-component-meta/out/index.js';
+import { createComponentMetaChecker } from '../packages/oruga/node_modules/vue-component-meta/out/index.js';
import { componentDirectory, getFolders, getComponents, exist } from "./utils.mjs";
diff --git a/.scripts/gen-volar-dts.mjs b/.scripts/gen-volar-dts.mjs
index d0bf624a1..82678eccc 100644
--- a/.scripts/gen-volar-dts.mjs
+++ b/.scripts/gen-volar-dts.mjs
@@ -47,4 +47,4 @@ export {};
// generate main package volar file
generateComponentsType("@oruga-ui/oruga-next", 'volar.d.ts');
// generate docs package volar file
-generateComponentsType("../oruga-next/dist/types", '../docs-next/volar.d.ts');
+generateComponentsType("../oruga/dist/types", '../docs/volar.d.ts');
diff --git a/README.md b/README.md
index 496a80877..3e3ab16a5 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-
+
-
+
diff --git a/packages/README.md b/packages/README.md
index fcb3b0375..33e31fbde 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -2,5 +2,5 @@
## Packages for Oruga
-1. **docs-next** - Oruga documentation
-2. **oruga-next** - Main source code for Oruga
+1. **docs** - Oruga documentation
+2. **oruga** - Main source code for Oruga
diff --git a/packages/docs-next/volar.d.ts b/packages/docs-next/volar.d.ts
deleted file mode 100644
index 4cc4fe498..000000000
--- a/packages/docs-next/volar.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Auto generated component declarations
-declare module "vue" {
- export interface GlobalComponents {
- OAutocomplete: (typeof import("../oruga-next/dist/types"))["OAutocomplete"];
- OButton: (typeof import("../oruga-next/dist/types"))["OButton"];
- OCarousel: (typeof import("../oruga-next/dist/types"))["OCarousel"];
- OCarouselItem: (typeof import("../oruga-next/dist/types"))["OCarouselItem"];
- OCheckbox: (typeof import("../oruga-next/dist/types"))["OCheckbox"];
- OCollapse: (typeof import("../oruga-next/dist/types"))["OCollapse"];
- ODatepicker: (typeof import("../oruga-next/dist/types"))["ODatepicker"];
- ODatetimepicker: (typeof import("../oruga-next/dist/types"))["ODatetimepicker"];
- ODropdown: (typeof import("../oruga-next/dist/types"))["ODropdown"];
- ODropdownItem: (typeof import("../oruga-next/dist/types"))["ODropdownItem"];
- OField: (typeof import("../oruga-next/dist/types"))["OField"];
- OIcon: (typeof import("../oruga-next/dist/types"))["OIcon"];
- OInput: (typeof import("../oruga-next/dist/types"))["OInput"];
- OLoading: (typeof import("../oruga-next/dist/types"))["OLoading"];
- OMenu: (typeof import("../oruga-next/dist/types"))["OMenu"];
- OMenuItem: (typeof import("../oruga-next/dist/types"))["OMenuItem"];
- OModal: (typeof import("../oruga-next/dist/types"))["OModal"];
- ONotification: (typeof import("../oruga-next/dist/types"))["ONotification"];
- OPagination: (typeof import("../oruga-next/dist/types"))["OPagination"];
- ORadio: (typeof import("../oruga-next/dist/types"))["ORadio"];
- OSelect: (typeof import("../oruga-next/dist/types"))["OSelect"];
- OSidebar: (typeof import("../oruga-next/dist/types"))["OSidebar"];
- OSkeleton: (typeof import("../oruga-next/dist/types"))["OSkeleton"];
- OSlider: (typeof import("../oruga-next/dist/types"))["OSlider"];
- OSliderTick: (typeof import("../oruga-next/dist/types"))["OSliderTick"];
- OStepItem: (typeof import("../oruga-next/dist/types"))["OStepItem"];
- OSteps: (typeof import("../oruga-next/dist/types"))["OSteps"];
- OSwitch: (typeof import("../oruga-next/dist/types"))["OSwitch"];
- OTable: (typeof import("../oruga-next/dist/types"))["OTable"];
- OTableColumn: (typeof import("../oruga-next/dist/types"))["OTableColumn"];
- OTabItem: (typeof import("../oruga-next/dist/types"))["OTabItem"];
- OTabs: (typeof import("../oruga-next/dist/types"))["OTabs"];
- OTaginput: (typeof import("../oruga-next/dist/types"))["OTaginput"];
- OTimepicker: (typeof import("../oruga-next/dist/types"))["OTimepicker"];
- OTooltip: (typeof import("../oruga-next/dist/types"))["OTooltip"];
- OUpload: (typeof import("../oruga-next/dist/types"))["OUpload"];
- }
-}
-export {};
diff --git a/packages/docs-next/.eslintrc.cjs b/packages/docs/.eslintrc.cjs
similarity index 100%
rename from packages/docs-next/.eslintrc.cjs
rename to packages/docs/.eslintrc.cjs
diff --git a/packages/docs-next/.vitepress/config.ts b/packages/docs/.vitepress/config.ts
similarity index 98%
rename from packages/docs-next/.vitepress/config.ts
rename to packages/docs/.vitepress/config.ts
index 4dbabcf3a..e945da509 100644
--- a/packages/docs-next/.vitepress/config.ts
+++ b/packages/docs/.vitepress/config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "vitepress";
import path from "path";
import fs from "fs";
-import { version } from "../../oruga-next/package.json";
+import { version } from "../../oruga/package.json";
const componentsFolder = path.join(__dirname, "../components/");
const components = fs
diff --git a/packages/docs-next/.vitepress/meta/robots.txt b/packages/docs/.vitepress/meta/robots.txt
similarity index 100%
rename from packages/docs-next/.vitepress/meta/robots.txt
rename to packages/docs/.vitepress/meta/robots.txt
diff --git a/packages/docs-next/.vitepress/theme/components/ExampleViewer.vue b/packages/docs/.vitepress/theme/components/ExampleViewer.vue
similarity index 98%
rename from packages/docs-next/.vitepress/theme/components/ExampleViewer.vue
rename to packages/docs/.vitepress/theme/components/ExampleViewer.vue
index 65a516b5f..f305a0318 100644
--- a/packages/docs-next/.vitepress/theme/components/ExampleViewer.vue
+++ b/packages/docs/.vitepress/theme/components/ExampleViewer.vue
@@ -18,7 +18,7 @@ const codeComputed = computed(() => {
const code = props.code;
return code
.replace(/\.\.\//g, "")
- .replace("oruga-next/dist/oruga", "@oruga-ui/oruga-next");
+ .replace("oruga/dist/oruga", "@oruga-ui/oruga-next");
});
const scriptCode = computed(() =>
diff --git a/packages/docs-next/.vitepress/theme/components/Expo.vue b/packages/docs/.vitepress/theme/components/Expo.vue
similarity index 100%
rename from packages/docs-next/.vitepress/theme/components/Expo.vue
rename to packages/docs/.vitepress/theme/components/Expo.vue
diff --git a/packages/docs-next/.vitepress/theme/components/Inspector.vue b/packages/docs/.vitepress/theme/components/Inspector.vue
similarity index 100%
rename from packages/docs-next/.vitepress/theme/components/Inspector.vue
rename to packages/docs/.vitepress/theme/components/Inspector.vue
diff --git a/packages/docs-next/.vitepress/theme/components/InspectorWrapper.vue b/packages/docs/.vitepress/theme/components/InspectorWrapper.vue
similarity index 96%
rename from packages/docs-next/.vitepress/theme/components/InspectorWrapper.vue
rename to packages/docs/.vitepress/theme/components/InspectorWrapper.vue
index e9109aa9a..1b9887665 100644
--- a/packages/docs-next/.vitepress/theme/components/InspectorWrapper.vue
+++ b/packages/docs/.vitepress/theme/components/InspectorWrapper.vue
@@ -1,6 +1,6 @@