Skip to content

Commit

Permalink
publish patched @oclif/core
Browse files Browse the repository at this point in the history
  • Loading branch information
Roy Razon committed Nov 27, 2023
1 parent 5455c2e commit 66a4ddb
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish-canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
git commit -m "canary version $VERSION" lerna.json packages/*/package.json
# publish
yarn -s lerna publish from-package --pre-dist-tag $GIT_ID --yes
yarn -s lerna publish from-package --pre-dist-tag $GIT_ID --dist-tag $GIT_ID --yes
# undo the commit
git reset --hard HEAD^1
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"private": true,
"workspaces": [
"packages/*"
],
"workspaces": ["packages/*"],
"devDependencies": {
"husky": "^8.0.0",
"lerna": "^6.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/core": "0.0.56",
"chalk": "^4.1.2",
"iter-tools-es": "^7.5.3",
Expand Down
7 changes: 4 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
"/static",
"/dist",
"/yarn.lock",
"/oclif.manifest.json"
"/oclif.manifest.json",
"/patches"
],
"dependencies": {
"@inquirer/confirm": "^2.0.14",
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@oclif/plugin-help": "^5",
"@preevy/cli-common": "0.0.56",
"@preevy/common": "0.0.56",
Expand Down Expand Up @@ -102,7 +103,7 @@
"lint": "eslint . --ext .ts --cache",
"postpack": "shx rm -f oclif.manifest.json",
"posttest": "yarn lint",
"prepack": "yarn build && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
"prepack": "yarn build && ./scripts/validate-tsconfig && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
"cli": "./bin/dev",
"version": "oclif readme && git add README.md"
},
Expand Down
14 changes: 14 additions & 0 deletions packages/cli/scripts/validate-tsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env node
const path = require('path')
const util = require('util')
const fs = require('fs')

const tsConfig = path.join(__dirname, '..', './tsconfig.json')

try {
JSON.parse(fs.readFileSync('./tsconfig.json'))
} catch (e) {
console.error('Error parsing %s: oclif expects valid JSON: %j', tsConfig, util.inspect(e))
process.exit(1)
}

4 changes: 2 additions & 2 deletions packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lib": ["es2022"],
"esModuleInterop": true,
"sourceMap": true,
"baseUrl": ".",
"baseUrl": "."
},
"include": [
"src/**/*"
Expand All @@ -25,6 +25,6 @@
{ "path": "../driver-gce" },
{ "path": "../driver-azure" },
{ "path": "../driver-kube-pod" },
{ "path": "../plugin-github" },
{ "path": "../plugin-github" }
]
}
Empty file.
2 changes: 1 addition & 1 deletion packages/driver-azure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@azure/arm-subscriptions": "^5.1.0",
"@azure/identity": "^3.2.2",
"@azure/logger": "^1.0.4",
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/core": "0.0.56",
"inquirer": "^8.0.0",
"inquirer-autocomplete-prompt": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/driver-gce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@google-cloud/compute": "^4.0.1",
"@google-cloud/storage": "^6.9.5",
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/core": "0.0.56",
"google-auth-library": "^8.7.0",
"google-gax": "^4.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/driver-kube-pod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@kubernetes/client-node": "^0.18.1",
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/common": "0.0.56",
"@preevy/core": "0.0.56",
"fast-safe-stringify": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/driver-lightsail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@aws-sdk/client-s3": "^3.271.0",
"@aws-sdk/client-sts": "^3.289.0",
"@aws-sdk/util-waiter": "^3.271.0",
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/core": "0.0.56",
"inquirer": "^8.0.0",
"inquirer-autocomplete-prompt": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-github/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@oclif/core": "^3",
"@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
"@preevy/cli-common": "0.0.56",
"@preevy/core": "0.0.56",
"lodash": "^4.17.21",
Expand Down
38 changes: 0 additions & 38 deletions patches/@oclif+core+3.12.0.patch

This file was deleted.

37 changes: 34 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2562,10 +2562,41 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/core@^3", "@oclif/core@^3.0.4", "@oclif/core@^3.11.0":
"@oclif/core@^3.0.4", "@oclif/core@^3.11.0":
version "3.12.0"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.12.0.tgz#4b38b1b5dab2f7585f89c3927a8a157b258b4bd6"
integrity sha512-mT1Vpd1E20IJ7P6GDYOivylPdTHq/xVgFjeCDjitFW86UAklFM8BEFyFB7KpsTvpmjRbCoda3yU10lSI1224lw==
resolved "https://codeload.github.com/livecycle/oclif-core-patched-for-preevy/tar.gz/dab8b2ff6fb68b264d6633679826e7b6f9d428f6"
dependencies:
ansi-escapes "^4.3.2"
ansi-styles "^4.3.0"
cardinal "^2.1.1"
chalk "^4.1.2"
clean-stack "^3.0.1"
cli-progress "^3.12.0"
color "^4.2.3"
debug "^4.3.4"
ejs "^3.1.9"
get-package-type "^0.1.0"
globby "^11.1.0"
hyperlinker "^1.0.0"
indent-string "^4.0.0"
is-wsl "^2.2.0"
js-yaml "^3.14.1"
natural-orderby "^2.0.3"
object-treeify "^1.1.33"
password-prompt "^1.1.2"
slice-ansi "^4.0.0"
string-width "^4.2.3"
strip-ansi "^6.0.1"
supports-color "^8.1.1"
supports-hyperlinks "^2.2.0"
tsconfck "^3.0.0"
widest-line "^3.1.0"
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/core@livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-2":
version "3.12.0"
resolved "https://codeload.github.com/livecycle/oclif-core-patched-for-preevy/tar.gz/936288261fcfb11b04dd51ce4311abb48d7a95eb"
dependencies:
ansi-escapes "^4.3.2"
ansi-styles "^4.3.0"
Expand Down

0 comments on commit 66a4ddb

Please sign in to comment.