Skip to content

Commit

Permalink
chore(deps): update yarn to v4.0.0 (#18530)
Browse files Browse the repository at this point in the history
* Update Yarn to v4.0.0

Signed-off-by: Sora Morimoto <sora@morimoto.io>

* `yarn format`

Signed-off-by: Sora Morimoto <sora@morimoto.io>

---------

Signed-off-by: Sora Morimoto <sora@morimoto.io>
  • Loading branch information
smorimoto committed Oct 24, 2023
1 parent 73ccf90 commit a8cb502
Show file tree
Hide file tree
Showing 12 changed files with 11,452 additions and 12,046 deletions.
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.4.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.0.cjs

Large diffs are not rendered by default.

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

nodeLinker: node-modules
enableGlobalCache: true

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'
nodeLinker: node-modules

preferInteractive: true

yarnPath: .yarn/releases/yarn-3.6.4.cjs
yarnPath: .yarn/releases/yarn-4.0.0.cjs
2 changes: 1 addition & 1 deletion docs/docs/docs/01-core/admin/01-ee/00-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Everytime a new EE feature is added in Strapi, in the settings menu, you should

```js
...

...(!window.strapi.features.isEnabled(window.strapi.features.NEW_EE_FEATURE) &&
window.strapi?.flags?.promoteEE
? [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"typescript": "5.2.2",
"yargs": "17.7.2"
},
"packageManager": "yarn@3.6.4",
"packageManager": "yarn@4.0.0+sha256.6d855253732ba8d231b6cd917961654f6c8439164c962a4e355c9c58360ebe44",
"engines": {
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/admin-test-utils/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export { };
export {};

declare global {
interface Window {
Expand All @@ -12,9 +12,9 @@ declare global {
projectType: string;
telemetryDisabled: boolean;
flags: {
nps: boolean,
promoteEE: boolean,
}
nps: boolean;
promoteEE: boolean;
};
};
}
}
7 changes: 6 additions & 1 deletion packages/core/admin/admin/src/hooks/useSettingsForm/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { useEffect, useReducer } from 'react';

import { getYupInnerErrors, useFetchClient, useNotification, useOverlayBlocker } from '@strapi/helper-plugin';
import {
getYupInnerErrors,
useFetchClient,
useNotification,
useOverlayBlocker,
} from '@strapi/helper-plugin';
import omit from 'lodash/omit';

import { formatAPIErrors } from '../../utils/formatAPIErrors';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/admin/admin/src/pages/AuthPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Redirect, useHistory, useRouteMatch } from 'react-router-dom';

import { useLocales } from '../../components/LanguageProvider';
import { useEnterprise } from '../../hooks/useEnterprise';
import { formatAPIErrors} from '../../utils/formatAPIErrors';
import { formatAPIErrors } from '../../utils/formatAPIErrors';

import { LoginCE } from './components/Login';
import { FORMS } from './constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ const SettingsNav = ({ menu }) => {
>
{formatMessage(link.intlLabel)}
{link?.lockIcon && (
<CustomIcon
width={`${15 / 16}rem`}
height={`${15 / 16}rem`}
as={Lock}
/>
<CustomIcon width={`${15 / 16}rem`} height={`${15 / 16}rem`} as={Lock} />
)}
</SubNavLink>
);
Expand Down
4 changes: 2 additions & 2 deletions packages/core/admin/shared/schema.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Schema } from '@strapi/types';

export interface ContentType extends Schema.ContentType {
isDisplayed: boolean;
isDisplayed: boolean;
}

export interface Component extends Schema.Component {
isDisplayed: boolean;
isDisplayed: boolean;
}

0 comments on commit a8cb502

Please sign in to comment.