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.

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

Use pnpm in build-tools instead of npm #12236

Merged
merged 79 commits into from
Nov 22, 2022
Merged
Changes from 60 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
626074f
Use pnpm in build-tools instead of npm
tylerbutler Oct 4, 2022
74a05fc
unneeded worksapces in package,json
tylerbutler Oct 4, 2022
4eb6a88
pipeline
tylerbutler Oct 4, 2022
f27ad0a
working dir
tylerbutler Oct 4, 2022
0219c1f
pipeline
tylerbutler Oct 4, 2022
c8ee535
missing deps
tylerbutler Oct 4, 2022
51393bf
build breaks
tylerbutler Oct 4, 2022
5d47b4b
explicitly include plugins as workaround in pnpm
tylerbutler Oct 4, 2022
1caffd9
policy
tylerbutler Oct 4, 2022
86c9fd8
unused script
tylerbutler Oct 4, 2022
d76feb5
fixes
tylerbutler Oct 4, 2022
587ed61
more fixes
tylerbutler Oct 4, 2022
05258e4
extraneous files
tylerbutler Oct 4, 2022
0926d8d
Merge branch 'main' into build-tools/pnpm
tylerbutler Oct 5, 2022
6938713
lockfile
tylerbutler Oct 5, 2022
9bdff74
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 8, 2022
7abc099
fixes
tylerbutler Nov 8, 2022
00c74e5
code change
tylerbutler Nov 8, 2022
12741ad
updates
tylerbutler Nov 8, 2022
8dc972c
add build-tools flag
tylerbutler Nov 8, 2022
64c4e1b
updates
tylerbutler Nov 8, 2022
1e2534f
azure
tylerbutler Nov 8, 2022
7426926
bump to prerelease client
tylerbutler Nov 8, 2022
ec7820b
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 8, 2022
cd6042b
policy
tylerbutler Nov 8, 2022
a55b334
build failure
tylerbutler Nov 8, 2022
d36a1b7
build failure
tylerbutler Nov 8, 2022
13f043c
rm --color
tylerbutler Nov 8, 2022
2469aff
rm node types
tylerbutler Nov 8, 2022
17c8599
cleanup
tylerbutler Nov 8, 2022
9c70225
missing deps
tylerbutler Nov 8, 2022
de13c3a
policy
tylerbutler Nov 8, 2022
99d17d7
formatting
tylerbutler Nov 8, 2022
caae76c
jest
tylerbutler Nov 8, 2022
ae1d9d3
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 9, 2022
cef068a
deps
tylerbutler Nov 9, 2022
821edeb
fluid-build client type
tylerbutler Nov 9, 2022
63ae054
init client workspace
tylerbutler Nov 9, 2022
4e1f717
init client workspace
tylerbutler Nov 9, 2022
144632d
cp package.json
tylerbutler Nov 9, 2022
0d21a2d
revert azure changes
tylerbutler Nov 9, 2022
17331da
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 9, 2022
091f3d8
rm staged client files
tylerbutler Nov 9, 2022
5eec8b1
Update tools/pipelines/build-azure.yml
tylerbutler Nov 9, 2022
0547955
code fixes
tylerbutler Nov 9, 2022
cc9bb1a
feat(build-tools): Enable fluid-build to use pnpm
tylerbutler Nov 10, 2022
a10a2f9
lockfile
tylerbutler Nov 10, 2022
98759b0
full build
tylerbutler Nov 10, 2022
94ccc3a
revert
tylerbutler Nov 10, 2022
fd10bba
updates
tylerbutler Nov 10, 2022
9fba76d
use yarn in independent packages
tylerbutler Nov 10, 2022
4d603f5
fixes
tylerbutler Nov 10, 2022
77ed289
updates
tylerbutler Nov 10, 2022
546f656
Apply suggestions from code review
tylerbutler Nov 10, 2022
a59820d
updates
tylerbutler Nov 10, 2022
4835ece
cleanup
tylerbutler Nov 10, 2022
767bcc1
Merge remote-tracking branch 'origin/fluid-build/pnpm' into build-too…
tylerbutler Nov 10, 2022
cfe78a2
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 11, 2022
6665f79
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 11, 2022
ad344cd
revert
tylerbutler Nov 11, 2022
8976adb
Apply suggestions from code review
tylerbutler Nov 12, 2022
6b793d8
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 16, 2022
14b03d5
lockfile
tylerbutler Nov 16, 2022
50dbfa2
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 16, 2022
959e219
fix(build-tools): Add missing dependency
tylerbutler Nov 16, 2022
9dddec8
Merge branch 'cli/missing-dep' into build-tools/pnpm
tylerbutler Nov 16, 2022
1d96944
lockfile
tylerbutler Nov 16, 2022
e30d357
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 16, 2022
3b7ce09
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 17, 2022
1b5c16c
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 18, 2022
791220a
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 21, 2022
4f9bbc5
rm monorepo json step because pnpm
tylerbutler Nov 22, 2022
edc3bd2
build step
tylerbutler Nov 22, 2022
76aa249
fix
tylerbutler Nov 22, 2022
52c512a
cg
tylerbutler Nov 22, 2022
546f39e
cleanup
tylerbutler Nov 22, 2022
aa4d59b
full build
tylerbutler Nov 22, 2022
aa5b00d
ignore version-tools readme
tylerbutler Nov 22, 2022
1efb64b
Merge branch 'main' into build-tools/pnpm
tylerbutler Nov 22, 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
3 changes: 3 additions & 0 deletions build-tools/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Temporary, because otherwise pnpm fails due to peer dependencies not being satisfied
# with our current dependency graph.
strict-peer-dependencies=false
20,031 changes: 0 additions & 20,031 deletions build-tools/lerna-package-lock.json

This file was deleted.

7 changes: 3 additions & 4 deletions build-tools/lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"packages": [
"packages/**"
],
"version": "0.6.0"
"version": "0.6.0",
"npmClient": "pnpm",
"useWorkspaces": true
}
9,509 changes: 0 additions & 9,509 deletions build-tools/package-lock.json

This file was deleted.

24 changes: 9 additions & 15 deletions build-tools/package.json
Original file line number Diff line number Diff line change
@@ -31,31 +31,24 @@
"clean:docs": "rimraf **/_api-extractor-temp docs/api/*/**",
"clean:nyc": "rimraf nyc/**",
"commit": "git-cz",
"format": "lerna run format --no-sort --stream -- -- -- --color",
"postinstall": "npm run postinstall:lerna && npm run build:compile",
"install:root": "npm install --ignore-scripts",
"format": "lerna run format --no-sort --stream",
"preinstall": "npx only-allow pnpm",
"install:root": "pnpm install --ignore-scripts",
"layer-check": "node packages/build-tools/dist/layerCheck/layerCheck.js --root ..",
"layer-check:doc": "node packages/build-tools/dist/layerCheck/layerCheck.js --root .. --md",
"lerna": "lerna",
"lint": "lerna run lint --no-sort --stream -- -- -- --color",
"lint:fix": "lerna run lint:fix --no-sort --stream -- -- -- --color",
"lint": "lerna run lint --no-sort --stream",
"lint:fix": "lerna run lint:fix --no-sort --stream",
"policy-check": "cd .. && node build-tools/packages/build-tools/dist/repoPolicyCheck/repoPolicyCheck.js",
"policy-check:fix": "npm run policy-check -- -r",
"post-lerna-install:default": "[ -f package-lock.json ] && mv package-lock.json lerna-package-lock.json; [ -f package-lock.json.bak ] && mv package-lock.json.bak package-lock.json; exit 0",
"post-lerna-install:win32": "if exist package-lock.json move package-lock.json lerna-package-lock.json && if exist package-lock.json.bak move package-lock.json.bak package-lock.json",
"postinstall:lerna": "run-script-os",
"postinstall:lerna:default": "npm run pre-lerna-install:default && { lerna bootstrap --strict --hoist;t1=$?;npm run post-lerna-install:default;exit $t1;}",
"postinstall:lerna:win32": "npm run pre-lerna-install:win32 && (lerna bootstrap --strict --hoist & npm run post-lerna-install:win32)",
"pre-lerna-install:default": "[ -f package-lock.json ] && mv package-lock.json package-lock.json.bak; [ -f lerna-package-lock.json ] && mv lerna-package-lock.json package-lock.json; exit 0",
"pre-lerna-install:win32": "if exist package-lock.json move package-lock.json package-lock.json.bak && if exist lerna-package-lock.json move lerna-package-lock.json package-lock.json",
"test": "npm run test:mocha && npm run test:jest && npm run test:realsvc",
"test:bail": "npm run test:mocha:bail && npm run test:jest:bail",
"test:copyresults": "copyfiles --exclude \"**/node_modules/**\" \"**/nyc/**\" nyc",
"test:coverage": "c8 npm run test:report",
"test:jest": "assign-test-ports && lerna run test:jest --concurrency 4 --stream --no-bail --no-sort -- -- --color",
"test:jest": "assign-test-ports && lerna run test:jest --concurrency 4 --stream --no-bail --no-sort",
"test:jest:bail": "assign-test-ports && lerna run test:jest --concurrency 4 --stream",
"test:jest:report": "assign-test-ports && lerna run test:jest --concurrency 4 --stream --no-bail --no-sort -- -- --ci --reporters=default --reporters=jest-junit",
"test:mocha": "lerna run test:mocha --stream --no-bail --no-sort -- -- --color",
"test:mocha": "lerna run test:mocha --stream --no-bail --no-sort",
"test:mocha:bail": "lerna run test:mocha --stream",
"test:mocha:report": "lerna run test:mocha --stream --no-bail --no-sort -- -- --reporter xunit --reporter-option output=nyc/mocha-junit-report.xml",
"test:realsvc": "lerna run test:realsvc --stream --no-bail --no-sort",
@@ -107,5 +100,6 @@
"rimraf": "^2.6.2",
"run-script-os": "^1.1.6",
"typescript": "~4.5.5"
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion build-tools/packages/build-cli/README.md
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ $ npm install -g @fluid-tools/build-cli
$ flub COMMAND
running command...
$ flub (--version|-V)
@fluid-tools/build-cli/0.5.0
@fluid-tools/build-cli/0.6.0
$ flub --help [COMMAND]
USAGE
$ flub COMMAND
4 changes: 2 additions & 2 deletions build-tools/packages/build-cli/package.json
Original file line number Diff line number Diff line change
@@ -77,8 +77,8 @@
"@oclif/plugin-autocomplete": "^1.3.5",
"@oclif/plugin-commands": "^2.2.0",
"@oclif/plugin-help": "^5",
"@oclif/plugin-not-found": "^2.3.1",
"@oclif/plugin-plugins": "^2.0.1",
"@oclif/plugin-not-found": "^2.3.3",
"@oclif/plugin-plugins": "^2.1.1",
tylerbutler marked this conversation as resolved.
Show resolved Hide resolved
"@oclif/test": "^2",
"@octokit/core": "4.0.5",
"@rushstack/node-core-library": "^3.51.1",
2 changes: 1 addition & 1 deletion build-tools/packages/build-cli/src/base.ts
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ export abstract class BaseCommand<T extends typeof BaseCommand.flags>
}),
};

protected parsedOutput?: ParserOutput<any, any>;
protected parsedOutput?: ParserOutput;

/**
* The processed arguments that were passed to the CLI.
52 changes: 26 additions & 26 deletions build-tools/packages/build-cli/src/machines/FluidRelease.fsl.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions build-tools/packages/version-tools/package.json
Original file line number Diff line number Diff line change
@@ -73,8 +73,8 @@
"@oclif/plugin-autocomplete": "^1.3.5",
"@oclif/plugin-commands": "^2.2.0",
"@oclif/plugin-help": "^5",
"@oclif/plugin-not-found": "^2.3.1",
"@oclif/plugin-plugins": "^2.0.1",
"@oclif/plugin-not-found": "^2.3.3",
"@oclif/plugin-plugins": "^2.1.1",
tylerbutler marked this conversation as resolved.
Show resolved Hide resolved
"@oclif/test": "^2",
"chalk": "^2.4.2",
"semver": "^7.3.7",
Loading