Skip to content

Commit

Permalink
small refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
hridniev committed Apr 17, 2024
1 parent 8c9b6d0 commit c5ef5c7
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 70 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

# allow to format hidden folders
!/.storybook
!/.mono
File renamed without changes.
16 changes: 4 additions & 12 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,24 @@ import { vue3SourceDecorator } from "./decorators/vue3SourceDecorator";

// Vue plugins
import { createStore } from "vuex";
import { createRouter, createWebHistory } from "vue-router";
import NotifyServiceDefault from "../src/ui.notify/services";
import NotifyServiceDefault from "vueless/src/ui.notify/services";

// Tailwind styles
import "../index.pcss";

// Common stores
import loader from "../src/ui.loader-rendering/store";
import loaderTop from "../src/ui.loader-top/store";
import breakpoint from "../src/ui.viewport/store";
import loader from "vueless/src/ui.loader-rendering/store";
import loaderTop from "vueless/src/ui.loader-top/store";
import breakpoint from "vueless/src/ui.viewport/store";

// Create store instance
const store = createStore({
modules: { loader, loaderTop, breakpoint },
});

// Create router instance
const router = createRouter({
history: createWebHistory("/"),
routes: [{ path: "/:pathMatch(.*)*", component: () => import("../src/ui.container-page") }],
});

// Create storybook app instance
const storybookApp = (app) => {
app.use(store);
app.use(router);
app.use(new NotifyServiceDefault().notifyInstance);
};

Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@
"vite": "^5.1.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-eslint": "^1.8.1",
"vue": "^3.4.19",
"vue-i18n": "^9.9.1",
"vue-router": "^4.2.5"
"vue": "^3.4.19"
},
"repository": {
"type": "git",
Expand Down
3 changes: 0 additions & 3 deletions src/service.tailwind/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ export default class TailwindServiceDefault {
"./src/**/*.{js,ts,jsx,tsx,vue}",
"./vueless.config.{js,ts}",
"./node_modules/vueless/**/*.{js,ts,vue}",
// TODO: remove it after creating the package
"./.vueless-layouts/**/*.{js,ts,vue}",
"./.vueless-services/**/*.{js,ts,vue}",
],
safelist: isProd ? prodSafelist : devSafelist,
theme: {
Expand Down
2 changes: 1 addition & 1 deletion src/service.ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineConfig } from "cva";
import { twMerge } from "tailwind-merge";
import colors from "tailwindcss/colors";
import { brandColors, grayColors } from "../service.tailwind";
import vuelessConfig from "/vueless.config.js";
import vuelessConfig from "../../../../vueless.config.js";

/*
Export cva (class variance authority) methods extended with tailwind-merge.
Expand Down
9 changes: 4 additions & 5 deletions vite.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineConfig } from "vite";
import path from "path";

// Plugins
import Vue from "@vitejs/plugin-vue";
import Eslint from "vite-plugin-eslint";
import { Vueless, VuelessUnpluginComponents } from "@vueless/vite-plugin";
Expand All @@ -15,19 +15,18 @@ export default defineConfig({
resolve: {
extensions: [".vue", ".mjs", ".js", ".ts", ".mdx"],
alias: {
"../../../../vueless.config.js": path.resolve(__dirname, "./vueless.config.js"),
"vueless/src": path.resolve(__dirname, "./src"),
},
},
optimizeDeps: {
include: [
"vuex",
"vue-i18n",
"vue-router",
"vue-tippy",
"@uppy/core",
"@uppy/vue/src/drag-drop",
//"@kyvg/vue3-notification",
//"@tailwindcss/forms",
"@kyvg/vue3-notification",
"@tailwindcss/forms",
"tailwindcss/colors.js",
"cva",
"tailwind-merge",
Expand Down
2 changes: 1 addition & 1 deletion web-types.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"framework": "vue",
"name": "vueless",
"version": "0.0.5",
"version": "0.0.7",
"contributions": {
"html": {
"description-markup": "markdown",
Expand Down
51 changes: 7 additions & 44 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1234,27 +1234,6 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==

"@intlify/[email protected]":
version "9.12.1"
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.12.1.tgz#910cdbf88ba2dec8d87e598b961c336e95132958"
integrity sha512-l7djJEmXLAR44PdtKDEBev/TN9tREQz967/+jvN3WtICqFoy2Cz8kPtjDfvZctqPNzOonp+ESsDCUm+rjHsmdA==
dependencies:
"@intlify/message-compiler" "9.12.1"
"@intlify/shared" "9.12.1"

"@intlify/[email protected]":
version "9.12.1"
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.12.1.tgz#68549cd2107fa72f07fd57de992f3bfcfbc3b1a4"
integrity sha512-6QrMGdqKUJSkctyg56nvE+h86tjQZTjYFEfx3ghQAXKPXUd1v5josZXrwnSbIEWWeAentlwtB5qW1FE5r2S8AQ==
dependencies:
"@intlify/shared" "9.12.1"
source-map-js "^1.0.2"

"@intlify/[email protected]":
version "9.12.1"
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.12.1.tgz#78ca1e820fe44f47defab95b015524fdc3b14dcd"
integrity sha512-xAAAxaMS7yUCkwXwqUVQmGCPbXSm6oHqMzcqr2IrxJQmC0DmuqoaW0yBeWyd/pG03PPXqGtWhJLnefsiVElzAQ==

"@isaacs/cliui@^8.0.2":
version "8.0.2"
resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
Expand Down Expand Up @@ -2602,7 +2581,7 @@
"@vue/compiler-dom" "3.4.23"
"@vue/shared" "3.4.23"

"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.5.1":
"@vue/devtools-api@^6.0.0-beta.11":
version "6.6.1"
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
Expand Down Expand Up @@ -2666,7 +2645,7 @@
integrity sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==

"@vueless/storybook@file:../vueless-storybook":
version "0.0.2"
version "0.0.4"
dependencies:
"@storybook/addon-essentials" "^8.0.0"
"@storybook/addon-interactions" "^8.0.0"
Expand All @@ -2681,7 +2660,7 @@
storybook "^8.0.0"

"@vueless/vite-plugin@file:../vite-plugin-vueless":
version "0.0.2"
version "0.0.4"
dependencies:
"@vue/compiler-sfc" "^3.4.19"
svgo "^3.2.0"
Expand Down Expand Up @@ -5263,9 +5242,9 @@ lz-string@^1.5.0:
integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==

magic-string@^0.30.0, magic-string@^0.30.3, magic-string@^0.30.8:
version "0.30.9"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.9.tgz#8927ae21bfdd856310e07a1bc8dd5e73cb6c251d"
integrity sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==
version "0.30.10"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.10.tgz#123d9c41a0cb5640c892b041d4cfb3bd0aa4b39e"
integrity sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==
dependencies:
"@jridgewell/sourcemap-codec" "^1.4.15"

Expand Down Expand Up @@ -6672,7 +6651,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==

source-map-js@^1.0.1, source-map-js@^1.0.2, source-map-js@^1.2.0:
source-map-js@^1.0.1, source-map-js@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
Expand Down Expand Up @@ -7388,27 +7367,11 @@ vue-eslint-parser@^9.1.0, vue-eslint-parser@^9.4.2:
lodash "^4.17.21"
semver "^7.3.6"

vue-i18n@^9.9.1:
version "9.12.1"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.12.1.tgz#025a1228645125387506a7d05f9b872917d69f8c"
integrity sha512-cqkBt10YzxF3tNGA7/95VMfFdk8nEoguzB7K7R9rldiSnHyWeokq6GOWMThfK/siTr2lLfM9nqolD/er//t4Iw==
dependencies:
"@intlify/core-base" "9.12.1"
"@intlify/shared" "9.12.1"
"@vue/devtools-api" "^6.5.0"

vue-inbrowser-compiler-independent-utils@^4.69.0:
version "4.71.1"
resolved "https://registry.yarnpkg.com/vue-inbrowser-compiler-independent-utils/-/vue-inbrowser-compiler-independent-utils-4.71.1.tgz#dc6830b204f7cfdc30ffc4f31ba81b0c72c52136"
integrity sha512-K3wt3iVmNGaFEOUR4JIThQRWfqokxLfnPslD41FDZB2ajXp789+wCqJyGYlIFsvEQ2P61PInw6/ph5iiqg51gg==

vue-router@^4.2.5:
version "4.3.0"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.3.0.tgz#d5913f27bf68a0a178ee798c3c88be471811a235"
integrity sha512-dqUcs8tUeG+ssgWhcPbjHvazML16Oga5w34uCUmsk7i0BcnskoLGwjpa15fqMr2Fa5JgVBrdL2MEgqz6XZ/6IQ==
dependencies:
"@vue/devtools-api" "^6.5.1"

vue-template-compiler@^2.7.14:
version "2.7.16"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"
Expand Down

0 comments on commit c5ef5c7

Please sign in to comment.