From 27b81d87aeb907f6c3d35ea6f55b4fe56c1e79b4 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 31 Mar 2021 17:13:57 +0200 Subject: [PATCH 01/20] =?UTF-8?q?=F0=9F=90=9E=20fixed=20Vite/=20Tailwind?= =?UTF-8?q?=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 ++++---- postcss.config.js | 2 +- tailwind.config.js | 20 ++++++++++---------- vite.config.js | 1 + 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index fd7a26f..2af0a5a 100644 --- a/package.json +++ b/package.json @@ -17,17 +17,17 @@ "vue-router": "4.0.5" }, "devDependencies": { - "@tailwindcss/jit": "0.1.17", + "@tailwindcss/jit": "0.1.18", "@tailwindcss/aspect-ratio": "0.2.0", "@tailwindcss/forms": "0.3.2", "@tailwindcss/line-clamp": "0.2.0", "@tailwindcss/typography": "0.4.0", - "@vitejs/plugin-vue": "1.2.0", - "@vue/compiler-sfc": "3.0.9", + "@vitejs/plugin-vue": "1.2.1", + "@vue/compiler-sfc": "3.0.10", "autoprefixer": "10.2.5", "tailwindcss": "2.0.4", "release-it": "14.5.0", - "vite": "2.1.3" + "vite": "2.1.5" }, "release-it": { "git": { diff --git a/postcss.config.js b/postcss.config.js index 33ad091..0a4ec09 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,6 +1,6 @@ module.exports = { plugins: { - tailwindcss: {}, + '@tailwindcss/jit': {}, autoprefixer: {}, }, } diff --git a/tailwind.config.js b/tailwind.config.js index 1c1f75b..8924ba6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,11 +1,11 @@ module.exports = { - purge: [], - darkMode: "media", // or 'media' or 'class' - theme: { - extend: {}, - }, - variants: { - extend: {}, - }, - plugins: [], -} + purge: [ './index.html', './src/**/*.{vue,js,ts,jsx,tsx}' ], + darkMode: 'media', // or 'media' or 'class' + theme: { + extend: {} + }, + variants: { + extend: {} + }, + plugins: [] +}; diff --git a/vite.config.js b/vite.config.js index d3340f4..8a45b2f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,6 +4,7 @@ import path from 'path'; export default defineConfig({ plugins: [ vue() ], + base: './', resolve: { alias: { '@': path.resolve(__dirname, '/src') From 6e0bf56289852cda0c30325f4b8ca7826386abf4 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 31 Mar 2021 17:14:20 +0200 Subject: [PATCH 02/20] =?UTF-8?q?=F0=9F=9A=80Bumped=20version=20to=20v0.3.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aa7112..04b4ed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,17 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [0.3.1](https://git.odit.services/lfk/selfservice/compare/0.3.0...0.3.1) + +- 🐞 fixed Vite/ Tailwind build [`27b81d8`](https://git.odit.services/lfk/selfservice/commit/27b81d87aeb907f6c3d35ea6f55b4fe56c1e79b4) + #### [0.3.0](https://git.odit.services/lfk/selfservice/compare/0.2.0...0.3.0) +> 30 March 2021 + - Merge branch 'bugfix/23-broken-build' into dev [`#23`](https://git.odit.services/lfk/selfservice/issues/23) - migrate to Tailwind JIT + views + router/ build fix [`15b60f6`](https://git.odit.services/lfk/selfservice/commit/15b60f60b5d4f3c4035460f25807c5f5f2f19578) +- 🚀Bumped version to v0.3.0 [`cb5f48d`](https://git.odit.services/lfk/selfservice/commit/cb5f48d913b8aff2b138c93c4e29a2b8a553529d) - 🐞 fix release config [`ae44d7e`](https://git.odit.services/lfk/selfservice/commit/ae44d7e2e86b9bee74d453301846d02b29c632f2) - 🚀Bumped version to v0.1.2 [`5253fb1`](https://git.odit.services/lfk/selfservice/commit/5253fb18325ce9069e84180b30110ae97752ef20) diff --git a/package.json b/package.json index 2af0a5a..95693d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-selfservice", - "version": "0.3.0", + "version": "0.3.1", "scripts": { "dev": "vite", "build": "vite build", From f603e531512a2245ea2fe41304eb039080bcba28 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 31 Mar 2021 18:45:04 +0200 Subject: [PATCH 03/20] added missing routes ref #27 --- src/App.vue | 6 +----- src/routes.js | 22 +++++++++++++++------- src/views/ProfileNone.vue | 1 + 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 src/views/ProfileNone.vue diff --git a/src/App.vue b/src/App.vue index cc5bdf4..fd7338c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,8 +2,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/src/routes.js b/src/routes.js index 815464f..de5aaf7 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,16 +1,24 @@ -import EnvError from './components/EnvError.vue'; +// import EnvError from './components/EnvError.vue'; import Home from './views/Home.vue'; import Imprint from './views/Imprint.vue'; import Privacy from './views/Privacy.vue'; import Register from './views/Register.vue'; import Profile from './views/Profile.vue'; +import ProfileNone from './views/ProfileNone.vue'; + +console.log(config); /** @type {import('vue-router').RouterOptions['routes']} */ export const routes = [ - { path: '/', component: Home }, - { path: '/imprint', component: Imprint }, - { path: '/privacy', component: Privacy }, - { path: '/register', component: Register }, - { path: '/register/:token', component: Register, props: true }, - { path: '/profile/:token', component: Profile, props: true } + { path: config.baseurl_selfservice + '', component: Home }, + { path: config.baseurl_selfservice + 'imprint', component: Imprint }, + { path: config.baseurl_selfservice + 'imprint/', component: Imprint }, + { path: config.baseurl_selfservice + 'privacy', component: Privacy }, + { path: config.baseurl_selfservice + 'privacy/', component: Privacy }, + { path: config.baseurl_selfservice + 'register', component: Register }, + { path: config.baseurl_selfservice + 'register/', component: Register }, + { path: config.baseurl_selfservice + 'register/:token', component: Register, props: true }, + { path: config.baseurl_selfservice + 'profile', component: Profile }, + { path: config.baseurl_selfservice + 'profile/', component: ProfileNone }, + { path: config.baseurl_selfservice + 'profile/:token', component: Profile, props: true } ]; diff --git a/src/views/ProfileNone.vue b/src/views/ProfileNone.vue new file mode 100644 index 0000000..b8762df --- /dev/null +++ b/src/views/ProfileNone.vue @@ -0,0 +1 @@ + \ No newline at end of file From 2e7a718daa7ca607622e3e339bdb85f5c64cfcf0 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 31 Mar 2021 18:45:23 +0200 Subject: [PATCH 04/20] load main.js as deferred ref #27 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2e151b8..955cb15 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@
- + \ No newline at end of file From 106bf4c0ff07fe847f98aa250230f2a272f55a04 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 31 Mar 2021 18:55:00 +0200 Subject: [PATCH 05/20] route fix for favicon + background ref #27 --- src/views/Home.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index e1af9d0..cbe7891 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,8 +1,8 @@