Skip to content

Commit

Permalink
Yarn 3 (#865)
Browse files Browse the repository at this point in the history
* Yarn 3

* yarn modern for cypress-io testing

* remove yarn network timeout

* Remove redundant typescript dependencies

* remove vestigial autoprefixer config

* Update dependencies

* remove interactive-tools yarn plugin
  • Loading branch information
mike-north authored Oct 14, 2023
1 parent 9e4fa7f commit d6164f7
Show file tree
Hide file tree
Showing 11 changed files with 27,013 additions and 20,230 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ jobs:
with:
working-directory: packages/website
start: yarn test:cypress
key: cypress-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
install-command: yarn install
browser: chrome
wait-on: 'http://localhost:8000'
wait-on-timeout: 120
Expand All @@ -71,7 +73,6 @@ jobs:
node_modules
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- run: yarn config set network-timeout 300000
- run: yarn
- name: Build
run: |
Expand Down Expand Up @@ -121,6 +122,8 @@ jobs:
with:
working-directory: packages/website
start: yarn test:cypress
key: cypress-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
install-command: yarn install
browser: chrome
wait-on: 'http://localhost:8000'
wait-on-timeout: 120
Expand Down Expand Up @@ -187,6 +190,8 @@ jobs:
with:
working-directory: packages/website
start: yarn test:cypress
key: cypress-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
install-command: yarn install
browser: chrome
wait-on: 'http://localhost:8000'
wait-on-timeout: 120
Expand Down
9 changes: 9 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
17 changes: 7 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,16 @@
"packages/*"
],
"volta": {
"node": "20.8.0",
"yarn": "1.22.19"
},
"dependencies": {
"typescript": "^5.3.0-beta"
"node": "18.18.2",
"yarn": "3.6.4"
},
"devDependencies": {
"@babel/core": "^7.4.0-0",
"@babel/preset-typescript": "^7.16.7",
"core-js": "^3.0.0",
"lerna": "^7.0.0",
"@babel/core": "^7.23.2",
"@babel/preset-typescript": "^7.23.2",
"core-js": "^3.33.0",
"lerna": "^7.3.1",
"replace-in-file": "^7.0.1",
"webpack": "^5.37.0"
"webpack": "^5.89.0"
},
"scripts": {
"postinstall": "replace-in-file 'import chalk' 'import * as chalk' node_modules/gatsby-cli/lib/reporter/reporter.d.ts",
Expand Down
3 changes: 1 addition & 2 deletions packages/chat/.postcssrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"plugins": {
"tailwindcss": {},
"autoprefixer": {}
"tailwindcss": {}
}
}
17 changes: 8 additions & 9 deletions packages/chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
"express": "^4.18.2",
"express-rate-limit": "^7.1.1",
"json-server": "^0.17.4",
"pkg-up": "^4.0.0",
"typescript": "^5.3.0-beta"
"pkg-up": "^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/core": "^7.23.2",
"@parcel/config-default": "^2.10.0",
"@parcel/optimizer-data-url": "^2.8.2",
"@parcel/packager-ts": "^2.8.2",
"@parcel/transformer-inline-string": "^2.8.2",
"@parcel/transformer-typescript-tsc": "^2.8.2",
"@parcel/transformer-typescript-types": "^2.8.2",
"@parcel/optimizer-data-url": "^2.10.0",
"@parcel/packager-ts": "^2.10.0",
"@parcel/transformer-inline-string": "^2.10.0",
"@parcel/transformer-typescript-tsc": "^2.10.0",
"@parcel/transformer-typescript-types": "^2.10.0",
"@types/express": "^4.17.19",
"@types/json-server": "^0.14.5",
"@types/react": "^18.2.28",
Expand All @@ -47,7 +46,7 @@
"postcss-purgecss": "^5.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^5.2.0",
"react-router-dom": "^5.3.4",
"tailwindcss": "^3.3.3",
"typescript": "^5.3.0-beta"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/hello-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "NOLICENSE",
"version": "0.0.1",
"devDependencies": {
"typescript": "^4.3.2"
"typescript": "^4.9.5"
},
"scripts": {
"dev": "tsc --watch --preserveWatchOutput"
Expand Down
72 changes: 36 additions & 36 deletions packages/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,62 @@
"url": "https://github.com/mike-north/ts-fundamentals-v3"
},
"dependencies": {
"gatsby": "^3.1.2",
"gatsby-image": "^3.1.0",
"gatsby-plugin-feed": "^3.1.0",
"gatsby-plugin-manifest": "^3.1.0",
"gatsby-plugin-react-helmet": "^4.1.0",
"gatsby-plugin-sass": "^4.1.0",
"gatsby-plugin-sharp": "^3.0.0",
"gatsby-plugin-typography": "^3.1.0",
"gatsby-remark-autolink-headers": "^4.3.0",
"gatsby-remark-copy-linked-files": "^4.2.1",
"gatsby-remark-images": "^5.2.1",
"gatsby-remark-responsive-iframe": "^4.3.0",
"gatsby-remark-shiki-twoslash": "^3.0.0",
"gatsby-remark-smartypants": "^4.2.0",
"gatsby-source-filesystem": "^3.1.0",
"gatsby-transformer-remark": "^3.0.0",
"gatsby-transformer-sharp": "^3.1.0",
"gatsby": "^3.15.0",
"gatsby-image": "^3.11.0",
"gatsby-plugin-feed": "^3.15.0",
"gatsby-plugin-manifest": "^3.15.0",
"gatsby-plugin-react-helmet": "^4.15.0",
"gatsby-plugin-sass": "^4.15.0",
"gatsby-plugin-sharp": "^3.15.0",
"gatsby-plugin-typography": "^3.15.0",
"gatsby-remark-autolink-headers": "^4.12.0",
"gatsby-remark-copy-linked-files": "^4.12.0",
"gatsby-remark-images": "^5.12.0",
"gatsby-remark-responsive-iframe": "^4.12.0",
"gatsby-remark-shiki-twoslash": "^3.0.38",
"gatsby-remark-smartypants": "^4.12.0",
"gatsby-source-filesystem": "^3.15.0",
"gatsby-transformer-remark": "^3.2.0",
"gatsby-transformer-sharp": "^3.15.0",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-typography": "^0.16.23",
"replace-in-file": "^7.0.1",
"sass": "^1.32.8",
"sass": "^1.69.3",
"typeface-merriweather": "1.1.13",
"typeface-montserrat": "1.1.13",
"typography": "^0.16.19",
"typography": "^0.16.24",
"typography-theme-wordpress-2016": "^0.16.19"
},
"devDependencies": {
"@babel/core": "^7.4.0-0",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.23.2",
"@babel/preset-typescript": "^7.23.2",
"@testing-library/cypress": "^10.0.1",
"@types/jest": "^27.0.0",
"@types/lodash": "^4.14.170",
"@types/node": "20",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.199",
"@types/node": "20.8.6",
"@types/pkg-up": "^3.1.0",
"@types/react": "18",
"@types/react-dom": "18",
"@types/react": "18.2.28",
"@types/react-dom": "18.2.13",
"@types/react-helmet": "^6.1.7",
"@types/react-test-renderer": "^18.0.3",
"@types/sharp": "^0.30.0",
"@types/typography": "^0.16.3",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"@types/sharp": "^0.30.5",
"@types/typography": "^0.16.5",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"babel-jest": "^26.6.3",
"babel-preset-gatsby": "^3.12.0",
"core-js": "^3.0.0",
"cypress": "^13.3.0",
"eslint": "^8.50.0",
"core-js": "^3.33.0",
"cypress": "^13.3.1",
"eslint": "^8.51.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-react": "^7.33.2",
"gatsby-cypress": "^3.12.0",
"gatsby-plugin-google-gtag": "^3.7.1",
"gatsby-plugin-google-tagmanager": "^3.7.1",
"gatsby-remark-custom-blocks": "^3.6.0",
"gatsby-plugin-google-gtag": "^3.15.0",
"gatsby-plugin-google-tagmanager": "^3.15.0",
"gatsby-remark-custom-blocks": "^3.15.0",
"gatsby-remark-emojis": "^0.4.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^26.6.3",
Expand Down
3 changes: 0 additions & 3 deletions packages/welcome-to-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
},
"scripts": {
"dev": "tsc --watch --preserveWatchOutput"
},
"dependencies": {
"typescript": "^5.3.0-beta"
}
}
Loading

0 comments on commit d6164f7

Please sign in to comment.