From 6f8db11d2f2008b8888f949ea8fdccf156acfb1f Mon Sep 17 00:00:00 2001 From: sjaanus Date: Mon, 10 Jun 2024 14:16:49 +0300 Subject: [PATCH] Revert "fix: yarnv4 requires shebangs in shell scripts to allow execution (#7323)" This reverts commit 57ddfc9255daf944f3161bb29e51a6286b59ec12. --- .dockerignore | 1 - frontend/.yarnrc.yml | 1 - frontend/check-imports.rc | 1 - .../FeatureStrategyCreate/FeatureStrategyCreate.test.tsx | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6deb652b9900..5d3830a75cfd 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,4 +14,3 @@ frontend/node_modules !.yarn/** !.yarnrc.yml !frontend/.yarn/** -node_modules diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml index f46ce91e684c..fc2f0d8d6528 100644 --- a/frontend/.yarnrc.yml +++ b/frontend/.yarnrc.yml @@ -1,2 +1 @@ yarnPath: .yarn/releases/yarn-4.2.2.cjs -nodeLinker: node-modules diff --git a/frontend/check-imports.rc b/frontend/check-imports.rc index b0cc4ed54a1c..b367a6eaa38e 100755 --- a/frontend/check-imports.rc +++ b/frontend/check-imports.rc @@ -1,4 +1,3 @@ -#!/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';'" diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.test.tsx index fa78497bccef..3aa583f97dd4 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();