Merge pull request #9661 from guardian/revert-9466-sndrs/yarn-4

guardian · Nov 27, 2023 · 85a245b · 85a245b
2 parents 6951efb + 8661a2c
commit 85a245b
Show file tree

Hide file tree

Showing 34 changed files with 34,218 additions and 30,816 deletions.
diff --git a/.github/workflows/amp.yml b/.github/workflows/amp.yml
@@ -25,7 +25,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Validate AMP
         run: make ampValidation

diff --git a/.github/workflows/ar-chromatic.yml b/.github/workflows/ar-chromatic.yml
@@ -36,7 +36,7 @@ jobs:
           cache: 'yarn'
 
       # Root yarn installs all workspaces (root, dotcom)
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Chromatic - Apps Rendering
         env:

diff --git a/.github/workflows/ar-ci.yml b/.github/workflows/ar-ci.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          yarn --silent --immutable
+          yarn --silent --frozen-lockfile
 
       # Execute some tasks from the `apps-rendering/package.json` file, using `yarn`
       - name: Build and package

diff --git a/.github/workflows/ar-nodejs.yml b/.github/workflows/ar-nodejs.yml
@@ -25,7 +25,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn --immutable
+      - run: yarn --frozen-lockfile
 
       - name: lint
         run: yarn lint

diff --git a/.github/workflows/ar-pr-deployment.yml b/.github/workflows/ar-pr-deployment.yml
@@ -23,7 +23,7 @@ jobs:
           cache: 'yarn'
 
       - name: install
-        run: yarn --immutable
+        run: yarn --frozen-lockfile
         working-directory: apps-rendering
       - name: run
         working-directory: apps-rendering

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -20,7 +20,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Generate production build
         run: make build

diff --git a/.github/workflows/bundle-analyser.yml b/.github/workflows/bundle-analyser.yml
@@ -19,7 +19,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Generate production build
         run: make build

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -29,7 +29,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Cypress run
         uses: cypress-io/github-action@v6

diff --git a/.github/workflows/dcr-chromatic.yml b/.github/workflows/dcr-chromatic.yml
@@ -36,7 +36,7 @@ jobs:
           cache: 'yarn'
 
       # Root yarn installs all workspaces (root, dotcom)
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Chromatic - DCR
         env:

diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -12,7 +12,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Run Jest
         run: CI=true yarn test

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -21,7 +21,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       # Make sure we install dependencies in the root directory
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
       - run: make build
         working-directory: dotcom-rendering
       - name: Install and run Lighthouse CI

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -29,7 +29,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Install Playwright Browsers
         run: yarn playwright install --with-deps chromium

diff --git a/.github/workflows/pr-deployment.yml b/.github/workflows/pr-deployment.yml
@@ -23,7 +23,7 @@ jobs:
           node-version-file: .nvmrc
           cache: 'yarn'
       # Make sure we install dependencies in the root directory
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
       - run: make build
         working-directory: dotcom-rendering
       - name: Boot server and run ngrok

diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -12,7 +12,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Prettier check
         run: yarn prettier:check
diff --git a/.github/workflows/schema-check.yml b/.github/workflows/schema-check.yml
@@ -20,7 +20,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Run check-schema script
         run: make check-schema

diff --git a/.github/workflows/stories-check.yml b/.github/workflows/stories-check.yml
@@ -20,7 +20,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Run check-stories script
         run: make check-stories

diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
@@ -17,7 +17,7 @@ jobs:
           node-version-file: .nvmrc
           cache: 'yarn'
 
-      - run: yarn install --immutable
+      - run: yarn install --frozen-lockfile
 
       - name: Check typescript
         run: yarn tsc

diff --git a/.gitignore b/.gitignore
@@ -11,14 +11,9 @@ yarn-error.log*
 
 # Dependency directories
 node_modules
-.yarn/*
 
-# Things yarn might create that we'd want to check in
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+# Yarn Integrity file
+.yarn-integrity
 
 # IDE files
 .idea

diff --git a/.husky/post-merge b/.husky/post-merge
@@ -11,7 +11,7 @@ changedNode="$(echo "$changedFiles" | { grep '.nvmrc' || :; })"
 if [[ ! -z $changedLock ]]
 then
 	echo "${RED}This application has new dependencies. Running 'yarn'... ${ENDCOLOR}"
-	yarn --immutable
+	yarn --frozen-lockfile
 fi
 
 if [[ ! -z $changedNode ]]

diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+lastUpdateCheck 1641478836503
+
+save-exact true
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/apps-rendering/package.json b/apps-rendering/package.json
@@ -33,8 +33,8 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"@aws-sdk/client-ssm": "3.441.0",
 		"@aws-sdk/credential-providers": "3.441.0",
+		"@aws-sdk/client-ssm": "3.441.0",
 		"@babel/core": "7.23.2",
 		"@babel/preset-env": "^7.20.2",
 		"@creditkarma/thrift-server-core": "^1.0.4",

diff --git a/apps-rendering/src/client/article.ts b/apps-rendering/src/client/article.ts
@@ -1,5 +1,3 @@
-/* eslint-disable react/no-deprecated -- currently still working in 17 mode */
-
 // ----- Imports ----- //
 
 import type { Client as NotificationsClient } from '@guardian/bridget/Notifications';

diff --git a/apps-rendering/src/client/callouts.ts b/apps-rendering/src/client/callouts.ts
@@ -1,5 +1,3 @@
-/* eslint-disable react/no-deprecated -- currently still working in 17 mode */
-
 import type { Contact } from '@guardian/apps-rendering-api-models/contact';
 import type { FormField } from '@guardian/apps-rendering-api-models/formField';
 import type { FormOption } from '@guardian/apps-rendering-api-models/formOption';

diff --git a/apps-rendering/src/client/editions.ts b/apps-rendering/src/client/editions.ts
@@ -1,5 +1,3 @@
-/* eslint-disable react/no-deprecated -- currently still working in 17 mode */
-
 import {
 	initPingEditionsRendering,
 	MessageKind,

diff --git a/apps-rendering/src/components/EmbedWrapper/EmbedWrapper.test.tsx b/apps-rendering/src/components/EmbedWrapper/EmbedWrapper.test.tsx
@@ -2,8 +2,6 @@
  * @jest-environment jsdom
  */
 
-/* eslint-disable react/no-deprecated -- currently still working in 17 mode */
-
 import { matchers } from '@emotion/jest';
 import { EmbedTracksType } from '@guardian/content-api-models/v1/embedTracksType';
 import { none, some } from '@guardian/types';

diff --git a/apps-rendering/src/components/Follow/Follow.test.tsx b/apps-rendering/src/components/Follow/Follow.test.tsx
@@ -2,8 +2,6 @@
  * @jest-environment jsdom
  */
 
-/* eslint-disable react/no-deprecated -- currently still working in 17 mode */
-
 // ----- Imports ----- //
 
 import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';

diff --git a/apps-rendering/src/components/PinnedPost/index.tsx b/apps-rendering/src/components/PinnedPost/index.tsx
@@ -187,8 +187,6 @@ const PinnedPost: FC<Props> = ({ pinnedPost, format, edition }: Props) => {
 				/>
 			</div>
 			<div id="pinned-post-overlay" css={overlayStyles} />
-			{/* eslint-disable jsx-a11y/label-has-associated-control --
-				i don't know why it's failing, it has htmlFor */}
 			<label
 				css={fakeButtonStyles(format)}
 				htmlFor="pinned-post-checkbox"
@@ -203,7 +201,6 @@ const PinnedPost: FC<Props> = ({ pinnedPost, format, edition }: Props) => {
 					</span>
 				</>
 			</label>
-			{/* eslint-enable jsx-a11y/label-has-associated-control */}
 		</div>
 	);
 };