From d0365e51aadb565951aabc17562633ad1eb0fcbd Mon Sep 17 00:00:00 2001 From: peternhale Date: Tue, 28 Mar 2023 13:09:58 -0600 Subject: [PATCH] fix: reapply is manifest writing (#1130) * Revert "fix: bump oclif core (#1127)" This reverts commit 03cbaab6a4c39084581ef3f718249969ced6465f. * fix: reapply is manifest writing --- package.json | 4 ++-- src/commands/manifest.ts | 2 +- yarn.lock | 43 ++++------------------------------------ 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 4a417d5c9..7851e5a27 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "bugs": "https://github.com/oclif/oclif/issues", "dependencies": { - "@oclif/core": "^2.7.1", + "@oclif/core": "^2.8.0", "@oclif/plugin-help": "^5.1.19", "@oclif/plugin-not-found": "^2.3.7", "@oclif/plugin-warn-if-update-available": "^2.0.14", @@ -141,4 +141,4 @@ "registry": "https://registry.npmjs.org" }, "types": "lib/index.d.ts" -} \ No newline at end of file +} diff --git a/src/commands/manifest.ts b/src/commands/manifest.ts index be65445ed..a336f939a 100644 --- a/src/commands/manifest.ts +++ b/src/commands/manifest.ts @@ -75,7 +75,7 @@ export default class Manifest extends Command { let plugin = new Plugin({root, type: 'core', ignoreManifest: true, errorOnManifestCreate: true}) if (!plugin) throw new Error('plugin not found') - await plugin.load() + await plugin.load(true) if (!plugin.valid) { const p = require.resolve('@oclif/plugin-legacy', {paths: [process.cwd()]}) const {PluginLegacy} = require(p) diff --git a/yarn.lock b/yarn.lock index 546c2c108..4ea7ad9e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -539,45 +539,10 @@ widest-line "^3.1.0" wrap-ansi "^7.0.0" -"@oclif/core@^2.0.2-beta.6": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.0.tgz#18223631f32d60589d528f3fd5f61832018e5f80" - integrity sha512-8+qll0gr+if7QxZ5PBxhSFDK67uR62lJvUHTnQ5p1lzapHO/ucwA5YIiSn6LtIsKnP7l0uDINegXb9z8lNM/OQ== - dependencies: - "@types/cli-progress" "^3.11.0" - 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" - debug "^4.3.4" - ejs "^3.1.8" - fs-extra "^9.1.0" - 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" - semver "^7.3.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - supports-color "^8.1.1" - supports-hyperlinks "^2.2.0" - ts-node "^10.9.1" - tslib "^2.5.0" - widest-line "^3.1.0" - wordwrap "^1.0.0" - wrap-ansi "^7.0.0" - -"@oclif/core@^2.7.1": - version "2.7.1" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.1.tgz#3f38c1ace1675d80b0bbaa3ae5d4572b8fa04c22" - integrity sha512-HnaZ0ezNJUGok4uACOmVl05aSrCblmuq5Sqyg3Qa8aLFnTBuvHn3d67fTJKSttyAnJ5LI3zw8e5vzLD7WZuP0A== +"@oclif/core@^2.0.2-beta.6", "@oclif/core@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.0.tgz#4948de3168804169fa68895af8ec4853f332b307" + integrity sha512-A2wHItFrD/WOw5bJ6Mtv9MD7If0bsKNR0pwEY0me+fo4HSXlJOtgYGqmzb8t8akX3DUUT7XsjPajsoHLkIJyvg== dependencies: "@types/cli-progress" "^3.11.0" ansi-escapes "^4.3.2"