From d0a985a4d70094530dac4bfa5ed1ba1fd7f6661c Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Fri, 7 Jun 2024 16:01:46 +0200 Subject: [PATCH 1/2] fix: yarnv4 requires shebangs in shell scripts to allow execution --- .dockerignore | 1 + frontend/.yarnrc.yml | 1 + frontend/check-imports.rc | 1 + 3 files changed, 3 insertions(+) diff --git a/.dockerignore b/.dockerignore index 5d3830a75cfd..6deb652b9900 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,3 +14,4 @@ frontend/node_modules !.yarn/** !.yarnrc.yml !frontend/.yarn/** +node_modules diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml index fc2f0d8d6528..f46ce91e684c 100644 --- a/frontend/.yarnrc.yml +++ b/frontend/.yarnrc.yml @@ -1 +1,2 @@ yarnPath: .yarn/releases/yarn-4.2.2.cjs +nodeLinker: node-modules diff --git a/frontend/check-imports.rc b/frontend/check-imports.rc index b367a6eaa38e..b0cc4ed54a1c 100755 --- a/frontend/check-imports.rc +++ b/frontend/check-imports.rc @@ -1,3 +1,4 @@ +#!/usr/bin/env sh if grep -R --include="*.js" --include="*.jsx" --include="*.ts" --include="*.tsx" "from '@mui/icons-material'" src; then echo "Prohibited import from '@mui/icons-material' found. Use default imports referencing the file instead of the global package. Example: import Delete from '@mui/icons-material/Delete';'" From 0e2da19a2cc4fd19b48a9009b1a7f35f95a3f942 Mon Sep 17 00:00:00 2001 From: kwasniew Date: Fri, 7 Jun 2024 16:24:43 +0200 Subject: [PATCH 2/2] test: increase timeout --- .../FeatureStrategyCreate/FeatureStrategyCreate.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx index 3aa583f97dd4..fa78497bccef 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx @@ -165,7 +165,7 @@ describe('NewFeatureStrategyCreate', () => { expect(screen.getByText(expectedSegmentName)).toBeInTheDocument(); expect(screen.getByText(expectedConstraintValue)).toBeInTheDocument(); - }); + }, 10000); test('should change variants settings', async () => { const { expectedVariantName } = setupComponent();