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

RN-569 Upgrade yarn to v3 #3994

Merged
merged 39 commits into from
Jul 6, 2022
Merged

RN-569 Upgrade yarn to v3 #3994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ade8f42
Update .gitignore
IgorNadj Jun 20, 2022
89b1dda
Upgrade to Yarn v3
IgorNadj Jun 20, 2022
c6d3843
Bump local version of node to v14 to match prod
IgorNadj Jun 20, 2022
5200baa
Initial yarn install after upgrade to yarn v3
IgorNadj Jun 20, 2022
5ebf29a
Add yarn workspaces plugin
IgorNadj Jun 20, 2022
17d7ea6
Lock node version, update CI to use yarn3
IgorNadj Jun 20, 2022
16d57bc
Fix import
IgorNadj Jun 23, 2022
32546d3
Add missing dependency
IgorNadj Jun 21, 2022
f3b3f90
Refactor: move __tests__ to src for consistency
IgorNadj Jun 22, 2022
ad02a67
Refactor: uniquely name different table components
IgorNadj Jun 22, 2022
0842be7
Refactor: uniquely name Tooltip components
IgorNadj Jun 23, 2022
2bd2025
Localise dependencies to each workspace.
IgorNadj Jun 23, 2022
c4d1560
Reuse common scripts
IgorNadj Jun 24, 2022
cb9a4ba
Use babel instead of rollup for admin panel lib
IgorNadj Jun 24, 2022
44568b3
Bump gold master to node v14
IgorNadj Jun 24, 2022
8797869
Admin panel simpler lib build
IgorNadj Jun 24, 2022
b636f00
Bump e2e Dockerfile to node 14
IgorNadj Jun 24, 2022
47c3e03
Add missing dep
IgorNadj Jun 24, 2022
d41a136
Minor: Remove comment
IgorNadj Jun 24, 2022
04b768d
Add missing @types dependency
IgorNadj Jun 24, 2022
9b3d326
Merge branch 'dev' into upgrade-yarn-v3
IgorNadj Jun 27, 2022
cf912d5
Add missing dep for e2e testing
IgorNadj Jun 27, 2022
4c3c228
Refactor: extract e2e into own package
IgorNadj Jun 27, 2022
c1ec241
Simplify e2e Dockerfile
IgorNadj Jun 27, 2022
2d46548
Add missing package
IgorNadj Jun 27, 2022
bf3ac9d
Less verbose yarn output
IgorNadj Jun 27, 2022
36be67e
Add build-dev script to packages
IgorNadj Jun 27, 2022
9f55ad1
Remove dependency on curl in e2e
IgorNadj Jun 27, 2022
edb3360
Add .npmrc files
IgorNadj Jun 28, 2022
c8c1e8e
Use npm run instead of yarn for performance
IgorNadj Jun 28, 2022
e2c8047
Fix e2e test run
IgorNadj Jun 28, 2022
eecbfc5
Fix broken build script
IgorNadj Jun 28, 2022
f3c2c02
Fix test e2e
IgorNadj Jun 28, 2022
becc972
Fix test scripts
IgorNadj Jun 28, 2022
bed436c
Fix test run scripts
IgorNadj Jun 28, 2022
f422847
Update CI e2e env vars
IgorNadj Jun 28, 2022
292cef5
Use yarn x for non-build scripts
IgorNadj Jun 28, 2022
667cda8
PR fixups add missing env var
IgorNadj Jul 4, 2022
949a884
Merge branch 'dev' into upgrade-yarn-v3
IgorNadj Jul 4, 2022
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
1 change: 1 addition & 0 deletions packages/access-policy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/admin-panel-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"private": true,
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build-dev",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be:
"build-dev": "yarn build"
Or we want to skip this package during internal build?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an old version of this PR, this is fixed in latest version.

"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/admin-panel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"build": "run-p -c \"build:* {@}\" --",
"build:src": "yarn package:build:react-scripts",
"build:library": "yarn package:build:js",
"build-dev": "yarn build:library",
"cypress:open": "cross-env NODE_ENV=test yarn cypress open",
"cypress:run": "cross-env NODE_ENV=test yarn cypress run",
"eject": "yarn package:eject",
Expand Down
1 change: 1 addition & 0 deletions packages/aggregator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p -c \"build:* {@}\" --",
"build:src": "yarn package:build:js --ignore \"src/__tests__/**\"",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"license": "SEE LICENSE IN LICENSE",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test --runInBand",
Expand Down
1 change: 1 addition & 0 deletions packages/auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js --ignore \"src/__tests__/**\"",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test:withdb --runInBand",
Expand Down
1 change: 1 addition & 0 deletions packages/central-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p -c \"build:* {@}\" --",
"build:src": "yarn package:build:js --ignore \"**src/database/migrations\",\"src/tests/**\" --copy-files --no-copy-ignored",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/data-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test:withdb --runInBand",
Expand Down
1 change: 1 addition & 0 deletions packages/data-broker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/data-lake-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"main": "dist/index.js",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn workspace @tupaia/data-lake-api check-test-data-lake-exists && DATA_LAKE_DB_NAME=data_lake_test jest --runInBand",
Expand Down
1 change: 1 addition & 0 deletions packages/database/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js --copy-files --no-copy-ignored",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"dump-database": "./scripts/dumpDatabase.sh",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
Expand Down
2 changes: 2 additions & 0 deletions packages/devops/ci/e2e.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM cypress/base:14.19.0

RUN apk-add curl

WORKDIR /tupaia

# copy everything
Expand Down
1 change: 1 addition & 0 deletions packages/dhis-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/entity-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/expression-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/indicators/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test:withdb --runInBand",
Expand Down
1 change: 1 addition & 0 deletions packages/kobo-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js --ignore \"src/tests/**\"",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"test": "nyc --reporter=lcov mocha",
"test-coverage": "cross-env NODE_ENV=test nyc mocha"
},
Expand Down
1 change: 1 addition & 0 deletions packages/lesmis-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/meditrak-app-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/psss-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/report-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"prestart": "yarn build",
Expand Down
1 change: 1 addition & 0 deletions packages/server-boilerplate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "yarn package:build:ts",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/tsutils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "rm -rf dist && tsc",
"build-dev": "yarn build",
"lint": "yarn package:lint:ts",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test --passWithNoTests",
Expand Down
1 change: 1 addition & 0 deletions packages/ui-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"main": "dist/index.js",
"scripts": {
"build": "yarn package:build:js",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"storybook": "start-storybook -s public -p 6006",
Expand Down
1 change: 1 addition & 0 deletions packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"lint": "yarn package:lint:js",
"lint:fix": "yarn lint --fix",
"test": "yarn package:test",
Expand Down
1 change: 1 addition & 0 deletions packages/weather-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build": "rm -rf dist && run-p \"build:* {@}\" --",
"build:src": "yarn package:build:js --ignore \"src/tests/**\"",
"build:types": "yarn package:build:types",
"build-dev": "yarn build",
"test": "nyc --reporter=lcov mocha",
"test-coverage": "cross-env NODE_ENV=test nyc mocha"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/bash/buildInternalDependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build_prefixes=()

# Build dependencies
for PACKAGE in $(${DIR}/getInternalDependencies.sh ${package_path}); do
build_commands+=("\"NODE_ENV=production yarn workspace @tupaia/${PACKAGE} build $build_args\"")
build_commands+=("\"NODE_ENV=production yarn workspace @tupaia/${PACKAGE} build-dev $build_args\"")
build_prefixes+=("${PACKAGE},")
done

Expand Down