Merge pull request #679 from Atom-Learning/feat/upgrade-to-yarn4

feat: upgrade to yarn 4

.github/workflows/auto-fix.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup environment
         uses: actions/[email protected]
         with:
-          node-version: '14'
+          node-version: '20.11'
 
       - name: Install dependencies
         run: yarn install
@@ -46,6 +46,6 @@ jobs:
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_user_name: "atom-ci-actions[bot]"
-          commit_user_email: "129779914+atom-ci-actions[bot]@users.noreply.github.com"
+          commit_user_name: 'atom-ci-actions[bot]'
+          commit_user_email: '129779914+atom-ci-actions[bot]@users.noreply.github.com'
           commit_message: 'chore: apply auto-fix changes'

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-    - 'lib/**'
+      - 'lib/**'
 jobs:
   release:
     name: Release
@@ -14,8 +14,8 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@v1
         with:
-          node-version: '14'
-      - run: yarn install --frozen-lockfile
+          node-version: '20.11'
+      - run: yarn install --immutable
       - run: npx semantic-release
         working-directory: lib
         env:

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: "14"
+          node-version: '20.11'
 
       - run: yarn install
 

.gitignore

@@ -2,10 +2,17 @@
 **/dist
 **/.cache
 **/.eslintcache
-**/yarn-error.log
 **/coverage
 **/stats.html
 .DS_Store
 **/.next
 .vscode
 **/.env
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch

@@ -0,0 +1,12 @@
+diff --git a/types/css-util.d.ts b/types/css-util.d.ts
+index 5452ca4ada9c93e0e93d50f780d01a6590d7a095..8de19cb78cd7506b096ff24601cf412738c65d21 100644
+--- a/types/css-util.d.ts
++++ b/types/css-util.d.ts
+@@ -98,6 +98,7 @@ export type CSS<
+ 			| CSS<Media, Theme, ThemeMap, Utils>
+ 			| {}
+ 			| undefined
++			| any
+ 		)
+ 	}
+ )

.yarnrc.yml

@@ -0,0 +1,2 @@
+nodeLinker: 'pnpm'
+yarnPath: '.yarn/releases/yarn-berry.cjs'

lib/package.json

@@ -24,7 +24,7 @@
     "test": "jest --coverage",
     "test:watch": "jest --watch",
     "test:ci": "jest --silent --ci",
-    "validate": "run-p validate:**",
+    "validate": "run-p 'validate:**'",
     "validate:linting": "eslint 'src/**/*.{js,ts,tsx}' --quiet",
     "validate:size": "yarn build:lib && size-limit",
     "validate:types": "tsc --noEmit",
@@ -71,12 +71,18 @@
     "@semantic-release/npm": "^7.1.1",
     "@semantic-release/release-notes-generator": "^9.0.2",
     "@size-limit/preset-small-lib": "^7.0.5",
+    "@testing-library/dom": "^7.28.1",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.3",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.8.1",
     "@types/jest": "^26.0.20",
     "@types/jest-axe": "^3.5.1",
+    "@types/mdast": "^3.0.0",
+    "@types/node": "20.6.0",
+    "@types/prop-types": "^15",
+    "@types/react": "17.0.80",
+    "@types/react-dom": "^17.0.11",
     "@typescript-eslint/eslint-plugin": "^4.29.1",
     "@typescript-eslint/parser": "^4.29.1",
     "@vitejs/plugin-react-refresh": "^1.3.3",
@@ -104,6 +110,8 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "prompts": "^2.4.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "rollup": "^2.39.0",
     "rollup-plugin-esbuild": "^4.8.2",
     "rollup-plugin-json": "^4.0.0",
@@ -126,7 +134,6 @@
     "react-dom": "^17 || ^18 || ^19"
   },
   "dependencies": {
-    "@atom-learning/theme": "3.1.0",
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
@@ -150,9 +157,8 @@
     "@radix-ui/react-tooltip": "^1.0.7",
     "@radix-ui/react-visually-hidden": "^1.0.3",
     "@reach/combobox": "^0.16.1",
-    "@stitches/react": "1.3.1-1",
+    "@stitches/react": "patch:@stitches/react@npm%3A1.3.1-1#~/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch",
     "@tanstack/react-table": "^8.5.11",
-    "@types/react": "^17.0.30",
     "color2k": "^2.0.0",
     "dayjs": "^1.10.7",
     "dayzed": "^3.2.2",
@@ -161,6 +167,7 @@
     "mdast-util-directive": "1.0.1",
     "mdast-util-from-markdown": "0.8.5",
     "micromark-extension-directive": "1.4.0",
+    "prop-types": "^15.8.1",
     "pure-react-carousel": "^1.27.6",
     "react-aria": "^3.29.1",
     "react-docgen-typescript": "2.1.0",

lib/src/components/markdown-content/components/MarkdownCode.tsx

@@ -1,4 +1,4 @@
-import { Code } from 'mdast'
+import type { Code } from 'mdast'
 import * as React from 'react'
 
 import { styled } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownEmphasis.tsx

@@ -1,4 +1,4 @@
-import { Content, Emphasis } from 'mdast'
+import type { Content, Emphasis } from 'mdast'
 import * as React from 'react'
 
 import { styled } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownHeading.tsx

@@ -1,4 +1,4 @@
-import { Content, Heading as HeadingType } from 'mdast'
+import type { Content, Heading as HeadingType } from 'mdast'
 import * as React from 'react'
 
 import { Heading, HeadingProps } from '../../heading/Heading'

lib/src/components/markdown-content/components/MarkdownImage.tsx

@@ -1,4 +1,4 @@
-import { Image as ImageType } from 'mdast'
+import type { Image as ImageType } from 'mdast'
 import * as React from 'react'
 
 import { CSS } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownInlineCode.tsx

@@ -1,4 +1,4 @@
-import { InlineCode } from 'mdast'
+import type { InlineCode } from 'mdast'
 import * as React from 'react'
 
 import { styled } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownLink.tsx

@@ -1,4 +1,4 @@
-import { Content, Link as LinkType } from 'mdast'
+import type { Content, Link as LinkType } from 'mdast'
 import * as React from 'react'
 
 import { Link } from '../../link'

lib/src/components/markdown-content/components/MarkdownList.tsx

@@ -1,4 +1,4 @@
-import { Content, List as ListType } from 'mdast'
+import type { Content, List as ListType } from 'mdast'
 import * as React from 'react'
 
 import { CSS } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownListItem.tsx

@@ -1,4 +1,4 @@
-import { Content, ListItem } from 'mdast'
+import type { Content, ListItem } from 'mdast'
 import * as React from 'react'
 
 import { List } from '../../list'

lib/src/components/markdown-content/components/MarkdownParagraph.tsx

@@ -1,4 +1,4 @@
-import { Content, Paragraph } from 'mdast'
+import type { Content, Paragraph } from 'mdast'
 import * as React from 'react'
 
 import { Text } from '../../text'

lib/src/components/markdown-content/components/MarkdownStrong.tsx

@@ -1,4 +1,4 @@
-import { Content, Strong } from 'mdast'
+import type { Content, Strong } from 'mdast'
 import * as React from 'react'
 
 import { styled } from '~/stitches'

lib/src/components/markdown-content/components/MarkdownText.tsx

@@ -1,4 +1,4 @@
-import { Text as TextType } from 'mdast'
+import type { Text as TextType } from 'mdast'
 import * as React from 'react'
 
 type MarkdownTextProps = {

lib/src/components/navigation/NavigationMenu.tsx

@@ -67,7 +67,7 @@ const NavigationMenuComponent = ({
   }, [React.Children.toArray(children).length])
 
   React.useEffect(() => {
-    let timer: NodeJS.Timer
+    let timer: ReturnType<typeof setTimeout>
 
     // Delay transitioning back to initial position
     // to allow enough time for fadeOut animation to complete

package.json

@@ -16,14 +16,11 @@
     "dev:sandbox": "cd lib && yarn start:sandbox",
     "build:types": "cd lib && NODE_ENV=production tsc --emitDeclarationOnly && tsc-alias",
     "lint-staged": "cd lib && yarn run precommit",
-    "build-all": "run-s build:*",
-    "postinstall": "patch-package"
+    "build-all": "run-s build:*"
   },
   "devDependencies": {
     "husky": "^4.3.8",
-    "npm-run-all": "^4.1.5",
-    "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0"
+    "npm-run-all": "^4.1.5"
   },
   "husky": {
     "hooks": {
@@ -51,5 +48,6 @@
     "react-dom": "17.0.2",
     "next/@swc/helpers": "0.4.36",
     "@swc/helpers": "0.4.36"
-  }
+  },
+  "packageManager": "[email protected]"
 }