diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9979d20862..8ce98c3457 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,13 +21,9 @@ jobs: cd ${{ github.workspace }}/site/_themes yarn install --frozen-lockfile yarn build - mv dist/js ../assets/js/themes - cd ../assets/js/themes - FILE=../../../_includes/themes.html - echo "" > $FILE - for f in *.js; do - echo "" >> $FILE - done + rm -rf ../assets/js/themes + mv dist/themes.html ../_includes/themes.html + mv dist ../assets/js/themes - uses: ruby/setup-ruby@v1 with: diff --git a/site/_themes/.eslintrc.js b/site/_themes/.eslintrc.cjs similarity index 100% rename from site/_themes/.eslintrc.js rename to site/_themes/.eslintrc.cjs diff --git a/site/_themes/babel.config.js b/site/_themes/babel.config.js deleted file mode 100644 index e9558405fd..0000000000 --- a/site/_themes/babel.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} diff --git a/site/_themes/public/index.html b/site/_themes/index.html similarity index 55% rename from site/_themes/public/index.html rename to site/_themes/index.html index e6ed50ce55..9bcb947a09 100644 --- a/site/_themes/public/index.html +++ b/site/_themes/index.html @@ -4,9 +4,9 @@ - Themes + @@ -16,11 +16,11 @@
- +
@@ -36,7 +36,6 @@
  • Themes - New
  • @@ -64,16 +63,27 @@ @@ -90,6 +100,6 @@

    Themes and Templates

    - + diff --git a/site/_themes/package.json b/site/_themes/package.json index 3fca9bdf09..8f4d8368fc 100644 --- a/site/_themes/package.json +++ b/site/_themes/package.json @@ -2,23 +2,20 @@ "name": "themes", "version": "1.0.0", "private": true, + "module": "type", "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "serve": "vite", + "build": "vite build", + "lint": "eslint ." }, "dependencies": { - "core-js": "^3.4.3", - "vue": "^2.6.10" + "vue": "^3.4.31" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.1.0", - "@vue/cli-plugin-eslint": "^4.1.0", - "@vue/cli-service": "^4.1.0", - "babel-eslint": "^10.0.3", - "eslint": "^5.16.0", - "eslint-plugin-vue": "^5.0.0", - "vue-template-compiler": "^2.6.10" + "@vitejs/plugin-vue": "^5.0.5", + "eslint": "^8.49.0", + "eslint-plugin-vue": "^9.27.0", + "vite": "^5.3.3" }, "eslintConfig": { "root": true, @@ -26,12 +23,12 @@ "node": true }, "extends": [ - "plugin:vue/essential", + "plugin:vue/vue3-essential", "eslint:recommended" ], "rules": {}, "parserOptions": { - "parser": "babel-eslint" + "ecmaVersion": "latest" } }, "browserslist": [ diff --git a/site/_themes/public/themes.html b/site/_themes/public/themes.html deleted file mode 100644 index 90edafb644..0000000000 --- a/site/_themes/public/themes.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/site/_themes/src/App.vue b/site/_themes/src/App.vue index 4d2a648101..666ced454c 100644 --- a/site/_themes/src/App.vue +++ b/site/_themes/src/App.vue @@ -2,7 +2,7 @@
    - diff --git a/site/_themes/src/components/Categories.vue b/site/_themes/src/components/Categories.vue index 96cabaa9d7..78bf735291 100644 --- a/site/_themes/src/components/Categories.vue +++ b/site/_themes/src/components/Categories.vue @@ -14,67 +14,64 @@ - diff --git a/site/_themes/src/components/List.vue b/site/_themes/src/components/List.vue index 3b770742ad..dd235ca195 100644 --- a/site/_themes/src/components/List.vue +++ b/site/_themes/src/components/List.vue @@ -1,5 +1,8 @@ - diff --git a/site/_themes/src/main.js b/site/_themes/src/main.js index fca74cfc96..9da844011b 100644 --- a/site/_themes/src/main.js +++ b/site/_themes/src/main.js @@ -1,8 +1,8 @@ -import Vue from 'vue' +import { createApp } from 'vue' import App from './App.vue' -Vue.config.productionTip = false +const app = createApp(App) -new Vue({ - render: h => h(App) -}).$mount('#app') +app.__VUE_PROD_DEVTOOLS__ = process.env.NODE_ENV === 'development' + +app.mount('#app') diff --git a/site/_themes/themes.html b/site/_themes/themes.html new file mode 100644 index 0000000000..e8c6cdbecb --- /dev/null +++ b/site/_themes/themes.html @@ -0,0 +1,3 @@ + +
    + diff --git a/site/_themes/vite.config.js b/site/_themes/vite.config.js new file mode 100644 index 0000000000..b3095119c2 --- /dev/null +++ b/site/_themes/vite.config.js @@ -0,0 +1,33 @@ +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +const proxyTarget = { + target: 'http://localhost:9001' +} + +// https://vitejs.dev/config/ +export default defineConfig({ + base: process.env.NODE_ENV === 'production' ? '/assets/js/themes/' : './', + plugins: [ + vue() + ], + resolve: { + extensions: ['.js', '.vue', '.json'] + }, + build: { + rollupOptions: { + input: process.env.NODE_ENV === 'production' ? 'themes.html' : 'index.html', + } + }, + server: { + host: '0.0.0.0', + https: false, + hotOnly: false, + proxy: { + '/favicon.png': proxyTarget, + '/assets': proxyTarget, + '/docs': proxyTarget, + '/themes': proxyTarget + } + } +}) diff --git a/site/_themes/vue.config.js b/site/_themes/vue.config.js deleted file mode 100644 index 2b9cd929fa..0000000000 --- a/site/_themes/vue.config.js +++ /dev/null @@ -1,30 +0,0 @@ -module.exports = { - productionSourceMap: false, - publicPath: process.env.NODE_ENV === 'production' ? '/assets/js/themes/' : './', - css: { extract: false }, - chainWebpack: config => { - config - .plugin('html') - .tap(args => { - if (process.env.NODE_ENV === 'production') { - args[0].filename = 'themes.html' - args[0].template = './public/themes.html' - } - return args - }) - }, - devServer: { - open: false, - host: '0.0.0.0', - https: false, - hotOnly: false, - proxy: { - '/assets': { - target: 'http://localhost:9001' - }, - '/themes': { - target: 'http://localhost:9001' - } - } - } -}