Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yarn 2 (for history) #658

Closed
wants to merge 5 commits into from
+37,139 −34,621
Closed

Yarn 2 (for history) #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7606d6d
chore: add gutenberg_custom_blocks to yarn workspaces
Leksat Jun 1, 2021
2526f4a
chore: downgrade typescript to make it compatible with yarn 2
Leksat Jun 1, 2021
dd61f6f
fix: don't re-run yarn in gutenberg_custom_blocks because it's a work…
Leksat Jun 2, 2021
eddd2e9
chore: make scripts compatible with yarn 2
Leksat Jun 2, 2021
eb3bd9c
feat: migrated to yarn 2
Leksat Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
node_modules
.npmrc
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*
55 changes: 55 additions & 0 deletions .yarn/releases/yarn-berry.cjs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
yarnPath: ".yarn/releases/yarn-berry.cjs"

nodeLinker: node-modules
3 changes: 1 addition & 2 deletions apps/silverback-drupal/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
"run-tests": [
"if [ -d web/modules/custom ]; then phpunit web/modules/custom; fi",
"yarn install && CYPRESS_TAGS=@COMPLETED cypress run"
],
"post-install-cmd": "set -x && cd web/modules/custom/gutenberg_custom_blocks && yarn && yarn build"
]
}
}
4 changes: 2 additions & 2 deletions apps/silverback-drupal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"license": "MIT",
"private": true,
"scripts": {
"prepare": "if php -v && [[ -z $LAGOON ]]; then composer install && yarn setup; fi",
"prepare": "./scripts/prepare.sh",
"start": "source .envrc && cd web && php -S 127.0.0.1:8888 .ht.router.php",
"setup": "source .envrc && silverback setup",
"setup": "./scripts/setup.sh",
"clear": "source .envrc && drush cr",
"test": "composer install && bash vendor/bin/silverback-test",
"export-content": "web/modules/custom/silverback_gatsby_test/export_content.sh"
Expand Down
9 changes: 9 additions & 0 deletions apps/silverback-drupal/scripts/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

set -ex

if php -v && [[ -z $LAGOON ]]
then
composer install
yarn setup
fi
9 changes: 9 additions & 0 deletions apps/silverback-drupal/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

set -e

source .envrc

set -x

silverback setup
3 changes: 2 additions & 1 deletion apps/silverback-drupal/web/modules/custom/gutenberg_custom_blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "gutenberg_custom_blocks",
"version": "1.0.0",
"private": true,
"scripts": {
"start": "yarn drupal-js-build --css && yarn drupal-js-build watch --css",
Expand All @@ -22,6 +23,6 @@
"eslint": "^7.27.0",
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"typescript": "^4.2.3"
"typescript": "~4.2.0"
}
}
8,658 changes: 0 additions & 8,658 deletions apps/silverback-drupal/web/modules/custom/gutenberg_custom_blocks/yarn.lock
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/silverback-gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"strip-ansi": "^6.0.0",
"tailwindcss": "^2.0.3",
"tmp": "^0.2.1",
"typescript": "^4.0.5"
"typescript": "~4.2.0"
},
"devDependencies": {
"@amazeelabs/eslint-config": "^1.3.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/silverback-website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"react": "^17.0.0",
"react-dom": "^17.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.0.2"
"typescript": "~4.2.0"
},
"devDependencies": {
"@amazeelabs/eslint-config": "^1.3.1",
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"packages/npm/*",
"packages/npm/*/*",
"apps/*",
"apps/silverback-drupal/web/modules/custom/gutenberg_custom_blocks",
"packages/composer/drupal/test_session/tests/Cypress"
],
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/composer/drupal/test_session/tests/Cypress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@amazeelabs/jest-preset": "^1.3.2",
"@types/node": "^14.14.31",
"cypress": "^6.5.0",
"typescript": "^4.2.2"
"typescript": "~4.2.0"
}
}
1 change: 0 additions & 1 deletion packages/npm/@amazeelabs/eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.js",
"author": "Philipp Melab",
"license": "MIT",
"private": false,
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.0.0",
"@typescript-eslint/parser": "^4.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/npm/@amazeelabs/gatsby-source-silverback/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.js",
"author": "Amazee Labs <[email protected]>",
"license": "MIT",
"private": false,
"dependencies": {
"@amazeelabs/eslint-config": "^1.3.0",
"@amazeelabs/jest-preset": "^1.3.1",
Expand All @@ -20,7 +19,7 @@
"eslint": "^7.25.0",
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"typescript": "^4.2.4"
"typescript": "~4.2.0"
},
"scripts": {
"prepare": "amazee-scaffold && tsc",
Expand Down
3 changes: 1 addition & 2 deletions packages/npm/@amazeelabs/gatsby-starter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "@amazeelabs/gatsby-starter",
"private": false,
"description": "Gatsby starter for Amazee Labs projects",
"version": "0.7.24",
"author": "Amazee Labs <[email protected]>",
Expand Down Expand Up @@ -30,7 +29,7 @@
"lint-staged": "^11.0.0",
"prettier": "^2.2.1",
"ts-node": "^10.0.0",
"typescript": "^4.0.2"
"typescript": "~4.2.0"
},
"keywords": [
"gatsby"
Expand Down
2 changes: 1 addition & 1 deletion packages/npm/@amazeelabs/gatsby-theme-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"react-dom": "^17.0.0",
"ts-node": "^10.0.0",
"tsconfigs": "^5.0.0",
"typescript": "^4.0.2"
"typescript": "~4.2.0"
},
"peerDependencies": {
"@storybook/addon-actions": "^6.0.21",
Expand Down
1 change: 0 additions & 1 deletion packages/npm/@amazeelabs/jest-preset/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "jest-preset.js",
"author": "Philipp Melab",
"license": "MIT",
"private": false,
"publishConfig": {
"access": "public"
},
Expand Down
1 change: 0 additions & 1 deletion packages/npm/@amazeelabs/prettier-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.js",
"author": "Philipp Melab",
"license": "MIT",
"private": false,
"peerDependencies": {
"prettier": ">= 2"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/npm/@amazeelabs/react-di/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"license": "MIT",
"private": false,
"publishConfig": {
"access": "public"
},
Expand All @@ -17,7 +16,7 @@
"eslint": "^7.25.0",
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"typescript": "^4.0.5"
"typescript": "~4.2.0"
},
"scripts": {
"prepare": "yarn amazee-scaffold && tsc",
Expand Down
3 changes: 1 addition & 2 deletions packages/npm/@amazeelabs/recipes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "Executable recipes to setup and extend Amazee Labs projects.",
"main": "dist/index.js",
"license": "MIT",
"private": false,
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -40,7 +39,7 @@
"eslint": "^7.25.0",
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"typescript": "^4.2.4"
"typescript": "~4.2.0"
},
"scripts": {
"prepare": "amazee-scaffold && ./prepare.sh",
Expand Down
2 changes: 1 addition & 1 deletion packages/npm/@amazeelabs/scaffold/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@types/jest": "^26.0.20",
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"typescript": "^4.1.3",
"typescript": "~4.2.0",
"eslint": "^7.25.0"
},
"scripts": {
Expand Down
3 changes: 1 addition & 2 deletions packages/npm/@amazeelabs/scaffold/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.js",
"author": "Philipp Melab",
"license": "MIT",
"private": false,
"bin": {
"amazee-scaffold": "./cli.js"
},
Expand Down Expand Up @@ -37,6 +36,6 @@
"jest": "^27.0.0",
"lint-staged": "^11.0.0",
"mock-fs": "^5.0.0",
"typescript": "^4.2.3"
"typescript": "~4.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/npm/@amazeelabs/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"prettier": "^2.2.1",
"react-is": "^17.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.0.2"
"typescript": "~4.2.0"
},
"peerDependencies": {
"react": "^17.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/npm/cypress-screenplay/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"sinon": "^11.0.0",
"ts-loader": "^9.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.0.5"
"typescript": "~4.2.0"
}
}
3 changes: 1 addition & 2 deletions packages/npm/drupal-test-session-cypress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
},
"author": "Amazee Labs",
"license": "MIT",
"private": false,
"scripts": {
"prepare": "tsc --outDir . --declaration",
"test": "jest",
Expand All @@ -21,6 +20,6 @@
"devDependencies": {
"@amazeelabs/jest-preset": "^1.3.2",
"cypress": "^7.0.0",
"typescript": "^4.2.2"
"typescript": "~4.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/npm/gatsby-plugin-build-monitor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@amazeelabs/jest-preset": "^1.3.2",
"axios": "^0.21.0",
"typescript": "^4.1.3"
"typescript": "~4.2.0"
},
"scripts": {
"prepare": "tsc"
Expand Down
1 change: 0 additions & 1 deletion packages/npm/gatsby-plugin-schema-export/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "dist/index.ts",
"author": "Philipp Melab",
"license": "MIT",
"private": false,
"peerDependencies": {
"gatsby": "^3.0.0"
},
Expand Down
Loading