Skip to content

Commit

Permalink
Revert "Revert "Upgrade Yarn to v4""
Browse files Browse the repository at this point in the history
This reverts commit 8661a2c.
  • Loading branch information
sndrs committed Dec 6, 2023
1 parent 96968bc commit e02ec8e
Show file tree
Hide file tree
Showing 32 changed files with 32,230 additions and 34,194 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/amp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Validate AMP
run: make ampValidation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ar-chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
cache: 'yarn'

# Root yarn installs all workspaces (root, dotcom)
- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Chromatic - Apps Rendering
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ar-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Install dependencies
run: |
yarn --silent --frozen-lockfile
yarn --silent --immutable
# Execute some tasks from the `apps-rendering/package.json` file, using `yarn`
- name: Build and package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ar-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn --frozen-lockfile
- run: yarn --immutable

- name: lint
run: yarn lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ar-pr-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
cache: 'yarn'

- name: install
run: yarn --frozen-lockfile
run: yarn --immutable
working-directory: apps-rendering
- name: run
working-directory: apps-rendering
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Generate production build
run: make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bundle-analyser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Generate production build
run: make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Cypress run
uses: cypress-io/github-action@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dcr-chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
cache: 'yarn'

# Root yarn installs all workspaces (root, dotcom)
- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Chromatic - DCR
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Run Jest
run: CI=true yarn test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'
# Make sure we install dependencies in the root directory
- run: yarn install --frozen-lockfile
- run: yarn install --immutable
- run: make build
working-directory: dotcom-rendering
- name: Install and run Lighthouse CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Install Playwright Browsers
run: yarn playwright install --with-deps chromium
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
node-version-file: .nvmrc
cache: 'yarn'
# Make sure we install dependencies in the root directory
- run: yarn install --frozen-lockfile
- run: yarn install --immutable
- run: make build
working-directory: dotcom-rendering
- name: Boot server and run ngrok
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Prettier check
run: yarn prettier:check
2 changes: 1 addition & 1 deletion .github/workflows/schema-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Run check-schema script
run: make check-schema
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stories-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
node-version-file: '.nvmrc'
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Run check-stories script
run: make check-stories
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
node-version-file: .nvmrc
cache: 'yarn'

- run: yarn install --frozen-lockfile
- run: yarn install --immutable

- name: Check typescript
run: yarn tsc
Expand Down
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ yarn-error.log*

# Dependency directories
node_modules
.yarn/*

# Yarn Integrity file
.yarn-integrity
# Things yarn might create that we'd want to check in
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# IDE files
.idea
Expand Down
2 changes: 1 addition & 1 deletion .husky/post-merge
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ changedNode="$(echo "$changedFiles" | { grep '.nvmrc' || :; })"
if [[ ! -z $changedLock ]]
then
echo "${RED}This application has new dependencies. Running 'yarn'... ${ENDCOLOR}"
yarn --frozen-lockfile
yarn --immutable
fi

if [[ ! -z $changedNode ]]
Expand Down
7 changes: 0 additions & 7 deletions .yarnrc

This file was deleted.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
defaultSemverRangePrefix: ''

nmHoistingLimits: workspaces

nodeLinker: node-modules
2 changes: 2 additions & 0 deletions apps-rendering/src/client/article.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable react/no-deprecated -- currently still working in 17 mode */

// ----- Imports ----- //

import type { Client as NotificationsClient } from '@guardian/bridget/Notifications';
Expand Down
2 changes: 2 additions & 0 deletions apps-rendering/src/client/callouts.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* 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';
Expand Down
2 changes: 2 additions & 0 deletions apps-rendering/src/client/editions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable react/no-deprecated -- currently still working in 17 mode */

import {
initPingEditionsRendering,
MessageKind,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* @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 '../../../vendor/@guardian/types/index';
Expand Down
2 changes: 2 additions & 0 deletions apps-rendering/src/components/Follow/Follow.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* @jest-environment jsdom
*/

/* eslint-disable react/no-deprecated -- currently still working in 17 mode */

// ----- Imports ----- //

import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
Expand Down
3 changes: 3 additions & 0 deletions apps-rendering/src/components/PinnedPost/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ 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"
Expand All @@ -201,6 +203,7 @@ const PinnedPost: FC<Props> = ({ pinnedPost, format, edition }: Props) => {
</span>
</>
</label>
{/* eslint-enable jsx-a11y/label-has-associated-control */}
</div>
);
};
Expand Down
Loading

0 comments on commit e02ec8e

Please sign in to comment.