Merge branch 'main' into next

Author: abichinger

.github/workflows/release-docs.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - next
+      - vue2
 
 jobs:
   build-and-deploy:
@@ -28,11 +29,22 @@ jobs:
         with:
           branch: gh-pages
           folder: docs/src/.vuepress/dist
+          clean-exclude: |
+            next
+            vue2
 
       - name: Deploy next
         if: github.ref == 'refs/heads/next'
         uses: JamesIves/github-pages-deploy-action@4.1.7
         with:
           branch: gh-pages
           folder: docs/src/.vuepress/dist
-          target-folder: ./next
+          target-folder: ./next
+
+      - name: Deploy vue2
+        if: github.ref == 'refs/heads/vue2'
+        uses: JamesIves/github-pages-deploy-action@4.1.7
+        with:
+          branch: gh-pages
+          folder: docs/src/.vuepress/dist
+          target-folder: ./vue2

.gitignore

@@ -1,3 +1,6 @@
 .vscode
 node_modules
-dist
+dist
+
+vitepress-test
+vuepress-test

.releaserc.json

@@ -1,6 +1,7 @@
 {
     "branches": [
         { "name": "main" },
+        { "name": "vue2" },
         { "name": "next", "channel": "next" }
     ],
     "plugins": [

README.md

@@ -1,14 +1,15 @@
-# Vue.js Cron
-
-**generate cron expressions using Vue.js**
-
-![Vue.js Cron Hero](https://raw.githubusercontent.com/abichinger/vue-js-cron/main/assets/cron-light-hero.png)
+<p align="center">
+<img src="./assets/vue-js-cron-hero.png" alt="vue-js-cron Hero">
+</p>
+<p align="center">
+    <em>generate cron expressions using Vue.js</em>
+</p>
 
 # Getting Started
 
-Vue v2: [documentation](https://abichinger.github.io/vue-js-cron)
+Vue v3: [documentation](https://abichinger.github.io/vue-js-cron)
 
-Vue v3: [documentation](https://abichinger.github.io/vue-js-cron/next)
+Vue v2: [documentation](https://abichinger.github.io/vue-js-cron/vue2)
 
 # Packages
 
@@ -18,6 +19,7 @@ This monorepo includes the following packages:
 - light - a lightweight cron editor without external dependencies
 - vuetify - Vuetify component to edit cron expressions.
 - element-plus - Element Plus component
+- ant - Ant Design Vue component
 - docs - Vue.js Cron documentation powered by [VuePress](https://vuepress.vuejs.org/)
 
 # Development

ant/src/components/CustomSelect.vue

@@ -13,12 +13,12 @@
 
       <template #overlay>
         <a-menu multiple :selectedKeys="Array.isArray(modelValue) ? modelValue : [modelValue]">
-          <a-row class="vcron-a-row" type="flex" v-for="(itemRow, i) in itemRows" :key="i">
-            <a-col class="vcron-a-col"  :flex="1" v-for="(item, j) in itemRow" :key="j">
+          <div class="vcron-a-row" type="flex" v-for="(itemRow, i) in itemRows" :key="i">
+            <div class="vcron-a-col"  :flex="1" v-for="(item, j) in itemRow" :key="j">
               <a-menu-item v-if="item" :key="item[itemValue]" @click="select(item); updateVisibility();">{{item.text}}</a-menu-item>
               <a-menu-item v-else></a-menu-item>
-            </a-col>
-          </a-row>
+            </div>
+          </div>
         </a-menu>
       </template>
 
@@ -71,11 +71,12 @@ export default {
 <style scoped>
 
 .vcron-a-row {
-  flex-wrap: nowrap !important;
+  display: flex;
+  flex-wrap: nowrap;
 }
 
 .vcron-a-col {
-  flex-basis: 100% !important;
+  flex-basis: 100%;
   min-width: 0;
   text-align: center;
 }

assets/hero.svg

@@ -12,20 +12,17 @@
   "scripts": {
     "dev": "vuepress dev src",
     "build": "vuepress build src",
-    "clean": "git clean -xf src/.vuepress/dist"
+    "clean": "git clean -xf src/.vuepress/dist src/.vuepress/.temp src/.vuepress/.cache"
   },
   "license": "MIT",
   "devDependencies": {
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.49",
-    "@vuepress/plugin-register-components": "^2.0.0-beta.49",
-    "vuepress": "^2.0.0-beta.49"
-  },
-  "dependencies": {
-    "@vue-js-cron/core": "^3.0.0",
-    "@vue-js-cron/element-plus": "^1.0.0",
-    "@vue-js-cron/light": "^2.0.0",
-    "@vue-js-cron/vuetify": "^3.0.0",
-    "@vue-js-cron/ant": "^1.0.0",
-    "vuetify": "^3.0.0-beta.7"
+    "@vue-js-cron/ant": "file:../ant",
+    "@vue-js-cron/core": "file:../core",
+    "@vue-js-cron/element-plus": "file:../element-plus",
+    "@vue-js-cron/light": "file:../light",
+    "@vue-js-cron/vuetify": "file:../vuetify",
+    "@vuepress/plugin-register-components": "2.0.0-beta.51",
+    "@vuepress/plugin-google-analytics": "2.0.0-beta.51",
+    "vuepress": "2.0.0-beta.51"
   }
 }

assets/vue-js-cron-hero.png

@@ -10,24 +10,28 @@ import '@vue-js-cron/vuetify/dist/vuetify.css'
 
 import { createVuetify } from 'vuetify'
 import * as components from 'vuetify/components'
+import * as directives from 'vuetify/directives'
 import 'vuetify/styles'
 
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 
 import Ant from 'ant-design-vue'
+// import 'ant-design-vue/dist/antd.css'
 import '../styles/antd.css'
 
 import { defineClientConfig } from '@vuepress/client'
 
 import { variables } from './vars'
 
-const vuetify = createVuetify({
-  components
-})
-
 export default defineClientConfig({
   enhance ({ app, router, siteData }) {
+    const vuetify = createVuetify({
+      components,
+      directives,
+      ssr: true
+    })
+
     app.use(vuetify)
     app.use(ElementPlus)
     app.use(Ant)
@@ -48,16 +52,3 @@ export default defineClientConfig({
   setup () {},
   rootComponents: []
 })
-
-// export default ({
-//   Vue, // the version of Vue being used in the VuePress app
-//   options, // the options for the root Vue instance
-//   router, // the router instance for the app
-//   siteData // site metadata
-// }) => {
-//   Vue.use(Vuetify)
-//   options.vuetify = new Vuetify({})
-//   Vue.use(CronCore)
-//   Vue.use(CronVuetify)
-//   Vue.use(CronLight)
-// }

docs/package.json

@@ -1,17 +1,17 @@
-const { description } = require('../../package')
-const { defaultTheme } = require('@vuepress/theme-default')
-const { registerComponentsPlugin } = require('@vuepress/plugin-register-components')
-const { path } = require('@vuepress/utils')
-const { viteBundler } = require('@vuepress/bundler-vite')
-const { googleAnalyticsPlugin } = require('@vuepress/plugin-google-analytics')
+import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics'
+import { registerComponentsPlugin } from '@vuepress/plugin-register-components'
+import { defaultTheme } from '@vuepress/theme-default'
+import { path } from '@vuepress/utils'
+import { defineUserConfig, viteBundler } from 'vuepress'
+import { description } from '../../package'
 
-module.exports = {
+export default defineUserConfig({
 
   /**
    * Ref: https://v2.vuepress.vuejs.org/guide/configuration.html#config-file
    */
 
-  base: '/vue-js-cron/next/',
+  base: '/vue-js-cron/',
 
   title: 'Vue-js-cron Docs',
 
@@ -32,6 +32,10 @@ module.exports = {
     editLinkText: '',
     lastUpdated: false,
     navbar: [
+      {
+        text: 'Vue v2',
+        link: 'https://abichinger.github.io/vue-js-cron/vue2/'
+      },
       {
         text: 'Demo',
         link: '/demo'
@@ -108,7 +112,7 @@ module.exports = {
       // https://github.com/vuepress/vuepress-next/issues/585#issuecomment-1046188074
       // https://v2.vuepress.vuejs.org/reference/bundler/vite.html#ssr-externals-issue
       ssr: {
-        noExternal: ['vuetify', 'ant-design-vue']
+        noExternal: ['vuetify', '@vue-js-cron/core']
       }
     },
     vuePluginOptions: {}
@@ -129,4 +133,4 @@ module.exports = {
       id: 'G-8E2WXHH0QS'
     })
   ]
-}
+})

docs/src/.vuepress/client.js

@@ -15,12 +15,12 @@ If you would like to use a different UI framework, follow the quick start guide
 Open up a terminal and run the following command:
 
 ```bash 
-yarn add @vue-js-cron/light@next
+yarn add @vue-js-cron/light@latest
 ```
 or
 
 ```bash 
-npm install @vue-js-cron/light@next
+npm install @vue-js-cron/light@latest
 ```
 
 Then you need to register `vue-js-cron/light` with `app.use()`
@@ -58,12 +58,12 @@ Now you can use the `cron-light` component.
 Open up a terminal and run the following command:
 
 ```bash 
-yarn add @vue-js-cron/vuetify@next
+yarn add @vue-js-cron/vuetify@latest
 ```
 or
 
 ```bash 
-npm install @vue-js-cron/vuetify@next
+npm install @vue-js-cron/vuetify@latest
 ```
 
 Then you need to register `vue-js-cron/vuetify` with `app.use()`
@@ -102,12 +102,12 @@ Now you can use the `cron-vuetify` component.
 Open up a terminal and run the following command:
 
 ```bash 
-yarn add @vue-js-cron/element-plus@next
+yarn add @vue-js-cron/element-plus@latest
 ```
 or
 
 ```bash 
-npm install @vue-js-cron/element-plus@next
+npm install @vue-js-cron/element-plus@latest
 ```
 
 Then you need to register `@vue-js-cron/element-plus` with `app.use()`
@@ -145,12 +145,12 @@ Now you can use the `cron-element-plus` component.
 Open up a terminal and run the following command:
 
 ```bash 
-yarn add @vue-js-cron/ant@next
+yarn add @vue-js-cron/ant@latest
 ```
 or
 
 ```bash 
-npm install @vue-js-cron/ant@next
+npm install @vue-js-cron/ant@latest
 ```
 
 Then you need to register `@vue-js-cron/ant` with `app.use()`
@@ -187,12 +187,12 @@ In this example [Vuetify](https://vuetifyjs.com/en/) will be used to render the
 First open up a terminal and run the following command:
 
 ```bash 
-yarn add @vue-js-cron/core@next
+yarn add @vue-js-cron/core@latest
 ```
 or
 
 ```bash 
-npm install @vue-js-cron/core@next
+npm install @vue-js-cron/core@latest
 ```
 
 Then you need to register `vue-js-cron/core` with `Vue.app()`