Skip to content

Commit 076f8a5

Browse files
larixerarcanis
larixer
authored and
arcanis
committed
Add monorepo build:compile script (#450)
* Add monorepo build:tsc script * Run yarn version check * Update all packages to use build:compile script * Merge with master * Run yarn version check * Remove berry-cli binary, superseded by yarnpkg-cli * Add back pnpify and typescript to vscode-zipfs * Update packages/yarnpkg-fslib/package.json Co-Authored-By: Maël Nison <[email protected]> * Add back berry-cli * Remove plugin-github build script
1 parent f3937a9 commit 076f8a5

File tree

15 files changed

+62
-185
lines changed

15 files changed

+62
-185
lines changed

‎.pnp.js

Lines changed: 14 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
}
8080
},
8181
"scripts": {
82+
"build:compile": "pnpify tsc -p",
8283
"gen-tssdk": "pnpify --sdk scripts",
8384
"release:all": "./scripts/release.sh",
8485
"test:lint": "eslint packages/*/sources/**/*.ts",

‎packages/plugin-github/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
"@yarnpkg/core": "workspace:2.0.0-rc.5",
77
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
88
},
9-
"devDependencies": {
10-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
11-
"typescript": "^3.5.3"
12-
},
139
"scripts": {
14-
"build": "pnpify tsc",
1510
"test": "run test:unit packages/plugin-github"
1611
},
1712
"files": [
1813
"/lib"
1914
],
2015
"version": "2.0.0-rc.1",
16+
"nextVersion": {
17+
"nonce": "3459548056382557"
18+
},
2119
"repository": {
2220
"type": "git",
2321
"url": "ssh://[email protected]/yarnpkg/berry.git"

‎packages/vscode-zipfs/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"displayName": "ZipFS - a zip file system",
66
"description": "Allows to easily inspect and modify files stored within zip archives.",
77
"version": "0.1.1-1",
8+
"nextVersion": {
9+
"nonce": "2942063452620931"
10+
},
811
"engines": {
912
"vscode": "^1.23.0"
1013
},

‎packages/vscode-zipfs/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = {
2121
test: /\.ts$/,
2222
loader: 'ts-loader',
2323
options: PnpWebpackPlugin.tsLoaderOptions(),
24-
}],
24+
}],
2525
},
2626

2727
externals: {

‎packages/yarnpkg-builder/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "@yarnpkg/builder",
33
"version": "2.0.0-rc.5",
4+
"nextVersion": {
5+
"nonce": "4691680159291785"
6+
},
47
"bin": "./sources/boot-dev.js",
58
"dependencies": {
69
"@babel/core": "^7.5.5",
@@ -23,15 +26,14 @@
2326
"webpack-sources": "^1.3.0"
2427
},
2528
"devDependencies": {
26-
"@yarnpkg/monorepo": "workspace:0.0.0",
27-
"typescript": "^3.5.3"
29+
"@yarnpkg/monorepo": "workspace:0.0.0"
2830
},
2931
"peerDependencies": {
3032
"typescript": "*"
3133
},
3234
"scripts": {
3335
"postpack": "rm -rf lib",
34-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
36+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-builder",
3537
"release": "yarn npm publish"
3638
},
3739
"publishConfig": {

‎packages/yarnpkg-core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "@yarnpkg/core",
33
"version": "2.0.0-rc.5",
4+
"nextVersion": {
5+
"nonce": "7589284121938487"
6+
},
47
"main": "./sources/index.ts",
58
"sideEffects": false,
69
"dependencies": {
710
"@yarnpkg/fslib": "workspace:2.0.0-rc.3",
811
"@yarnpkg/json-proxy": "workspace:2.0.0-rc.2",
912
"@yarnpkg/parsers": "workspace:2.0.0-rc.3",
1013
"@yarnpkg/pnp": "workspace:2.0.0-rc.3",
11-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
1214
"@yarnpkg/shell": "workspace:2.0.0-rc.2",
1315
"agentkeepalive": "^4.0.2",
1416
"camelcase": "^5.3.1",
@@ -33,13 +35,11 @@
3335
},
3436
"devDependencies": {
3537
"@yarnpkg/plugin-link": "workspace:2.0.0-rc.1",
36-
"@yarnpkg/plugin-pnp": "workspace:2.0.0-rc.1",
37-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
38-
"typescript": "^3.5.3"
38+
"@yarnpkg/plugin-pnp": "workspace:2.0.0-rc.1"
3939
},
4040
"scripts": {
4141
"postpack": "rm -rf lib",
42-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc"
42+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-core"
4343
},
4444
"publishConfig": {
4545
"main": "./lib/index.js",

‎packages/yarnpkg-fslib/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
{
22
"name": "@yarnpkg/fslib",
33
"version": "2.0.0-rc.3",
4+
"nextVersion": {
5+
"nonce": "7060976144934501"
6+
},
47
"main": "./sources/index.ts",
58
"sideEffects": false,
69
"dependencies": {
710
"@yarnpkg/libzip": "workspace:2.0.0-rc.3",
811
"tmp": "^0.0.33"
912
},
10-
"devDependencies": {
11-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
12-
"typescript": "^3.5.3"
13-
},
1413
"scripts": {
1514
"postpack": "rm -rf lib",
16-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
15+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-fslib",
1716
"release": "yarn npm publish",
1817
"test:fslib": "run test:unit packages/yarnpkg-fslib",
1918
"test:watch:fslib": "run test:unit --watch packages/yarnpkg-fslib"

‎packages/yarnpkg-json-proxy/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
{
22
"name": "@yarnpkg/json-proxy",
33
"version": "2.0.0-rc.2",
4+
"nextVersion": {
5+
"nonce": "1769303232969387"
6+
},
47
"main": "./sources/index.ts",
58
"dependencies": {
69
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
710
},
8-
"devDependencies": {
9-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
10-
"typescript": "^3.5.3"
11-
},
1211
"scripts": {
1312
"postpack": "rm -rf lib",
14-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
13+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-json-proxy",
1514
"release": "yarn npm publish"
1615
},
1716
"publishConfig": {

‎packages/yarnpkg-libzip/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"name": "@yarnpkg/libzip",
33
"version": "2.0.0-rc.3",
4-
"main": "./sources/index.ts",
5-
"devDependencies": {
6-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
7-
"typescript": "^3.5.3"
4+
"nextVersion": {
5+
"nonce": "6800962703661165"
86
},
7+
"main": "./sources/index.ts",
98
"scripts": {
109
"build:libzip:wasm": "cd ./artifacts && ./build.sh",
1110
"postpack": "rm -rf lib",
12-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
11+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-libzip",
1312
"release": "yarn npm publish"
1413
},
1514
"publishConfig": {

‎packages/yarnpkg-parsers/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
"name": "@yarnpkg/parsers",
33
"version": "2.0.0-rc.3",
4+
"nextVersion": {
5+
"nonce": "1329262964018395"
6+
},
47
"main": "./sources/index.ts",
58
"dependencies": {
69
"js-yaml": "^3.10.0"
710
},
811
"devDependencies": {
9-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
10-
"pegjs": "^0.10.0",
11-
"typescript": "^3.5.3"
12+
"pegjs": "^0.10.0"
1213
},
1314
"scripts": {
1415
"grammar:shell": "run pegjs -o sources/grammars/shell.js sources/grammars/shell.pegjs",
1516
"grammar:resolution": "run pegjs -o sources/grammars/resolution.js sources/grammars/resolution.pegjs",
1617
"grammar:syml": "run pegjs -o sources/grammars/syml.js sources/grammars/syml.pegjs",
1718
"postpack": "rm -rf lib",
18-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
19+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-parsers",
1920
"release": "yarn npm publish",
2021
"test:parsers": "run test:unit packages/yarnpkg-parsers"
2122
},

‎packages/yarnpkg-pnp/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"name": "@yarnpkg/pnp",
33
"version": "2.0.0-rc.3",
4+
"nextVersion": {
5+
"nonce": "460148469419547"
6+
},
47
"main": "./sources/index.ts",
58
"dependencies": {
69
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
710
},
811
"devDependencies": {
912
"@yarnpkg/builder": "workspace:2.0.0-rc.5",
10-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
11-
"typescript": "^3.5.3",
1213
"webpack": "^4.39.3",
1314
"webpack-cli": "^3.2.1",
1415
"webpack-sources": "^1.3.0"
@@ -17,7 +18,7 @@
1718
"build:pnp:hook": "run pnpify webpack-cli --config webpack.config.hook.js",
1819
"build:pnp": "run pnpify webpack-cli --config webpack.config.pkg.js",
1920
"postpack": "find lib -mindepth 1 ! -path 'lib/hook.js' -exec rm -rf '{}' +",
20-
"prepack": "run build:pnp:hook && run build:pnp && pnpify tsc --emitDeclarationOnly --declaration",
21+
"prepack": "run build:pnp:hook && run build:pnp && run build:compile packages/yarnpkg-pnp --emitDeclarationOnly --declaration",
2122
"release": "yarn npm publish"
2223
},
2324
"publishConfig": {

‎packages/yarnpkg-pnpify/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "@yarnpkg/pnpify",
33
"version": "2.0.0-rc.3",
4+
"nextVersion": {
5+
"nonce": "817844653480653"
6+
},
47
"main": "./sources/boot-dev.js",
58
"bin": "./sources/boot-cli-dev.js",
69
"sideEffects": false,
@@ -28,7 +31,7 @@
2831
},
2932
"scripts": {
3033
"postpack": "rm -rf lib",
31-
"prepack": "pnpify tsc",
34+
"prepack": "run build:compile packages/yarnpkg-pnpify",
3235
"release": "yarn npm publish"
3336
},
3437
"publishConfig": {

‎packages/yarnpkg-shell/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "@yarnpkg/shell",
33
"version": "2.0.0-rc.2",
4+
"nextVersion": {
5+
"nonce": "8687279553403317"
6+
},
47
"main": "./sources/index.ts",
58
"dependencies": {
69
"@yarnpkg/fslib": "workspace:2.0.0-rc.3",
@@ -9,13 +12,11 @@
912
"stream-buffers": "^3.0.2"
1013
},
1114
"devDependencies": {
12-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3",
13-
"tmp": "^0.0.33",
14-
"typescript": "^3.5.3"
15+
"tmp": "^0.0.33"
1516
},
1617
"scripts": {
1718
"postpack": "rm -rf lib",
18-
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && pnpify tsc",
19+
"prepack": "mkdir -p lib && rsync -a --exclude '*.ts' sources/ lib/ && run build:compile packages/yarnpkg-shell",
1920
"release": "yarn npm publish",
2021
"test:shell": "run test:unit packages/yarnpkg-shell"
2122
},

‎yarn.lock

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4514,7 +4514,6 @@ __metadata:
45144514
pnp-webpack-plugin: "npm:^1.4.3"
45154515
semver: "npm:^5.6.0"
45164516
ts-loader: "npm:^5.3.3"
4517-
typescript: "npm:^3.5.3"
45184517
val-loader: "npm:^1.1.1"
45194518
webpack: "npm:^4.39.3"
45204519
webpack-merge: "npm:^4.2.1"
@@ -4574,7 +4573,6 @@ __metadata:
45744573
"@yarnpkg/plugin-link": "workspace:2.0.0-rc.1"
45754574
"@yarnpkg/plugin-pnp": "workspace:2.0.0-rc.1"
45764575
"@yarnpkg/pnp": "workspace:2.0.0-rc.3"
4577-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
45784576
"@yarnpkg/shell": "workspace:2.0.0-rc.2"
45794577
agentkeepalive: "npm:^4.0.2"
45804578
camelcase: "npm:^5.3.1"
@@ -4596,7 +4594,6 @@ __metadata:
45964594
tar: "npm:^4.4.6"
45974595
tmp: "npm:^0.0.33"
45984596
tunnel: "npm:^0.0.6"
4599-
typescript: "npm:^3.5.3"
46004597
languageName: unknown
46014598
linkType: soft
46024599

@@ -4605,9 +4602,7 @@ __metadata:
46054602
resolution: "@yarnpkg/fslib@workspace:packages/yarnpkg-fslib"
46064603
dependencies:
46074604
"@yarnpkg/libzip": "workspace:2.0.0-rc.3"
4608-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
46094605
tmp: "npm:^0.0.33"
4610-
typescript: "npm:^3.5.3"
46114606
languageName: unknown
46124607
linkType: soft
46134608

@@ -4669,17 +4664,12 @@ __metadata:
46694664
resolution: "@yarnpkg/json-proxy@workspace:packages/yarnpkg-json-proxy"
46704665
dependencies:
46714666
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
4672-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
4673-
typescript: "npm:^3.5.3"
46744667
languageName: unknown
46754668
linkType: soft
46764669

46774670
"@yarnpkg/libzip@workspace:2.0.0-rc.3, @yarnpkg/libzip@workspace:packages/yarnpkg-libzip":
46784671
version: 0.0.0-use.local
46794672
resolution: "@yarnpkg/libzip@workspace:packages/yarnpkg-libzip"
4680-
dependencies:
4681-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
4682-
typescript: "npm:^3.5.3"
46834673
languageName: unknown
46844674
linkType: soft
46854675

@@ -4762,10 +4752,8 @@ __metadata:
47624752
version: 0.0.0-use.local
47634753
resolution: "@yarnpkg/parsers@workspace:packages/yarnpkg-parsers"
47644754
dependencies:
4765-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
47664755
js-yaml: "npm:^3.10.0"
47674756
pegjs: "npm:^0.10.0"
4768-
typescript: "npm:^3.5.3"
47694757
languageName: unknown
47704758
linkType: soft
47714759

@@ -4855,8 +4843,6 @@ __metadata:
48554843
dependencies:
48564844
"@yarnpkg/core": "workspace:2.0.0-rc.5"
48574845
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
4858-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
4859-
typescript: "npm:^3.5.3"
48604846
languageName: unknown
48614847
linkType: soft
48624848

@@ -5009,8 +4995,6 @@ __metadata:
50094995
dependencies:
50104996
"@yarnpkg/builder": "workspace:2.0.0-rc.5"
50114997
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
5012-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
5013-
typescript: "npm:^3.5.3"
50144998
webpack: "npm:^4.39.3"
50154999
webpack-cli: "npm:^3.2.1"
50165000
webpack-sources: "npm:^1.3.0"
@@ -5046,11 +5030,9 @@ __metadata:
50465030
dependencies:
50475031
"@yarnpkg/fslib": "workspace:2.0.0-rc.3"
50485032
"@yarnpkg/parsers": "workspace:2.0.0-rc.3"
5049-
"@yarnpkg/pnpify": "workspace:2.0.0-rc.3"
50505033
cross-spawn: "npm:^6.0.5"
50515034
stream-buffers: "npm:^3.0.2"
50525035
tmp: "npm:^0.0.33"
5053-
typescript: "npm:^3.5.3"
50545036
languageName: unknown
50555037
linkType: soft
50565038

0 commit comments

Comments
 (0)