Merge pull request #182 from dullage/develop
authorAdam Dullage <redacted>
Wed, 24 Apr 2024 20:43:52 +0000 (21:43 +0100)
committerGitHub <redacted>
Wed, 24 Apr 2024 20:43:52 +0000 (21:43 +0100)
Merge develop into client-refactor

1  2 
package-lock.json
package.json

index 1fd2abfc712984b480c544572f235cf8fa084c97,e91349b0e126460c469ba3a7a831a1a2fb36a536..699b19682896954271bb421c34cc957d62935f5c
@@@ -6,20 -6,15 +6,20 @@@
    "packages": {
      "": {
        "name": "flatnotes",
-       "version": "4.0.3",
+       "version": "4.0.4",
        "license": "MIT",
 -      "devDependencies": {
 -        "@toast-ui/editor-plugin-code-syntax-highlight": "3.1.0",
 -        "@toast-ui/vue-editor": "3.2.3",
 -        "@vitejs/plugin-vue2": "^2.3.1",
 +      "dependencies": {
          "axios": "1.6.8",
 -        "bootstrap-vue": "2.23.1",
          "mousetrap": "1.6.5",
 +        "vue": "^3.4.24",
 +        "vue-router": "^4.3.2"
 +      },
 +      "devDependencies": {
 +        "@vitejs/plugin-vue": "^5.0.4",
 +        "autoprefixer": "^10.4.19",
 +        "postcss": "^8.4.38",
 +        "prettier-plugin-tailwindcss": "0.5.14",
 +        "tailwindcss": "^3.4.3",
          "vite": "^5.2.9"
        }
      },
diff --cc package.json
Simple merge
git clone https://git.99rst.org/PROJECT