From 01ddfaf80a67a722fb1b3a90cb95bbf75046b26c Mon Sep 17 00:00:00 2001 From: John Campion Jr Date: Thu, 18 Feb 2021 23:08:26 -0500 Subject: [PATCH] chore: updates (#69) * Update tailwind branch to main * This setup results in much faster TW HMR reloads --- locales/fr.json | 6 +- package.json | 18 +-- pnpm-lock.yaml | 248 +++++++++++++++++-------------- src/layouts/default.vue | 2 +- src/layouts/home.vue | 2 +- src/main.ts | 6 + src/styles/main.postcss | 3 - src/styles/tw-base.postcss | 1 + src/styles/tw-components.postcss | 43 ++++++ src/styles/tw-utilities.postcss | 1 + 10 files changed, 201 insertions(+), 129 deletions(-) create mode 100644 src/styles/tw-base.postcss create mode 100644 src/styles/tw-components.postcss create mode 100644 src/styles/tw-utilities.postcss diff --git a/locales/fr.json b/locales/fr.json index 3596449..048cf1e 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -1,7 +1,11 @@ { "button": { + "about": "À propos de", "back": "Retour", - "go": "Essayer" + "go": "Essayer", + "home": "Maison", + "toggle_dark": "Basculer en mode sombre", + "toggle_langs": "Changer de langue" }, "intro": { "desc": "Example d'application Vite", diff --git a/package.json b/package.json index 21049ac..43a39b2 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "nprogress": "^0.2.0", "prism-theme-vars": "^0.1.4", "vue": "^3.0.5", - "vue-i18n": "^9.0.0-rc.6", + "vue-i18n": "^9.0.0-rc.7", "vue-router": "^4.0.3" }, "devDependencies": { @@ -19,7 +19,7 @@ "@intlify/vite-plugin-vue-i18n": "^1.0.0-beta.17", "@tailwindcss/typography": "^0.4.0", "@types/nprogress": "^0.2.0", - "@typescript-eslint/eslint-plugin": "^4.15.0", + "@typescript-eslint/eslint-plugin": "^4.15.1", "@vitejs/plugin-vue": "^1.1.4", "@vue/compiler-sfc": "^3.0.5", "@vue/server-renderer": "^3.0.5", @@ -32,14 +32,14 @@ "postcss-nested": "^5.0.3", "tailwindcss": "^2.0.3", "typescript": "^4.1.5", - "vite": "^2.0.0-beta.69", - "vite-plugin-components": "^0.6.10", - "vite-plugin-icons": "^0.2.1", - "vite-plugin-md": "^0.4.2", - "vite-plugin-pages": "^0.4.2", - "vite-plugin-pwa": "^0.4.6", + "vite": "^2.0.1", + "vite-plugin-components": "^0.6.12", + "vite-plugin-icons": "^0.2.2", + "vite-plugin-md": "^0.5.1", + "vite-plugin-pages": "^0.4.4", + "vite-plugin-pwa": "^0.4.7", "vite-plugin-vue-layouts": "^0.2.2", - "vite-ssg": "^0.8.8" + "vite-ssg": "^0.8.9" }, "eslintConfig": { "extends": "@antfu/eslint-config", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2364429..832b6e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ dependencies: nprogress: 0.2.0 prism-theme-vars: 0.1.4 vue: 3.0.5 - vue-i18n: 9.0.0-rc.6_vue@3.0.5 + vue-i18n: 9.0.0-rc.7_vue@3.0.5 vue-router: 4.0.3_vue@3.0.5 devDependencies: '@antfu/eslint-config': 0.4.3_eslint@7.20.0+typescript@4.1.5 @@ -12,7 +12,7 @@ devDependencies: '@intlify/vite-plugin-vue-i18n': 1.0.0-beta.17 '@tailwindcss/typography': 0.4.0_tailwindcss@2.0.3 '@types/nprogress': 0.2.0 - '@typescript-eslint/eslint-plugin': 4.15.0_eslint@7.20.0+typescript@4.1.5 + '@typescript-eslint/eslint-plugin': 4.15.1_eslint@7.20.0+typescript@4.1.5 '@vitejs/plugin-vue': 1.1.4_@vue+compiler-sfc@3.0.5 '@vue/compiler-sfc': 3.0.5_vue@3.0.5 '@vue/server-renderer': 3.0.5_vue@3.0.5 @@ -25,14 +25,14 @@ devDependencies: postcss-nested: 5.0.3_postcss@8.2.6 tailwindcss: 2.0.3_759587f5361760629983e9fe457a3aed typescript: 4.1.5 - vite: 2.0.0-beta.69 - vite-plugin-components: 0.6.10_vite@2.0.0-beta.69 - vite-plugin-icons: 0.2.1_d78d375fec6553510c7875ab0e1db883 - vite-plugin-md: 0.4.2_vite@2.0.0-beta.69 - vite-plugin-pages: 0.4.2_vite@2.0.0-beta.69+vue@3.0.5 - vite-plugin-pwa: 0.4.6 - vite-plugin-vue-layouts: 0.2.2_vite@2.0.0-beta.69 - vite-ssg: 0.8.8_3264c5547dde4c508d141cfa8bd8ef04 + vite: 2.0.1 + vite-plugin-components: 0.6.12_vite@2.0.1 + vite-plugin-icons: 0.2.2_d78d375fec6553510c7875ab0e1db883 + vite-plugin-md: 0.5.1_vite@2.0.1 + vite-plugin-pages: 0.4.4_vite@2.0.1+vue@3.0.5 + vite-plugin-pwa: 0.4.8 + vite-plugin-vue-layouts: 0.2.2_vite@2.0.1 + vite-ssg: 0.8.9_09776a6a773b9a81449cdda32cab3c64 lockfileVersion: 5.2 packages: /@antfu/eslint-config-basic/0.4.3_eslint@7.20.0: @@ -119,7 +119,7 @@ packages: convert-source-map: 1.7.0 debug: 4.3.1 gensync: 1.0.0-beta.2 - json5: 2.1.3 + json5: 2.2.0 lodash: 4.17.20 semver: 5.7.1 source-map: 0.5.7 @@ -1109,10 +1109,22 @@ packages: '@intlify/message-resolver': 9.0.0-rc.6 '@intlify/runtime': 9.0.0-rc.6 '@intlify/shared': 9.0.0-rc.6 + dev: true engines: node: '>= 10' resolution: integrity: sha512-UG8H+q1GZ2ZD6Rg9nuc6NPqj9K9OeXHt4kerKRDRgZ+h2wPNoWItIQXSrShg5GJKvEN+rRuJvvnh61oMNS0sWw== + /@intlify/core-base/9.0.0-rc.7: + dependencies: + '@intlify/message-compiler': 9.0.0-rc.7 + '@intlify/message-resolver': 9.0.0-rc.7 + '@intlify/runtime': 9.0.0-rc.7 + '@intlify/shared': 9.0.0-rc.7 + dev: false + engines: + node: '>= 10' + resolution: + integrity: sha512-jYF6kQpSCeBXprZRcggGV/YQAwqXRWo2MtcdkPfZf0cP26Yx12UeFF0Uk5W5M/cgts3ktkhF/CzvxtXP1mevlQ== /@intlify/core/9.0.0-beta.16: dependencies: '@intlify/core-base': 9.0.0-beta.16 @@ -1136,10 +1148,21 @@ packages: '@intlify/message-resolver': 9.0.0-rc.6 '@intlify/shared': 9.0.0-rc.6 source-map: 0.6.1 + dev: true engines: node: '>= 10' resolution: integrity: sha512-WyvvFBoJ6qZk/3G/LjHuZJhY0ww8PZD+30wdPy5lJEB4+uTDoAAupwfnQ1suek7wsnFbPiuUE2j48qRogY0QJQ== + /@intlify/message-compiler/9.0.0-rc.7: + dependencies: + '@intlify/message-resolver': 9.0.0-rc.7 + '@intlify/shared': 9.0.0-rc.7 + source-map: 0.6.1 + dev: false + engines: + node: '>= 10' + resolution: + integrity: sha512-T8cPzSkNV0KHtLokQW8hBHMlqYcpknJy8JygwA4R6guiO2G9eyUdZ+rswDq5vrGfSIUglgHYusoIvOhFyQpkpQ== /@intlify/message-resolver/9.0.0-beta.16: dev: true engines: @@ -1147,10 +1170,17 @@ packages: resolution: integrity: sha512-xwjsFuDDYEv7g1KE5QZRbrPgfsrNsDhYLtNYR7Tn4inzbmB6ipak2UlDzDcQGLieSFbe1WwAoNL0IXy4sUKboQ== /@intlify/message-resolver/9.0.0-rc.6: + dev: true engines: node: '>= 10' resolution: integrity: sha512-yY+hM8WqliAIayYP0/8iITfScn4oSYXVrUwIn7ZWUONhuXCQXlxStukmQ1e1lWkL4Jyi4qTRXupDllq5yvW9BA== + /@intlify/message-resolver/9.0.0-rc.7: + dev: false + engines: + node: '>= 10' + resolution: + integrity: sha512-d0Jz0OWiH7jYTDk4VzTnVroJ2eylQUgVIk+2ztNJAHsrKoy3wxq6Tw/GlIGOrVJCFqZLWuxg7dmuhZDd4fliTw== /@intlify/runtime/9.0.0-beta.16: dependencies: '@intlify/message-compiler': 9.0.0-beta.16 @@ -1166,10 +1196,21 @@ packages: '@intlify/message-compiler': 9.0.0-rc.6 '@intlify/message-resolver': 9.0.0-rc.6 '@intlify/shared': 9.0.0-rc.6 + dev: true engines: node: '>= 10' resolution: integrity: sha512-z1lc4mmpRknTHjN3w5m9vmACidCo+Xm/2J6zMHhh23UEbCrIoaSKTFqs87aj5crX1CJvAc8rwGD1s2+QcHaEZQ== + /@intlify/runtime/9.0.0-rc.7: + dependencies: + '@intlify/message-compiler': 9.0.0-rc.7 + '@intlify/message-resolver': 9.0.0-rc.7 + '@intlify/shared': 9.0.0-rc.7 + dev: false + engines: + node: '>= 10' + resolution: + integrity: sha512-SdM9Gqca4W+u/O6XHqDf38UwoiopbyRtUnnqWy5DGihbE1CTKlFZSGPMx95cLOVt0AIeVK/eRwclxLiRtQRM7A== /@intlify/shared/9.0.0-beta.16: dev: true engines: @@ -1177,10 +1218,17 @@ packages: resolution: integrity: sha512-A7GSOovcZn/NMoAmDc8FG9uRcFv6iygriK8+C6HFeOnMQ9X+T9f5A9bPtXhCOCiRpQm9SUtGqXedxO5Y8rz9/A== /@intlify/shared/9.0.0-rc.6: + dev: true engines: node: '>= 10' resolution: integrity: sha512-6TFGAUcxgEIGvNxeBAUTvzyAdd/rAjsOLTIUTKLQX2JYypCwmTRPsT3wGWAUfvLxnKK62wyE+s4pI3dPNGz+vQ== + /@intlify/shared/9.0.0-rc.7: + dev: false + engines: + node: '>= 10' + resolution: + integrity: sha512-ynMHCCcBPtQAdJlOUMzrlvUp+DdKlnB0yrkPPMzAs8bBETwJbAK1Jq6zBHlMZzscPcF+1ia5pj4Gmmn7QL9b8w== /@intlify/vite-plugin-vue-i18n/1.0.0-beta.17: dependencies: '@intlify/cli': 0.2.0 @@ -1229,12 +1277,12 @@ packages: node: '>= 8' resolution: integrity: sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== - /@rollup/plugin-babel/5.2.2_825e830c60d51f1c1f95c9515abd283e: + /@rollup/plugin-babel/5.2.2_59fcb32c304c21eb9bcfb70d70cc0f65: dependencies: '@babel/core': 7.12.10 '@babel/helper-module-imports': 7.12.5 - '@rollup/pluginutils': 3.1.0_rollup@2.37.1 - rollup: 2.37.1 + '@rollup/pluginutils': 3.1.0_rollup@2.38.5 + rollup: 2.38.5 dev: true engines: node: '>= 10.0.0' @@ -1247,15 +1295,15 @@ packages: optional: true resolution: integrity: sha512-MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA== - /@rollup/plugin-node-resolve/9.0.0_rollup@2.37.1: + /@rollup/plugin-node-resolve/9.0.0_rollup@2.38.5: dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.37.1 + '@rollup/pluginutils': 3.1.0_rollup@2.38.5 '@types/resolve': 1.17.1 builtin-modules: 3.2.0 deepmerge: 4.2.2 is-module: 1.0.0 resolve: 1.19.0 - rollup: 2.37.1 + rollup: 2.38.5 dev: true engines: node: '>= 10.0.0' @@ -1263,22 +1311,22 @@ packages: rollup: ^1.20.0||^2.0.0 resolution: integrity: sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg== - /@rollup/plugin-replace/2.3.4_rollup@2.37.1: + /@rollup/plugin-replace/2.3.4_rollup@2.38.5: dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.37.1 + '@rollup/pluginutils': 3.1.0_rollup@2.38.5 magic-string: 0.25.7 - rollup: 2.37.1 + rollup: 2.38.5 dev: true peerDependencies: rollup: ^1.20.0 || ^2.0.0 resolution: integrity: sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ== - /@rollup/pluginutils/3.1.0_rollup@2.37.1: + /@rollup/pluginutils/3.1.0_rollup@2.38.5: dependencies: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.2.2 - rollup: 2.37.1 + rollup: 2.38.5 dev: true engines: node: '>= 8.0.0' @@ -1371,10 +1419,10 @@ packages: optional: true resolution: integrity: sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww== - /@typescript-eslint/eslint-plugin/4.15.0_eslint@7.20.0+typescript@4.1.5: + /@typescript-eslint/eslint-plugin/4.15.1_eslint@7.20.0+typescript@4.1.5: dependencies: - '@typescript-eslint/experimental-utils': 4.15.0_eslint@7.20.0+typescript@4.1.5 - '@typescript-eslint/scope-manager': 4.15.0 + '@typescript-eslint/experimental-utils': 4.15.1_eslint@7.20.0+typescript@4.1.5 + '@typescript-eslint/scope-manager': 4.15.1 debug: 4.3.1 eslint: 7.20.0 functional-red-black-tree: 1.0.1 @@ -1394,7 +1442,7 @@ packages: typescript: optional: true resolution: - integrity: sha512-DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ== + integrity: sha512-yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw== /@typescript-eslint/experimental-utils/4.14.0_eslint@7.20.0+typescript@4.1.5: dependencies: '@types/json-schema': 7.0.7 @@ -1412,12 +1460,12 @@ packages: typescript: '*' resolution: integrity: sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ== - /@typescript-eslint/experimental-utils/4.15.0_eslint@7.20.0+typescript@4.1.5: + /@typescript-eslint/experimental-utils/4.15.1_eslint@7.20.0+typescript@4.1.5: dependencies: '@types/json-schema': 7.0.7 - '@typescript-eslint/scope-manager': 4.15.0 - '@typescript-eslint/types': 4.15.0 - '@typescript-eslint/typescript-estree': 4.15.0_typescript@4.1.5 + '@typescript-eslint/scope-manager': 4.15.1 + '@typescript-eslint/types': 4.15.1 + '@typescript-eslint/typescript-estree': 4.15.1_typescript@4.1.5 eslint: 7.20.0 eslint-scope: 5.1.1 eslint-utils: 2.1.0 @@ -1428,7 +1476,7 @@ packages: eslint: '*' typescript: '*' resolution: - integrity: sha512-V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg== + integrity: sha512-9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ== /@typescript-eslint/parser/4.14.0_eslint@7.20.0+typescript@4.1.5: dependencies: '@typescript-eslint/scope-manager': 4.14.0 @@ -1457,27 +1505,27 @@ packages: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: integrity: sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q== - /@typescript-eslint/scope-manager/4.15.0: + /@typescript-eslint/scope-manager/4.15.1: dependencies: - '@typescript-eslint/types': 4.15.0 - '@typescript-eslint/visitor-keys': 4.15.0 + '@typescript-eslint/types': 4.15.1 + '@typescript-eslint/visitor-keys': 4.15.1 dev: true engines: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: - integrity: sha512-CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g== + integrity: sha512-ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA== /@typescript-eslint/types/4.14.0: dev: true engines: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: integrity: sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A== - /@typescript-eslint/types/4.15.0: + /@typescript-eslint/types/4.15.1: dev: true engines: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: - integrity: sha512-su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg== + integrity: sha512-iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw== /@typescript-eslint/typescript-estree/4.14.0_typescript@4.1.5: dependencies: '@typescript-eslint/types': 4.14.0 @@ -1499,10 +1547,10 @@ packages: optional: true resolution: integrity: sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag== - /@typescript-eslint/typescript-estree/4.15.0_typescript@4.1.5: + /@typescript-eslint/typescript-estree/4.15.1_typescript@4.1.5: dependencies: - '@typescript-eslint/types': 4.15.0 - '@typescript-eslint/visitor-keys': 4.15.0 + '@typescript-eslint/types': 4.15.1 + '@typescript-eslint/visitor-keys': 4.15.1 debug: 4.3.1 globby: 11.0.2 is-glob: 4.0.1 @@ -1518,7 +1566,7 @@ packages: typescript: optional: true resolution: - integrity: sha512-jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA== + integrity: sha512-z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw== /@typescript-eslint/visitor-keys/4.14.0: dependencies: '@typescript-eslint/types': 4.14.0 @@ -1528,15 +1576,15 @@ packages: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: integrity: sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA== - /@typescript-eslint/visitor-keys/4.15.0: + /@typescript-eslint/visitor-keys/4.15.1: dependencies: - '@typescript-eslint/types': 4.15.0 + '@typescript-eslint/types': 4.15.1 eslint-visitor-keys: 2.0.0 dev: true engines: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: - integrity: sha512-RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA== + integrity: sha512-tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww== /@vitejs/plugin-vue/1.1.4_@vue+compiler-sfc@3.0.5: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 @@ -3026,16 +3074,6 @@ packages: dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - /fsevents/2.1.3: - deprecated: '"Please update to latest v2.3 or v2.2"' - dev: true - engines: - node: ^8.16.0 || ^10.6.0 || >=11.0.0 - optional: true - os: - - darwin - resolution: - integrity: sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== /fsevents/2.3.2: dev: true engines: @@ -3658,15 +3696,6 @@ packages: hasBin: true resolution: integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - /json5/2.1.3: - dependencies: - minimist: 1.2.5 - dev: true - engines: - node: '>=6' - hasBin: true - resolution: - integrity: sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== /json5/2.2.0: dependencies: minimist: 1.2.5 @@ -4632,7 +4661,7 @@ packages: request-promise-core: 1.1.4_request@2.88.2 stealthy-require: 1.1.1 tough-cookie: 2.5.0 - deprecated: 'request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142' + deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142 dev: true engines: node: '>=0.12.0' @@ -4662,7 +4691,7 @@ packages: tough-cookie: 2.5.0 tunnel-agent: 0.6.0 uuid: 3.4.0 - deprecated: 'request has been deprecated, see https://github.com/request/request/issues/3142' + deprecated: request has been deprecated, see https://github.com/request/request/issues/3142 dev: true engines: node: '>= 6' @@ -4711,11 +4740,11 @@ packages: hasBin: true resolution: integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - /rollup-plugin-terser/7.0.2_rollup@2.37.1: + /rollup-plugin-terser/7.0.2_rollup@2.38.5: dependencies: '@babel/code-frame': 7.12.11 jest-worker: 26.6.2 - rollup: 2.37.1 + rollup: 2.38.5 serialize-javascript: 4.0.0 terser: 5.5.1 dev: true @@ -4723,15 +4752,6 @@ packages: rollup: ^2.0.0 resolution: integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - /rollup/2.37.1: - dev: true - engines: - node: '>=10.0.0' - hasBin: true - optionalDependencies: - fsevents: 2.1.3 - resolution: - integrity: sha512-V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ== /rollup/2.38.5: dev: true engines: @@ -5362,19 +5382,19 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - /vite-plugin-components/0.6.10_vite@2.0.0-beta.69: + /vite-plugin-components/0.6.12_vite@2.0.1: dependencies: chokidar: 3.5.1 debug: 4.3.2 fast-glob: /@knightly/fast-glob/3.2.5-knightly-master.202101180131 minimatch: 3.0.4 - vite: 2.0.0-beta.69 + vite: 2.0.1 dev: true peerDependencies: vite: ^2.0.0-beta.69 resolution: - integrity: sha512-pgzu2/K8GnT+VquYUQxawf0QH/LR8Gx58bzoWh+6Vch6Hv+c3D0pVMYKAktARwQprArx90arvXInUH8RqCBEOQ== - /vite-plugin-icons/0.2.1_d78d375fec6553510c7875ab0e1db883: + integrity: sha512-KTqUseGaeMPlq6KpvAso0VIAtI7KgZQWHB3JZXlsMYdvoy9nrqRBGQPpTd5/dadfWl3LF3PsuDuxGFzQwXd3Kg== + /vite-plugin-icons/0.2.2_d78d375fec6553510c7875ab0e1db883: dependencies: '@iconify/json': 1.1.303 '@iconify/json-tools': 1.0.10 @@ -5384,18 +5404,18 @@ packages: '@iconify/json': '*' '@vue/compiler-sfc': ^3.0.2 resolution: - integrity: sha512-ZIJ8G2AHwEDt4oDST46E6Uy7W2EtVyoe1hzmJMkutbq3esUkcYVoYydT6Y12lhq1ppnVnShkbc0XzfKqolfCSg== - /vite-plugin-md/0.4.2_vite@2.0.0-beta.69: + integrity: sha512-pqA4l1f1jqSFeTGMKVXD8sXvqYZwHHlXlxhMkRZHCxPode/SQUEi1p9NAyhLHRkw+GN0I27p7DqNDdoFmmy2bA== + /vite-plugin-md/0.5.1_vite@2.0.1: dependencies: gray-matter: 4.0.2 markdown-it: 12.0.4 - vite: 2.0.0-beta.69 + vite: 2.0.1 dev: true peerDependencies: vite: ^2.0.0-beta.1 resolution: - integrity: sha512-gAmtGCiPj0ESdWJikKTg4h0ADqybezRVOh1a51KtWqYk4WgwrvFRpTeVq9fVqLXLFhuU0iUIKJ04V3KeXAeWdQ== - /vite-plugin-pages/0.4.2_vite@2.0.0-beta.69+vue@3.0.5: + integrity: sha512-D7WeLZzAGQjb4UtCEXcSKlvGOrHYOiVGWVrzH3+snrOFNoeMc5PDLmy0IS9E/mdMperPkzgaivd5SQg+nY1olQ== + /vite-plugin-pages/0.4.4_vite@2.0.1+vue@3.0.5: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 chalk: 4.1.0 @@ -5405,7 +5425,7 @@ packages: fast-glob: 3.2.5 glob-to-regexp: 0.4.1 json5: 2.2.0 - vite: 2.0.0-beta.69 + vite: 2.0.1 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 yaml: 2.0.0-3 @@ -5414,8 +5434,8 @@ packages: vite: ^2.0.0-beta.64 vue: ^3.0.0 resolution: - integrity: sha512-QaM/ZiGMMlZLMd4JIq4BwBmnNalu9A1Fyly5wzASSKGa4xPZ+848CDaXjORRsQWBlx3J0TXHqmDatEO8qpQAwA== - /vite-plugin-pwa/0.4.6: + integrity: sha512-FBerNOh2snMJfhEZewbkCA57NG1ux2fMH4ZhXXNWLKT7XvsrROx7pOvcTWfmzw88SwGnFZXPp5qWoNmKSbSHBA== + /vite-plugin-pwa/0.4.8: dependencies: debug: 4.3.2 fast-glob: 3.2.5 @@ -5423,13 +5443,13 @@ packages: workbox-build: 6.1.0 dev: true resolution: - integrity: sha512-3LonumSG4EcH9FT61d7wWouHkCmEciy3RPfvt25b835HMx9gb2Dt71t140+85Z5d+uANMSguC3miBnnGzagAMA== - /vite-plugin-vue-layouts/0.2.2_vite@2.0.0-beta.69: + integrity: sha512-+IFIeEc7FrTZIkVm/Ec8pxgAEF6hmrF+kHSsFxM1aKKXa6GU9bgOMpwDKftfpVjP11gI2XEzJGXhN6+srGg2uw== + /vite-plugin-vue-layouts/0.2.2_vite@2.0.1: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 debug: 4.3.2 fast-glob: 3.2.5 - vite: 2.0.0-beta.69 + vite: 2.0.1 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 dev: true @@ -5437,7 +5457,7 @@ packages: vite: ^2.0.0-beta.65 resolution: integrity: sha512-I5BfkCHwHV1WlbJE1ps2r6vwTo3N5QpLks3UpGa8XHcmHW03lavvJkdfjBpagI1bUQGEwWjLowFisG0Q/NJq3A== - /vite-ssg/0.8.8_3264c5547dde4c508d141cfa8bd8ef04: + /vite-ssg/0.8.9_09776a6a773b9a81449cdda32cab3c64: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 '@vue/server-renderer': 3.0.5_vue@3.0.5 @@ -5447,7 +5467,7 @@ packages: html-minifier: 4.0.0 jsdom: 16.4.0 prettier: 2.2.1 - vite: 2.0.0-beta.69 + vite: 2.0.1 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 yargs: 16.2.0 @@ -5462,8 +5482,8 @@ packages: vue: ^3.0.4 vue-router: ^4.0.1 resolution: - integrity: sha512-vHWurB5Gg9tHBbmoG9r9EyuNZITJOyH3FbyZnazRuV0szRQBCfXN0xQoC5CFx3FEGyZw7+Kim4KDUc3uLbLDRA== - /vite/2.0.0-beta.69: + integrity: sha512-WwO2agmnlEINQmz4ZNPWP3a4ePBNJCQlVQq4Z9FKuoa1ed46t7atY376m2T23UjETM80X7nSNjyphmpMWI+1cw== + /vite/2.0.1: dependencies: esbuild: 0.8.34 postcss: 8.2.6 @@ -5476,7 +5496,7 @@ packages: optionalDependencies: fsevents: 2.3.2 resolution: - integrity: sha512-Wf4bWOK/b6Q+06Wyk7uJIBy/LiENGx26do6tn9gOMRRZLEuLizN/cDzGqnQkGVVevbb18xdilyxhnTes0lFjZg== + integrity: sha512-x7ZfikjNs+6n4cdvwb9L5r5xBCdjmtmHFHaI4JVR3nAkJbMCK/dynfDWky8/NseZ9Ncz1jVxTQ/Bcf+n1ps1Ww== /vue-demi/0.6.0_vue@3.0.5: dependencies: vue: 3.0.5 @@ -5503,10 +5523,10 @@ packages: eslint: '>=5.0.0' resolution: integrity: sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw== - /vue-i18n/9.0.0-rc.6_vue@3.0.5: + /vue-i18n/9.0.0-rc.7_vue@3.0.5: dependencies: - '@intlify/core-base': 9.0.0-rc.6 - '@intlify/shared': 9.0.0-rc.6 + '@intlify/core-base': 9.0.0-rc.7 + '@intlify/shared': 9.0.0-rc.7 '@vue/devtools-api': 6.0.0-beta.5 vue: 3.0.5 dev: false @@ -5515,7 +5535,7 @@ packages: peerDependencies: vue: ^3.0.0 resolution: - integrity: sha512-CrFLzT/BhTjtemgZ9qOjPxvrVxBxj6osV5oYeCLo5Xd8My617sIu72NGLwDjXRLGW5A/UCh0SUffMYlKL/eecw== + integrity: sha512-weNLPLqGiitziBUpGQHyxYlhuw447yR4EcsvmqUX3MocIKciv6OMHKxUguCFC1m1ZRCzHQwik7fz+Q8u4UmEdQ== /vue-router/4.0.3_vue@3.0.5: dependencies: vue: 3.0.5 @@ -5654,9 +5674,9 @@ packages: '@babel/preset-env': 7.12.11_@babel+core@7.12.10 '@babel/runtime': 7.12.5 '@hapi/joi': 16.1.8 - '@rollup/plugin-babel': 5.2.2_825e830c60d51f1c1f95c9515abd283e - '@rollup/plugin-node-resolve': 9.0.0_rollup@2.37.1 - '@rollup/plugin-replace': 2.3.4_rollup@2.37.1 + '@rollup/plugin-babel': 5.2.2_59fcb32c304c21eb9bcfb70d70cc0f65 + '@rollup/plugin-node-resolve': 9.0.0_rollup@2.38.5 + '@rollup/plugin-replace': 2.3.4_rollup@2.38.5 '@surma/rollup-plugin-off-main-thread': 1.4.2 common-tags: 1.8.0 fast-json-stable-stringify: 2.1.0 @@ -5664,8 +5684,8 @@ packages: glob: 7.1.6 lodash: 4.17.20 pretty-bytes: 5.5.0 - rollup: 2.37.1 - rollup-plugin-terser: 7.0.2_rollup@2.37.1 + rollup: 2.38.5 + rollup-plugin-terser: 7.0.2_rollup@2.38.5 source-map: 0.8.0-beta.0 source-map-url: 0.4.0 stringify-object: 3.3.0 @@ -5889,7 +5909,7 @@ specifiers: '@intlify/vite-plugin-vue-i18n': ^1.0.0-beta.17 '@tailwindcss/typography': ^0.4.0 '@types/nprogress': ^0.2.0 - '@typescript-eslint/eslint-plugin': ^4.15.0 + '@typescript-eslint/eslint-plugin': ^4.15.1 '@vitejs/plugin-vue': ^1.1.4 '@vue/compiler-sfc': ^3.0.5 '@vue/server-renderer': ^3.0.5 @@ -5906,14 +5926,14 @@ specifiers: prism-theme-vars: ^0.1.4 tailwindcss: ^2.0.3 typescript: ^4.1.5 - vite: ^2.0.0-beta.69 - vite-plugin-components: ^0.6.10 - vite-plugin-icons: ^0.2.1 - vite-plugin-md: ^0.4.2 - vite-plugin-pages: ^0.4.2 - vite-plugin-pwa: ^0.4.6 + vite: ^2.0.1 + vite-plugin-components: ^0.6.12 + vite-plugin-icons: ^0.2.2 + vite-plugin-md: ^0.5.1 + vite-plugin-pages: ^0.4.4 + vite-plugin-pwa: ^0.4.7 vite-plugin-vue-layouts: ^0.2.2 - vite-ssg: ^0.8.8 + vite-ssg: ^0.8.9 vue: ^3.0.5 - vue-i18n: ^9.0.0-rc.6 + vue-i18n: ^9.0.0-rc.7 vue-router: ^4.0.3 diff --git a/src/layouts/default.vue b/src/layouts/default.vue index cca8e09..bcedc18 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -2,7 +2,7 @@
-
+
[Default Layout]
diff --git a/src/layouts/home.vue b/src/layouts/home.vue index 7c0524a..7119381 100644 --- a/src/layouts/home.vue +++ b/src/layouts/home.vue @@ -2,7 +2,7 @@
diff --git a/src/main.ts b/src/main.ts index e7b0443..11fc2a6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,10 @@ +// this allows much faster HMR +// discussed here: https://github.com/tailwindlabs/tailwindcss/issues/2820 +import './styles/tw-base.postcss' +import './styles/tw-components.postcss' +import './styles/tw-utilities.postcss' import './styles/main.postcss' + import { ViteSSG } from 'vite-ssg' import generatedRoutes from 'pages-generated' import { setupLayouts } from 'layouts-generated' diff --git a/src/styles/main.postcss b/src/styles/main.postcss index 121293f..a514383 100755 --- a/src/styles/main.postcss +++ b/src/styles/main.postcss @@ -1,6 +1,3 @@ -@import 'tailwindcss/base'; -@import 'tailwindcss/components'; -@import 'tailwindcss/utilities'; @import './markdown.postcss'; html, diff --git a/src/styles/tw-base.postcss b/src/styles/tw-base.postcss new file mode 100644 index 0000000..111f6ce --- /dev/null +++ b/src/styles/tw-base.postcss @@ -0,0 +1 @@ +@import 'tailwindcss/base'; diff --git a/src/styles/tw-components.postcss b/src/styles/tw-components.postcss new file mode 100644 index 0000000..b1d84fb --- /dev/null +++ b/src/styles/tw-components.postcss @@ -0,0 +1,43 @@ +@import 'tailwindcss/components'; +/* +html, +body, +#app { + height: 100vh; + margin: 0; + padding: 0; +} + +html.dark { + background: #222; +} + +#nprogress { + pointer-events: none; + + .bar { + @apply bg-teal-600 opacity-75; + + position: fixed; + z-index: 1031; + top: 0; + left: 0; + + width: 100%; + height: 2px; + } +} + +.btn { + @apply px-4 py-1 rounded inline-block + bg-teal-600 text-white cursor-pointer + hover:bg-teal-700 + disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50; +} + +.icon-btn { + @apply inline-block cursor-pointer select-none + opacity-75 transition duration-200 ease-in-out + hover:opacity-100 hover:text-teal-600; + font-size: 0.8em; +} */ diff --git a/src/styles/tw-utilities.postcss b/src/styles/tw-utilities.postcss new file mode 100644 index 0000000..10d1f26 --- /dev/null +++ b/src/styles/tw-utilities.postcss @@ -0,0 +1 @@ +@import 'tailwindcss/utilities';