Skip to content

Commit d07b0e8

Browse files
committed
build: workaround yarn tgz bug
1 parent 07e8b65 commit d07b0e8

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- attach_workspace: *attach_options
103103
- restore_cache: *benchmark_aio_package_lock_key
104104
- run: yarn admin -- build --local
105-
- run: npm install --global ./dist/@angular-devkit_benchmark.tgz
105+
- run: npm install --global ./dist/_angular-devkit_benchmark.tgz
106106
- run: cd benchmark/aio && yarn initialize
107107
- run: cd benchmark/aio && yarn benchmark
108108
- save_cache:

benchmark/aio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"clone": "(git clone https://github.com/angular/angular || true) && cd angular && git fetch origin && git reset --hard dd2a650c3455f3bc0a88f8181758a84aacb25fea",
99
"setup": "cd angular && yarn && cd aio && yarn && yarn setup",
1010
"//": "Shouldn't need to install the package twice, but the first install seems to leave two @ngtools/webpack installs around.",
11-
"update": "cd angular/aio && yarn add ../../../../dist/@angular-devkit_build-angular.tgz --dev && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
11+
"update": "cd angular/aio && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
1212
"benchmark": "cd angular/aio && benchmark --verbose -- yarn ~~build --configuration=stable"
1313
},
1414
"keywords": [],

lib/packages.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ export const packages: PackageMap =
212212
relative: path.relative(path.dirname(__dirname), pkgRoot),
213213
main: path.resolve(pkgRoot, 'src/index.ts'),
214214
private: packageJson.private,
215-
tar: path.join(distRoot, name.replace('/', '_') + '.tgz'),
215+
// yarn doesn't take kindly to @ in tgz filenames
216+
// https://github.com/yarnpkg/yarn/issues/6339
217+
tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
216218
bin,
217219
name,
218220
packageJson,

0 commit comments

Comments
 (0)