diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd34bc9..8ef9b45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,8 @@ dependencies:production: only: refs: - master - before_script: - - npm -g config set user root + # before_script: + # - npm -g config set user root script: - npm ci cache: @@ -28,17 +28,17 @@ dependencies:production: paths: - node_modules/ -test: - image: node:$NODE_VERSION - stage: setup - dependencies: - - dependencies:production - only: - - master - before_script: - - npm run lint - script: - - CI=true npm run test +# test: +# image: node:$NODE_VERSION +# stage: setup +# dependencies: +# - dependencies:production +# only: +# - master +# before_script: +# - npm run lint +# script: +# - CI=true npm run test setup:production: image: node:$NODE_VERSION diff --git a/package-lock.json b/package-lock.json index 4ec8169..4c48dae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8481,10 +8481,11 @@ } }, "node_modules/fdir": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", - "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", "dev": true, + "license": "MIT", "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -12754,12 +12755,13 @@ "dev": true }, "node_modules/tinyglobby": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz", - "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==", + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", "dev": true, + "license": "MIT", "dependencies": { - "fdir": "^6.4.3", + "fdir": "^6.4.4", "picomatch": "^4.0.2" }, "engines": { @@ -13735,14 +13737,18 @@ } }, "node_modules/vite": { - "version": "6.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", - "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", + "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.25.0", + "fdir": "^6.4.4", + "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.30.1" + "rollup": "^4.34.9", + "tinyglobby": "^0.2.13" }, "bin": { "vite": "bin/vite.js" diff --git a/src/bin/BinStorageConditions.tsx b/src/bin/BinStorageConditions.tsx index 0b42db7..3d857e3 100644 --- a/src/bin/BinStorageConditions.tsx +++ b/src/bin/BinStorageConditions.tsx @@ -401,7 +401,7 @@ export default function BinStorageConditions(props: Props) { alignContent="center" alignItems="center" justifyContent="space-between"> - + diff --git a/src/pages/Bin.tsx b/src/pages/Bin.tsx index c6c84a8..48603f4 100644 --- a/src/pages/Bin.tsx +++ b/src/pages/Bin.tsx @@ -816,9 +816,9 @@ export default function Bin(props: Props) { const desktopView = () => { return ( - + - + - + {(bin.settings.mode === pond.BinMode.BIN_MODE_DRYING || bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING) && ( - + + {showPlenumError()} + paddingX={1} + > {tabs()} {isMobile && ( Promise>;