diff --git a/.sentryclirc b/.sentryclirc index 61a98ea..e4476e7 100644 --- a/.sentryclirc +++ b/.sentryclirc @@ -1,4 +1,9 @@ -[auth] -token=78eaf826e5e2483d9f64db473183b2894c80b247893e40a8b990f54c35fec9e5 [defaults] -url=https://sentry.vtb.link \ No newline at end of file +url = https://sentry.vtb.link +org = eoefans +project = eoefans-web + + + +[auth] +token = 78eaf826e5e2483d9f64db473183b2894c80b247893e40a8b990f54c35fec9e5 \ No newline at end of file diff --git a/package.json b/package.json index 0814a86..b625835 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ }, "devDependencies": { "@babel/core": "^7.20.12", - "@sentry/vite-plugin": "^0.4.0", "@types/imagesloaded": "^4.1.2", "@types/json-bigint": "^1.0.1", "@types/node": "^18.13.0", @@ -70,6 +69,7 @@ "typescript": "^4.9.5", "vite": "4.1.1", "vite-plugin-compression": "^0.5.1", - "vite-plugin-html": "^3.2.0" + "vite-plugin-html": "^3.2.0", + "vite-plugin-sentry": "^1.1.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f57805b..7ca0466 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,6 @@ specifiers: '@reduxjs/toolkit': ^1.9.2 '@sentry/react': ^7.37.2 '@sentry/tracing': ^7.37.2 - '@sentry/vite-plugin': ^0.4.0 '@types/imagesloaded': ^4.1.2 '@types/json-bigint': ^1.0.1 '@types/node': ^18.13.0 @@ -53,6 +52,7 @@ specifiers: vite: 4.1.1 vite-plugin-compression: ^0.5.1 vite-plugin-html: ^3.2.0 + vite-plugin-sentry: ^1.1.7 dependencies: '@dnd-kit/core': 6.0.7_biqbaboplfbrettd7655fr4n2y @@ -87,14 +87,13 @@ dependencies: devDependencies: '@babel/core': 7.20.12 - '@sentry/vite-plugin': 0.4.0 '@types/imagesloaded': 4.1.2 '@types/json-bigint': 1.0.1 '@types/node': 18.13.0 '@types/react': 18.0.28 '@types/react-dom': 18.0.11 '@types/react-lazy-load-image-component': 1.5.2 - '@vitejs/plugin-legacy': 4.0.1_terser@5.16.3+vite@4.1.1 + '@vitejs/plugin-legacy': 4.0.1_terser@5.16.4+vite@4.1.1 '@vitejs/plugin-react-swc': 3.1.0_vite@4.1.1 commitizen: 4.3.0 commitlint: 17.4.3 @@ -104,11 +103,12 @@ devDependencies: husky: 8.0.3 less: 4.1.3 rollup-plugin-visualizer: 5.9.0 - terser: 5.16.3 + terser: 5.16.4 typescript: 4.9.5 - vite: 4.1.1_vjhh7uxert6hqr24po4pu3s6wm + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu vite-plugin-compression: 0.5.1_vite@4.1.1 vite-plugin-html: 3.2.0_vite@4.1.1 + vite-plugin-sentry: 1.1.7_vite@4.1.1 packages: @@ -2250,20 +2250,6 @@ packages: tslib: 1.14.1 dev: false - /@sentry/bundler-plugin-core/0.4.0: - resolution: {integrity: sha512-Xi+dqaSOoxbdmxegX7f66FVOxm2dVJLmrMXUpoNyuV6ASoccRWzouGaFekP059SUTTD05ytk1mHqwgVuBCA0Dw==} - engines: {node: '>= 10'} - dependencies: - '@sentry/cli': 2.13.0 - '@sentry/node': 7.37.2 - '@sentry/tracing': 7.37.2 - magic-string: 0.27.0 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - /@sentry/cli/2.13.0: resolution: {integrity: sha512-F0WmiMmVjn6zZyD89MF8B1zGgcrJTi5yxPmd+sqpRKOfGCtucdRdM/BL1aU27BApaseCCfI1bgwtJSB2fUQqlw==} engines: {node: '>= 10'} @@ -2287,21 +2273,7 @@ packages: '@sentry/types': 7.37.2 '@sentry/utils': 7.37.2 tslib: 1.14.1 - - /@sentry/node/7.37.2: - resolution: {integrity: sha512-aeJQ4oU3vF9zks8S/fvoLPVVhofmTjyMhZZIpSQWtfFqWxrXQsrqNlNUZZdXoqAUPNjA4QAzzOoXHhpUsa3Nxw==} - engines: {node: '>=8'} - dependencies: - '@sentry/core': 7.37.2 - '@sentry/types': 7.37.2 - '@sentry/utils': 7.37.2 - cookie: 0.4.2 - https-proxy-agent: 5.0.1 - lru_map: 0.3.3 - tslib: 1.14.1 - transitivePeerDependencies: - - supports-color - dev: true + dev: false /@sentry/react/7.37.2_react@18.2.0: resolution: {integrity: sha512-e5NFQAwHSGVyMUGYjvYXLI/QECkXkZ2BNUo+OHr5mAYqcIyGSA38tX7RJetrhonVjjpJp/ZVzlOyxQkpnBfBLw==} @@ -2334,10 +2306,12 @@ packages: '@sentry/types': 7.37.2 '@sentry/utils': 7.37.2 tslib: 1.14.1 + dev: false /@sentry/types/7.37.2: resolution: {integrity: sha512-SxKQOCX94ZaQM4C2ysNjHdJsjYapu/NYZCz1cnPyCdDvYfhwiVge1uq6ZHiQ/ARfxAAOmc3R4Mh3VvEz7WUOdw==} engines: {node: '>=8'} + dev: false /@sentry/utils/7.37.2: resolution: {integrity: sha512-5irN1nN/mtdOoWwsJiwBK0gPgNMkciUubEMbCaaXqJaGyGz8+yfDvXj7L+xGYiU57z+7+QkkSKxKEZ/IcBpjVQ==} @@ -2345,16 +2319,7 @@ packages: dependencies: '@sentry/types': 7.37.2 tslib: 1.14.1 - - /@sentry/vite-plugin/0.4.0: - resolution: {integrity: sha512-dBxM00MCLzO/idzAqj33ZfbIBKZxP+FzpxtS2WaV0yzad9yLBAFZ/VGDIGHQJC0Qo3fsFi/CZpmN39wJkJoWFA==} - engines: {node: '>= 10'} - dependencies: - '@sentry/bundler-plugin-core': 0.4.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: true + dev: false /@swc/core-darwin-arm64/1.3.35: resolution: {integrity: sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==} @@ -2575,7 +2540,7 @@ packages: resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==} dev: false - /@vitejs/plugin-legacy/4.0.1_terser@5.16.3+vite@4.1.1: + /@vitejs/plugin-legacy/4.0.1_terser@5.16.4+vite@4.1.1: resolution: {integrity: sha512-/ZV63NagI1c9TB5E4ijGmycY//fNm/2L02nsnXXxACwYaF9W+/OyVlgIW24jYUIS+g0yQRtn+N5hzBc8RLNhGA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2589,8 +2554,8 @@ packages: magic-string: 0.27.0 regenerator-runtime: 0.13.11 systemjs: 6.13.0 - terser: 5.16.3 - vite: 4.1.1_vjhh7uxert6hqr24po4pu3s6wm + terser: 5.16.4 + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu transitivePeerDependencies: - supports-color dev: true @@ -2601,7 +2566,7 @@ packages: vite: ^4 dependencies: '@swc/core': 1.3.35 - vite: 4.1.1_vjhh7uxert6hqr24po4pu3s6wm + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu dev: true /@xobotyi/scrollbar-width/1.9.5: @@ -2685,14 +2650,6 @@ packages: color-convert: 2.0.1 dev: true - /anymatch/3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - dev: true - /arg/4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} dev: true @@ -2790,11 +2747,6 @@ packages: resolution: {integrity: sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==} dev: false - /binary-extensions/2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - dev: true - /bl/4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} dependencies: @@ -2903,21 +2855,6 @@ packages: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: true - /chokidar/3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /classnames/2.3.2: resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} dev: false @@ -3116,11 +3053,6 @@ packages: /convert-source-map/1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - /cookie/0.4.2: - resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==} - engines: {node: '>= 0.6'} - dev: true - /copy-anything/2.0.6: resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==} dependencies: @@ -3841,7 +3773,7 @@ packages: he: 1.2.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.16.3 + terser: 5.16.4 dev: true /https-proxy-agent/5.0.1: @@ -3981,13 +3913,6 @@ packages: /is-arrayish/0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - /is-binary-path/2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - dev: true - /is-core-module/2.11.0: resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==} dependencies: @@ -4287,10 +4212,6 @@ packages: yallist: 4.0.0 dev: true - /lru_map/0.3.3: - resolution: {integrity: sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==} - dev: true - /magic-string/0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} @@ -4584,11 +4505,6 @@ packages: validate-npm-package-license: 3.0.4 dev: true - /normalize-path/3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - dev: true - /normalize.css/8.0.1: resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==} dev: false @@ -5019,13 +4935,6 @@ packages: util-deprecate: 1.0.2 dev: true - /readdirp/3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - dev: true - /redent/3.0.0: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} @@ -5479,8 +5388,8 @@ packages: rimraf: 2.6.3 dev: true - /terser/5.16.3: - resolution: {integrity: sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==} + /terser/5.16.4: + resolution: {integrity: sha512-5yEGuZ3DZradbogeYQ1NaGz7rXVBDWujWlx1PT8efXO6Txn+eWbfKqB2bTDVmFXmePFkoLU6XI8UektMIEA0ug==} engines: {node: '>=10'} hasBin: true dependencies: @@ -5640,15 +5549,6 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin/1.0.1: - resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} - dependencies: - acorn: 8.8.2 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.5.0 - dev: true - /update-browserslist-db/1.0.10_browserslist@4.21.5: resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==} hasBin: true @@ -5704,7 +5604,7 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 4.1.1_vjhh7uxert6hqr24po4pu3s6wm + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu transitivePeerDependencies: - supports-color dev: true @@ -5726,10 +5626,23 @@ packages: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 4.1.1_vjhh7uxert6hqr24po4pu3s6wm + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu + dev: true + + /vite-plugin-sentry/1.1.7_vite@4.1.1: + resolution: {integrity: sha512-V5WlWKbgul3udItDmvZHEzUw0TE2cehKLfcdR/G98PQ2LvweWDafVk4nmJpj1I7q70eeXWNoqmVq5Esde8c7XA==} + engines: {node: '>= 12'} + peerDependencies: + vite: ^2.6.0 || ^3.0.0 || ^4.0.0 + dependencies: + '@sentry/cli': 2.13.0 + vite: 4.1.1_53hv5ribh2tndci5dithclbkyu + transitivePeerDependencies: + - encoding + - supports-color dev: true - /vite/4.1.1_vjhh7uxert6hqr24po4pu3s6wm: + /vite/4.1.1_53hv5ribh2tndci5dithclbkyu: resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -5760,7 +5673,7 @@ packages: postcss: 8.4.21 resolve: 1.22.1 rollup: 3.15.0 - terser: 5.16.3 + terser: 5.16.4 optionalDependencies: fsevents: 2.3.2 dev: true @@ -5775,15 +5688,6 @@ packages: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: true - /webpack-sources/3.2.3: - resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} - engines: {node: '>=10.13.0'} - dev: true - - /webpack-virtual-modules/0.5.0: - resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} - dev: true - /whatwg-url/5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: diff --git a/vite.config.ts b/vite.config.ts index 5d144b6..4959c41 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,7 +10,7 @@ import viteCompression from "vite-plugin-compression"; // polyfill import legacy from "@vitejs/plugin-legacy"; //sentry -import { sentryVitePlugin } from "@sentry/vite-plugin"; +import viteSentry from "vite-plugin-sentry"; //get build time import getBulidTime from "./getbuildtime"; @@ -38,7 +38,7 @@ import { createHtmlPlugin } from "vite-plugin-html"; export default defineConfig(({ mode }) => { return { define: { - __APP_VERSION__: packageJson.version, + __APP_VERSION__: "0.01", isdev: mode === "development", }, resolve: { @@ -72,13 +72,15 @@ export default defineConfig(({ mode }) => { }), getBulidTime(), { - ...sentryVitePlugin({ + ...viteSentry({ configFile: ".sentryclirc", - include: "./dist", - release: "eoefans-web@" + packageJson.version, - headers: { - "Expect-CT": `max-age=86400, enforce,report-uri="https://sentry.vtb.link/api/3/security/?sentry_key=086f27258cce4d28aacc8c2719a683fb"`, + sourceMaps: { + include: ["./dist/assets"], }, + release: "eoefans-web@" + packageJson.version, + // headers: { + // "Expect-CT": `max-age=86400, enforce,report-uri="https://sentry.vtb.link/api/3/security/?sentry_key=086f27258cce4d28aacc8c2719a683fb"`, + // }, }), apply: "build", },