From 6626e5ad9044a424dee7a6bd8c0d0304cc7d8b81 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Tue, 11 Jul 2023 11:56:33 +0100 Subject: [PATCH] fix: final build fix hopefully --- package.json | 3 +- pnpm-lock.yaml | 130 +----------------- .../settings/sections/background/Colour.jsx | 2 +- vite.config.js | 5 +- 4 files changed, 10 insertions(+), 130 deletions(-) diff --git a/package.json b/package.json index f37ea6ed..445f0fa9 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@fontsource/lexend-deca": "5.0.5", "@fontsource/montserrat": "5.0.5", "@muetab/react-color-gradient-picker": "0.1.2", - "@muetab/react-sortable-hoc": "^2.0.0", + "@muetab/react-sortable-hoc": "^2.0.1", "@mui/material": "5.13.7", "@sentry/react": "^7.57.0", "embla-carousel-autoplay": "8.0.0-rc10", @@ -49,7 +49,6 @@ "stylelint-config-standard-scss": "^10.0.0", "stylelint-scss": "^5.0.1", "vite": "4.4.2", - "vite-plugin-checker": "^0.6.1", "vite-plugin-progress": "^0.0.7" }, "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0560e444..9849de8e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,8 +23,8 @@ dependencies: specifier: 0.1.2 version: 0.1.2(react-dom@18.2.0)(react@18.2.0) '@muetab/react-sortable-hoc': - specifier: ^2.0.0 - version: 2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) + specifier: ^2.0.1 + version: 2.0.1(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) '@mui/material': specifier: 5.13.7 version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0) @@ -111,9 +111,6 @@ devDependencies: vite: specifier: 4.4.2 version: 4.4.2(@types/node@20.4.1)(sass@1.63.6) - vite-plugin-checker: - specifier: ^0.6.1 - version: 0.6.1(eslint@8.44.0)(stylelint@15.10.1)(typescript@5.1.6)(vite@4.4.2) vite-plugin-progress: specifier: ^0.0.7 version: 0.0.7(vite@4.4.2) @@ -2266,8 +2263,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@muetab/react-sortable-hoc@2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-g0NRAxEcf7aEHrWRNcfKMmzcoF0s32XxqoiRIA2TpUki39Y44JcuYmWj+SQ7VWgd20XyaiYYh31B5VCIX2Btug==} + /@muetab/react-sortable-hoc@2.0.1(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-w5tKlh+pl1PJXIdAmThxM4brkXPoRvAiV8XrmDuAu98iELRMwji9Pm6lBu2KCJnFLbZcEUk7oJHPdOAcxNvX1w==} peerDependencies: prop-types: ^15.5.7 react: ^18.2.0 @@ -2944,13 +2941,6 @@ packages: uri-js: 4.4.1 dev: true - /ansi-escapes@4.3.2: - resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} - engines: {node: '>=8'} - dependencies: - type-fest: 0.21.3 - dev: true - /ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -3300,11 +3290,6 @@ packages: resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==} dev: true - /commander@8.3.0: - resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} - engines: {node: '>= 12'} - dev: true - /compare-func@2.0.0: resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==} dependencies: @@ -4783,10 +4768,6 @@ packages: resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==} dev: true - /lodash.pick@4.4.0: - resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==} - dev: true - /lodash.snakecase@4.1.1: resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==} dev: true @@ -5933,10 +5914,6 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true - /tiny-invariant@1.3.1: - resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==} - dev: true - /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -6033,11 +6010,6 @@ packages: engines: {node: '>=10'} dev: true - /type-fest@0.21.3: - resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} - engines: {node: '>=10'} - dev: true - /type-fest@0.6.0: resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} engines: {node: '>=8'} @@ -6136,60 +6108,6 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-plugin-checker@0.6.1(eslint@8.44.0)(stylelint@15.10.1)(typescript@5.1.6)(vite@4.4.2): - resolution: {integrity: sha512-4fAiu3W/IwRJuJkkUZlWbLunSzsvijDf0eDN6g/MGh6BUK4SMclOTGbLJCPvdAcMOQvVmm8JyJeYLYd4//8CkA==} - engines: {node: '>=14.16'} - peerDependencies: - eslint: '>=7' - meow: ^9.0.0 - optionator: ^0.9.1 - stylelint: '>=13' - typescript: '*' - vite: '>=2.0.0' - vls: '*' - vti: '*' - vue-tsc: '>=1.3.9' - peerDependenciesMeta: - eslint: - optional: true - meow: - optional: true - optionator: - optional: true - stylelint: - optional: true - typescript: - optional: true - vls: - optional: true - vti: - optional: true - vue-tsc: - optional: true - dependencies: - '@babel/code-frame': 7.22.5 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - chokidar: 3.5.3 - commander: 8.3.0 - eslint: 8.44.0 - fast-glob: 3.3.0 - fs-extra: 11.1.1 - lodash.debounce: 4.0.8 - lodash.pick: 4.4.0 - npm-run-path: 4.0.1 - semver: 7.5.4 - strip-ansi: 6.0.1 - stylelint: 15.10.1 - tiny-invariant: 1.3.1 - typescript: 5.1.6 - vite: 4.4.2(@types/node@20.4.1)(sass@1.63.6) - vscode-languageclient: 7.0.0 - vscode-languageserver: 7.0.0 - vscode-languageserver-textdocument: 1.0.8 - vscode-uri: 3.0.7 - dev: true - /vite-plugin-progress@0.0.7(vite@4.4.2): resolution: {integrity: sha512-zyvKdcc/X+6hnw3J1HVV1TKrlFKC4Rh8GnDnWG/2qhRXjqytTcM++xZ+SAPnoDsSyWl8O93ymK0wZRgHAoglEQ==} engines: {node: '>=14', pnpm: '>=7.0.0'} @@ -6239,46 +6157,6 @@ packages: fsevents: 2.3.2 dev: true - /vscode-jsonrpc@6.0.0: - resolution: {integrity: sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==} - engines: {node: '>=8.0.0 || >=10.0.0'} - dev: true - - /vscode-languageclient@7.0.0: - resolution: {integrity: sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==} - engines: {vscode: ^1.52.0} - dependencies: - minimatch: 3.1.2 - semver: 7.5.4 - vscode-languageserver-protocol: 3.16.0 - dev: true - - /vscode-languageserver-protocol@3.16.0: - resolution: {integrity: sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==} - dependencies: - vscode-jsonrpc: 6.0.0 - vscode-languageserver-types: 3.16.0 - dev: true - - /vscode-languageserver-textdocument@1.0.8: - resolution: {integrity: sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==} - dev: true - - /vscode-languageserver-types@3.16.0: - resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==} - dev: true - - /vscode-languageserver@7.0.0: - resolution: {integrity: sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==} - hasBin: true - dependencies: - vscode-languageserver-protocol: 3.16.0 - dev: true - - /vscode-uri@3.0.7: - resolution: {integrity: sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==} - dev: true - /warning@4.0.3: resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} dependencies: diff --git a/src/components/modals/main/settings/sections/background/Colour.jsx b/src/components/modals/main/settings/sections/background/Colour.jsx index ac266e70..aca1fd60 100644 --- a/src/components/modals/main/settings/sections/background/Colour.jsx +++ b/src/components/modals/main/settings/sections/background/Colour.jsx @@ -7,7 +7,7 @@ import SettingsItem from '../../SettingsItem'; import hexToRgb from 'modules/helpers/background/hexToRgb'; import rgbToHex from 'modules/helpers/background/rgbToHex'; -import '@muetab/react-color-gradient-picker/dist/index.css'; +//import '@muetab/react-color-gradient-picker/dist/index.css'; import '../../../scss/settings/react-color-picker-gradient-picker-custom-styles.scss'; export default class ColourSettings extends PureComponent { diff --git a/vite.config.js b/vite.config.js index 5fbffc1b..14541f58 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,7 +5,6 @@ import fs from 'fs'; import ADMZip from 'adm-zip'; import * as pkg from './package.json'; import progress from 'vite-plugin-progress'; -import checker from 'vite-plugin-checker'; const isProd = process.env.NODE_ENV === 'production'; @@ -13,6 +12,10 @@ const prepareBuilds = () => ({ name: 'prepareBuilds', buildEnd() { if (isProd) { + // make directories if not exist + fs.mkdirSync(path.resolve(__dirname, './build'), { recursive: true }); + fs.mkdirSync(path.resolve(__dirname, './dist'), { recursive: true }); + // chrome fs.mkdirSync(path.resolve(__dirname, './build/chrome'), { recursive: true }); fs.copyFileSync(