diff --git a/.dockerignore b/.dockerignore index b8527ba54..877b7bb5d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,6 @@ .git -.yarn -.yarnrc.yml +.yarn/cache +.yarn/install-state.gz build incoming docker diff --git a/.gitignore b/.gitignore index d9d337b79..bdc617d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,14 @@ # app specific -.yarn -.yarnrc.yml build incoming logs release-version.txt config.mk +# yarn things +# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored +.yarn/* + # vscode .devcontainer .vscode diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml new file mode 100644 index 000000000..f03163f41 --- /dev/null +++ b/frontend/.yarnrc.yml @@ -0,0 +1,3 @@ +nodeLinker: node-modules + +yarnPath: .yarn/releases/yarn-4.0.2.cjs diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0418a705d..d3764216a 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -2,6 +2,7 @@ FROM node:lts-bookworm-slim ENV YARN_VERSION stable +WORKDIR /code RUN apt-get update \ && apt-get install -y libjpeg-turbo-progs \ git \ @@ -10,9 +11,8 @@ RUN apt-get update \ && yarn set version $YARN_VERSION \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -WORKDIR /code -COPY package.json yarn.lock /code/ -RUN set -ex; \ +COPY package.json yarn.lock .yarnrc.yml /code/ +RUN set -ex; \ if [ "$NODE_ENV" = "production" ]; then \ yarn workspaces focus --production; \ elif [ "$NODE_ENV" = "test" ] || [ "$NODE_ENV" = "e2e" ]; then \ diff --git a/frontend/package.json b/frontend/package.json index d8cb600d1..af2d430cc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -38,7 +38,7 @@ "query-string": "^8.1.0", "sass": "^1.58.3", "sortablejs": "^1.15.0", - "sortablejs-vue3": "^1.2.9", + "sortablejs-vue3": "^1.2.10", "vue": "^3.2.47", "vue-multiselect": "^3.0.0-beta.1", "vue-router": "^4.1.6", @@ -50,7 +50,7 @@ "@types/jsdom": "^21.1.0", "@types/lodash-es": "^4.17.7", "@types/node": "^18.14.2", - "@types/sortablejs": "^1.15.1", + "@types/sortablejs": "^1.15.0", "@vitejs/plugin-vue": "^4.0.0", "@vue/eslint-config-prettier": "^7.1.0", "@vue/eslint-config-typescript": "^11.0.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index dc16d53f4..fa38ca8ee 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -26,7 +26,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.23.0": +"@babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.3": version: 7.23.4 resolution: "@babel/parser@npm:7.23.4" bin: @@ -529,10 +529,10 @@ __metadata: languageName: node linkType: hard -"@types/sortablejs@npm:^1.15.1": - version: 1.15.5 - resolution: "@types/sortablejs@npm:1.15.5" - checksum: aef9257e7ec03b154a5bb66ed4406a54cec72af14a994fc646a423a0324beaadb5c1905966f19cc5469aa72be7214be2372b998609903e72dacada2f7d7b12cd +"@types/sortablejs@npm:^1.15.0": + version: 1.15.7 + resolution: "@types/sortablejs@npm:1.15.7" + checksum: 28c58d502fe66d272372b6692d62718a9581fe20dfe0447bb787d069d9eebc1ec8d6ba43d6fe6b94f248f0e2e0fc77b1a4e60ce38a43009ccde14a7a375eb3df languageName: node linkType: hard @@ -791,6 +791,18 @@ __metadata: languageName: node linkType: hard +"@vue/compiler-core@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/compiler-core@npm:3.3.9" + dependencies: + "@babel/parser": "npm:^7.23.3" + "@vue/shared": "npm:3.3.9" + estree-walker: "npm:^2.0.2" + source-map-js: "npm:^1.0.2" + checksum: b7114c299f765a6df27c9e3cfdd3372644d941aece10518207b4b402778f7be6180da7532f5dc2ae1627e569f81067d27b112787e195692cb5faee3fad254192 + languageName: node + linkType: hard + "@vue/compiler-dom@npm:3.3.8, @vue/compiler-dom@npm:^3.3.0": version: 3.3.8 resolution: "@vue/compiler-dom@npm:3.3.8" @@ -801,6 +813,16 @@ __metadata: languageName: node linkType: hard +"@vue/compiler-dom@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/compiler-dom@npm:3.3.9" + dependencies: + "@vue/compiler-core": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + checksum: cc7b731400ddcbd2f7ffc5a64e5de6af42f1c647d178f7a48d63579c5e5cf2a3f39acafeefada6bd82cfa4af6724bd7363faef0522eb2a4c2dec8304e1b36c50 + languageName: node + linkType: hard + "@vue/compiler-sfc@npm:3.3.8": version: 3.3.8 resolution: "@vue/compiler-sfc@npm:3.3.8" @@ -819,6 +841,24 @@ __metadata: languageName: node linkType: hard +"@vue/compiler-sfc@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/compiler-sfc@npm:3.3.9" + dependencies: + "@babel/parser": "npm:^7.23.3" + "@vue/compiler-core": "npm:3.3.9" + "@vue/compiler-dom": "npm:3.3.9" + "@vue/compiler-ssr": "npm:3.3.9" + "@vue/reactivity-transform": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + estree-walker: "npm:^2.0.2" + magic-string: "npm:^0.30.5" + postcss: "npm:^8.4.31" + source-map-js: "npm:^1.0.2" + checksum: a4f346c285268c1b30e5f837f78d0fef995e9bf553c2806d5be62aa66cc12ec6d44db5066433f14c9183f22f0310eeb9f5e872e865eb84638accd0ff7e3c8c76 + languageName: node + linkType: hard + "@vue/compiler-ssr@npm:3.3.8": version: 3.3.8 resolution: "@vue/compiler-ssr@npm:3.3.8" @@ -829,6 +869,16 @@ __metadata: languageName: node linkType: hard +"@vue/compiler-ssr@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/compiler-ssr@npm:3.3.9" + dependencies: + "@vue/compiler-dom": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + checksum: 119b67a3c2a739842f9a4b4b0385986549262586ce4d9eb8bb5d308ace80f7f3a854ef302982bfd3951dc359779b25758a6e53ddaf9e2b1c95b50cd3a7e9ae58 + languageName: node + linkType: hard + "@vue/devtools-api@npm:^6.5.0": version: 6.5.1 resolution: "@vue/devtools-api@npm:6.5.1" @@ -901,6 +951,19 @@ __metadata: languageName: node linkType: hard +"@vue/reactivity-transform@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/reactivity-transform@npm:3.3.9" + dependencies: + "@babel/parser": "npm:^7.23.3" + "@vue/compiler-core": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + estree-walker: "npm:^2.0.2" + magic-string: "npm:^0.30.5" + checksum: 43053f09229f1994179491a15bdd13515601074e640781e5419007ee32c68060f0fb13e7c60ee533af91dd7da0b38442bf736fa74bf5597b1181174c11c2642d + languageName: node + linkType: hard + "@vue/reactivity@npm:3.3.8": version: 3.3.8 resolution: "@vue/reactivity@npm:3.3.8" @@ -910,6 +973,15 @@ __metadata: languageName: node linkType: hard +"@vue/reactivity@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/reactivity@npm:3.3.9" + dependencies: + "@vue/shared": "npm:3.3.9" + checksum: acd95e033f872260e8a8a8561eb44a91ce11c66582b3b31af0d5746372d906c3546173632c6029b53375f196f756eeb9d050f1cc0d77497210d9805df52f4c0d + languageName: node + linkType: hard + "@vue/runtime-core@npm:3.3.8": version: 3.3.8 resolution: "@vue/runtime-core@npm:3.3.8" @@ -920,6 +992,16 @@ __metadata: languageName: node linkType: hard +"@vue/runtime-core@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/runtime-core@npm:3.3.9" + dependencies: + "@vue/reactivity": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + checksum: a2fdcaa7ee4c1a1ee18ac75b23596f3b3941b6682949e1164b074a54a9b9722e50fff29de2b771f659b52410e2394b922b940a1b75123ea79fd5e0d967d88a1b + languageName: node + linkType: hard + "@vue/runtime-dom@npm:3.3.8": version: 3.3.8 resolution: "@vue/runtime-dom@npm:3.3.8" @@ -931,6 +1013,17 @@ __metadata: languageName: node linkType: hard +"@vue/runtime-dom@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/runtime-dom@npm:3.3.9" + dependencies: + "@vue/runtime-core": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + csstype: "npm:^3.1.2" + checksum: 708b0dad90335d42cd5f89a072f2b13934e33bce00d82f642935c0081e8905f6d9ee3eec7a65077070a5336a050bfce46aa8eaf1803a3527d1cebb71add548d4 + languageName: node + linkType: hard + "@vue/server-renderer@npm:3.3.8": version: 3.3.8 resolution: "@vue/server-renderer@npm:3.3.8" @@ -943,6 +1036,18 @@ __metadata: languageName: node linkType: hard +"@vue/server-renderer@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/server-renderer@npm:3.3.9" + dependencies: + "@vue/compiler-ssr": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + peerDependencies: + vue: 3.3.9 + checksum: 867faafbabe66bea09ba2be95aa8e67b19fe41fd03a05074f8f67f6ed3c6908a7a3eee0137bfcf1e829d640a4ec67c33b85361b9c0930748c01f9fa4e8f25e34 + languageName: node + linkType: hard + "@vue/shared@npm:3.3.8, @vue/shared@npm:^3.3.0": version: 3.3.8 resolution: "@vue/shared@npm:3.3.8" @@ -950,6 +1055,13 @@ __metadata: languageName: node linkType: hard +"@vue/shared@npm:3.3.9": + version: 3.3.9 + resolution: "@vue/shared@npm:3.3.9" + checksum: abf10852baf4009e838c5c12893a67e4dbb4369ec6be2892ce6294a4115d2087ecd619783bbafe048d154da48dd28763fc6c53114ab490ced45e573b2d69dbc9 + languageName: node + linkType: hard + "@vue/test-utils@npm:^2.3.0": version: 2.4.2 resolution: "@vue/test-utils@npm:2.4.2" @@ -2298,7 +2410,7 @@ __metadata: "@types/jsdom": "npm:^21.1.0" "@types/lodash-es": "npm:^4.17.7" "@types/node": "npm:^18.14.2" - "@types/sortablejs": "npm:^1.15.1" + "@types/sortablejs": "npm:^1.15.0" "@vitejs/plugin-vue": "npm:^4.0.0" "@vorms/core": "npm:^1.1.0" "@vorms/resolvers": "npm:^1.1.0" @@ -2322,7 +2434,7 @@ __metadata: query-string: "npm:^8.1.0" sass: "npm:^1.58.3" sortablejs: "npm:^1.15.0" - sortablejs-vue3: "npm:^1.2.9" + sortablejs-vue3: "npm:^1.2.10" typescript: "npm:~4.8.4" vite: "npm:^4.1.4" vitest: "npm:^0.29.1" @@ -3774,7 +3886,7 @@ __metadata: languageName: node linkType: hard -"pinia@npm:^2.0.32, pinia@npm:^2.1.3": +"pinia@npm:^2.0.32": version: 2.1.7 resolution: "pinia@npm:2.1.7" dependencies: @@ -4289,25 +4401,16 @@ __metadata: languageName: node linkType: hard -"sortablejs-vue3@npm:^1.2.9": - version: 1.2.10 - resolution: "sortablejs-vue3@npm:1.2.10" +"sortablejs-vue3@npm:^1.2.10": + version: 1.2.11 + resolution: "sortablejs-vue3@npm:1.2.11" dependencies: - pinia: "npm:^2.1.3" - sortablejs: "github:roy-mdr/Sortable#cee2ee7bccf83a7776c85588759aa0b8" - vue: "npm:^3.2.37" - vue-eslint-parser: "npm:^9.3.0" + sortablejs: "npm:^1.15.0" + vue: "npm:^3.3.7" peerDependencies: - sortablejs: "*" + sortablejs: ^1.15.0 vue: ^3.2.25 - checksum: 5ec121a9d2d15f365b3149ff13fef92335cf2fffe0d6854e43cd78499785c3e47230ed17a3dd829ebbb3f191d61504a7478aab599622363d5a7a3091ddb9cb69 - languageName: node - linkType: hard - -"sortablejs@github:roy-mdr/Sortable#cee2ee7bccf83a7776c85588759aa0b8": - version: 1.15.0 - resolution: "sortablejs@https://github.com/roy-mdr/Sortable.git#commit=cee2ee7bccf83a7776c85588759aa0b8f9ca5d3f" - checksum: a033b866732ea9e5354fca390293a46dc8d1797b750f9aafa8a3f6700f4c7a9e97b69c0d5d041df3d9dcf93a1967b328516e4bed822afa0aa87409d60e6745b9 + checksum: 026575342679d7190ba9fdc6c1ca186404a358b10618a2e4cd6702c72bfb08404b891bff37aa1db61fb4d469d8da455694e0ef0c1f52ee713ad418d6485d6e97 languageName: node linkType: hard @@ -4969,7 +5072,7 @@ __metadata: languageName: node linkType: hard -"vue-eslint-parser@npm:^9.1.1, vue-eslint-parser@npm:^9.3.0, vue-eslint-parser@npm:^9.3.1": +"vue-eslint-parser@npm:^9.1.1, vue-eslint-parser@npm:^9.3.1": version: 9.3.2 resolution: "vue-eslint-parser@npm:9.3.2" dependencies: @@ -5029,7 +5132,7 @@ __metadata: languageName: node linkType: hard -"vue@npm:^3.2.37, vue@npm:^3.2.47": +"vue@npm:^3.2.47": version: 3.3.8 resolution: "vue@npm:3.3.8" dependencies: @@ -5047,6 +5150,24 @@ __metadata: languageName: node linkType: hard +"vue@npm:^3.3.7": + version: 3.3.9 + resolution: "vue@npm:3.3.9" + dependencies: + "@vue/compiler-dom": "npm:3.3.9" + "@vue/compiler-sfc": "npm:3.3.9" + "@vue/runtime-dom": "npm:3.3.9" + "@vue/server-renderer": "npm:3.3.9" + "@vue/shared": "npm:3.3.9" + peerDependencies: + typescript: "*" + peerDependenciesMeta: + typescript: + optional: true + checksum: 46a9b363e208e0103162117bf8cd4820bfd844066502adc9106f075c4f67b15599ccabc9cd15971e43514eb446662cebb80cdcaf5f46f3b06b197e3aad410105 + languageName: node + linkType: hard + "w3c-xmlserializer@npm:^4.0.0": version: 4.0.0 resolution: "w3c-xmlserializer@npm:4.0.0"