Skip to content

Commit

Permalink
CI: fix auto shipit
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmod committed Sep 18, 2023
1 parent 7468dd7 commit 74cc309
Show file tree
Hide file tree
Showing 3 changed files with 136 additions and 7 deletions.
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "adblocker",
"author": {
"name": "Cliqz"
"name": "Ghostery"
},
"description": "Cliqz adblocker",
"contributors": [
Expand Down Expand Up @@ -43,19 +43,20 @@
}
],
"license": "MPL-2.0",
"homepage": "https://github.com/cliqz-oss/adblocker#readme",
"homepage": "https://github.com/ghostery/adblocker#readme",
"bugs": {
"url": "https://github.com/cliqz-oss/adblocker/issues"
"url": "https://github.com/ghostery/adblocker/issues"
},
"private": true,
"repository": {
"type": "git",
"url": "git+ssh://[email protected]/cliqz-oss/adblocker.git"
"url": "git+ssh://[email protected]/ghostery/adblocker.git"
},
"workspaces": [
"packages/*"
],
"scripts": {
"postinstall": "patch-package",
"bootstrap": "yarn install --immutable",
"lint": "lerna run --parallel lint",
"watch": "tsc --build ./tsconfig.project.json --watch",
Expand All @@ -75,6 +76,7 @@
"benchmark": "^2.1.4",
"chalk": "^5.3.0",
"lerna": "^7.3.0",
"patch-package": "^8.0.0",
"prettier": "^3.0.3",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.2.2"
Expand Down
13 changes: 13 additions & 0 deletions patches/get-monorepo-packages+1.2.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/get-monorepo-packages/index.js b/node_modules/get-monorepo-packages/index.js
index aacacb1..fea1161 100644
--- a/node_modules/get-monorepo-packages/index.js
+++ b/node_modules/get-monorepo-packages/index.js
@@ -33,7 +33,7 @@ const getPackages = directory => {
const lernaJsonPath = path.join(directory, 'lerna.json');
if (fs.existsSync(lernaJsonPath)) {
const lernaJson = loadJsonFile.sync(lernaJsonPath);
- if (!lernaJson.useWorkspaces) {
+ if (false) {
return findPackages(lernaJson.packages, directory);
}
}
120 changes: 117 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2119,6 +2119,7 @@ __metadata:
benchmark: ^2.1.4
chalk: ^5.3.0
lerna: ^7.3.0
patch-package: ^8.0.0
prettier: ^3.0.3
tslint-no-unused-expression-chai: ^0.1.4
typescript: ^5.2.2
Expand Down Expand Up @@ -2399,6 +2400,13 @@ __metadata:
languageName: node
linkType: hard

"at-least-node@npm:^1.0.0":
version: 1.0.0
resolution: "at-least-node@npm:1.0.0"
checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
languageName: node
linkType: hard

"atob@npm:^2.1.2":
version: 2.1.2
resolution: "atob@npm:2.1.2"
Expand Down Expand Up @@ -2850,7 +2858,7 @@ __metadata:
languageName: node
linkType: hard

"ci-info@npm:^3.2.0, ci-info@npm:^3.6.1":
"ci-info@npm:^3.2.0, ci-info@npm:^3.6.1, ci-info@npm:^3.7.0":
version: 3.8.0
resolution: "ci-info@npm:3.8.0"
checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098
Expand Down Expand Up @@ -4120,6 +4128,15 @@ __metadata:
languageName: node
linkType: hard

"find-yarn-workspace-root@npm:^2.0.0":
version: 2.0.0
resolution: "find-yarn-workspace-root@npm:2.0.0"
dependencies:
micromatch: ^4.0.2
checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242
languageName: node
linkType: hard

"flat@npm:^5.0.2":
version: 5.0.2
resolution: "flat@npm:5.0.2"
Expand Down Expand Up @@ -4222,6 +4239,18 @@ __metadata:
languageName: node
linkType: hard

"fs-extra@npm:^9.0.0":
version: 9.1.0
resolution: "fs-extra@npm:9.1.0"
dependencies:
at-least-node: ^1.0.0
graceful-fs: ^4.2.0
jsonfile: ^6.0.1
universalify: ^2.0.0
checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
languageName: node
linkType: hard

"fs-minipass@npm:^2.0.0":
version: 2.1.0
resolution: "fs-minipass@npm:2.1.0"
Expand Down Expand Up @@ -5299,7 +5328,7 @@ __metadata:
languageName: node
linkType: hard

"is-wsl@npm:^2.2.0":
"is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0":
version: 2.2.0
resolution: "is-wsl@npm:2.2.0"
dependencies:
Expand Down Expand Up @@ -5577,6 +5606,15 @@ __metadata:
languageName: node
linkType: hard

"json-stable-stringify@npm:^1.0.2":
version: 1.0.2
resolution: "json-stable-stringify@npm:1.0.2"
dependencies:
jsonify: ^0.0.1
checksum: ec10863493fb728481ed7576551382768a173d5b884758db530def00523b862083a3fd70fee24b39e2f47f5f502e22f9a1489dd66da3535b63bf6241dbfca800
languageName: node
linkType: hard

"json-stringify-safe@npm:^5.0.1":
version: 5.0.1
resolution: "json-stringify-safe@npm:5.0.1"
Expand Down Expand Up @@ -5625,6 +5663,13 @@ __metadata:
languageName: node
linkType: hard

"jsonify@npm:^0.0.1":
version: 0.0.1
resolution: "jsonify@npm:0.0.1"
checksum: 027287e1c0294fce15f18c0ff990cfc2318e7f01fb76515f784d5cd0784abfec6fc5c2355c3a2f2cb0ad7f4aa2f5b74ebbfe4e80476c35b2d13cabdb572e1134
languageName: node
linkType: hard

"jsonparse@npm:^1.2.0, jsonparse@npm:^1.3.1":
version: 1.3.1
resolution: "jsonparse@npm:1.3.1"
Expand Down Expand Up @@ -5655,6 +5700,15 @@ __metadata:
languageName: node
linkType: hard

"klaw-sync@npm:^6.0.0":
version: 6.0.0
resolution: "klaw-sync@npm:6.0.0"
dependencies:
graceful-fs: ^4.1.11
checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
languageName: node
linkType: hard

"lerna@npm:^7.3.0":
version: 7.3.0
resolution: "lerna@npm:7.3.0"
Expand Down Expand Up @@ -6062,7 +6116,7 @@ __metadata:
languageName: node
linkType: hard

"micromatch@npm:^4.0.4":
"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4":
version: 4.0.5
resolution: "micromatch@npm:4.0.5"
dependencies:
Expand Down Expand Up @@ -6927,6 +6981,16 @@ __metadata:
languageName: node
linkType: hard

"open@npm:^7.4.2":
version: 7.4.2
resolution: "open@npm:7.4.2"
dependencies:
is-docker: ^2.0.0
is-wsl: ^2.1.1
checksum: 3333900ec0e420d64c23b831bc3467e57031461d843c801f569b2204a1acc3cd7b3ec3c7897afc9dde86491dfa289708eb92bba164093d8bd88fb2c231843c91
languageName: node
linkType: hard

"open@npm:^8.4.0":
version: 8.4.2
resolution: "open@npm:8.4.2"
Expand Down Expand Up @@ -7268,6 +7332,31 @@ __metadata:
languageName: node
linkType: hard

"patch-package@npm:^8.0.0":
version: 8.0.0
resolution: "patch-package@npm:8.0.0"
dependencies:
"@yarnpkg/lockfile": ^1.1.0
chalk: ^4.1.2
ci-info: ^3.7.0
cross-spawn: ^7.0.3
find-yarn-workspace-root: ^2.0.0
fs-extra: ^9.0.0
json-stable-stringify: ^1.0.2
klaw-sync: ^6.0.0
minimist: ^1.2.6
open: ^7.4.2
rimraf: ^2.6.3
semver: ^7.5.3
slash: ^2.0.0
tmp: ^0.0.33
yaml: ^2.2.2
bin:
patch-package: index.js
checksum: d23cddc4d1622e2d8c7ca31b145c6eddb24bd271f69905e766de5e1f199f0b9a5479a6a6939ea857288399d4ed249285639d539a2c00fbddb7daa39934b007a2
languageName: node
linkType: hard

"path-exists@npm:^3.0.0":
version: 3.0.0
resolution: "path-exists@npm:3.0.0"
Expand Down Expand Up @@ -7978,6 +8067,17 @@ __metadata:
languageName: node
linkType: hard

"rimraf@npm:^2.6.3":
version: 2.7.1
resolution: "rimraf@npm:2.7.1"
dependencies:
glob: ^7.1.3
bin:
rimraf: ./bin.js
checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
languageName: node
linkType: hard

"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
version: 3.0.2
resolution: "rimraf@npm:3.0.2"
Expand Down Expand Up @@ -8322,6 +8422,13 @@ __metadata:
languageName: node
linkType: hard

"slash@npm:^2.0.0":
version: 2.0.0
resolution: "slash@npm:2.0.0"
checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6
languageName: node
linkType: hard

"smart-buffer@npm:^4.2.0":
version: 4.2.0
resolution: "smart-buffer@npm:4.2.0"
Expand Down Expand Up @@ -9719,6 +9826,13 @@ __metadata:
languageName: node
linkType: hard

"yaml@npm:^2.2.2":
version: 2.3.2
resolution: "yaml@npm:2.3.2"
checksum: acd80cc24df12c808c6dec8a0176d404ef9e6f08ad8786f746ecc9d8974968c53c6e8a67fdfabcc5f99f3dc59b6bb0994b95646ff03d18e9b1dcd59eccc02146
languageName: node
linkType: hard

"yargs-parser@npm:20.2.4":
version: 20.2.4
resolution: "yargs-parser@npm:20.2.4"
Expand Down

0 comments on commit 74cc309

Please sign in to comment.