From 4c04dd10e371277df4c2e20580bd7beeeaaa9f93 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 17 Feb 2023 16:36:47 -0600 Subject: [PATCH 1/2] chore: jit sobject, remove generator --- .github/workflows/justNut.yml | 3 +- package.json | 6 +-- yarn.lock | 80 +---------------------------------- 3 files changed, 7 insertions(+), 82 deletions(-) diff --git a/.github/workflows/justNut.yml b/.github/workflows/justNut.yml index b27af0c7..a184208e 100644 --- a/.github/workflows/justNut.yml +++ b/.github/workflows/justNut.yml @@ -65,7 +65,8 @@ jobs: node-version: lts/* cache: yarn # NOTE: We are just using latest-rc of `sf` since we cannot guaranteed channels (and definitely versions) will be the same - - run: npm install -g sfdx-cli@{{ inputs.channel-or-version }} @salesforce/cli@latest-rc --omit=dev + + - run: npm install -g sfdx-cli@${{ inputs.channel-or-version }} @salesforce/cli@latest-rc --omit=dev - run: yarn install - name: NUTs attempt 1 continue-on-error: true diff --git a/package.json b/package.json index 7fd967a6..2ef1c79f 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,6 @@ "@salesforce/plugin-community", "@salesforce/plugin-custom-metadata", "@salesforce/plugin-data", - "@salesforce/plugin-generator", "@salesforce/plugin-info", "@salesforce/plugin-limits", "@salesforce/plugin-org", @@ -87,6 +86,9 @@ "@salesforce/plugin-user", "@salesforce/sfdx-plugin-lwc-test" ], + "jitPlugins": { + "@salesforce/plugin-sobject": "0.1.4" + }, "devPlugins": [ "@oclif/plugin-command-snapshot", "@salesforce/plugin-release-management" @@ -133,7 +135,6 @@ "@salesforce/plugin-community", "@salesforce/plugin-custom-metadata", "@salesforce/plugin-data", - "@salesforce/plugin-generator", "@salesforce/plugin-info", "@salesforce/plugin-limits", "@salesforce/plugin-org", @@ -167,7 +168,6 @@ "@salesforce/plugin-config": "1.5.1", "@salesforce/plugin-custom-metadata": "2.1.2", "@salesforce/plugin-data": "2.2.1", - "@salesforce/plugin-generator": "2.0.17", "@salesforce/plugin-info": "2.4.2", "@salesforce/plugin-limits": "2.3.3", "@salesforce/plugin-org": "2.4.0", diff --git a/yarn.lock b/yarn.lock index 51934dc2..69b6ab7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -995,16 +995,6 @@ strip-ansi "^6.0.1" wrap-ansi "^7.0.0" -"@oclif/fixpack@^2.3.0": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@oclif/fixpack/-/fixpack-2.3.1.tgz#6ecee36fd4945b2e3aef604f0b0de466e396a26c" - integrity sha512-ynDtqYke7WBjyAK5KQiOoNm2XGm4wBfNDzjbpq3k4NEarA5wRW0PMjdP2FkTAJE2NI3tA6I7DXxxqBzwyt+fBg== - dependencies: - alce "1.2.0" - colors "1.4.0" - extend-object "^1.0.0" - rc "^1.2.8" - "@oclif/help@^1.0.0", "@oclif/help@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@oclif/help/-/help-1.0.1.tgz#fd96a3dd9fb2314479e6c8584c91b63754a7dff5" @@ -1620,22 +1610,6 @@ jsforce "^2.0.0-beta.19" tslib "^2" -"@salesforce/plugin-generator@2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-generator/-/plugin-generator-2.0.17.tgz#bf186f82836a03a5fc14f719c7e34923bf5a3d70" - integrity sha512-x0d0wDdSKm4awDaqMOmYPy7uTqLqy16ooiGcjyUwSWhPa/r81qnRK5RcOIt/sSpmhEQvjdwyLHPmavQF+4mfFQ== - dependencies: - "@oclif/core" "^1.25.0" - "@salesforce/ts-types" "^1.7.2" - debug "^4.3.1" - lodash "^4.17.21" - rimraf "^3.0.2" - sort-pjson "^1.0.3" - tslib "^2.2.0" - yeoman-environment "^3.13.0" - yeoman-generator "^5.7.0" - yosay "^2.0.2" - "@salesforce/plugin-info@2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-2.4.2.tgz#47bee44226a87dd137c1db27b8ed1c5f7ccac321" @@ -2502,14 +2476,6 @@ ajv@^8.0.1, ajv@^8.11.0, ajv@^8.11.2: require-from-string "^2.0.2" uri-js "^4.2.2" -alce@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/alce/-/alce-1.2.0.tgz#a8be2dacaac42494612f18dc09db691f3dea4aab" - integrity sha512-XppPf2S42nO2WhvKzlwzlfcApcXHzjlod30pKmcWjRgLOtqoe5DMuqdiYoM6AgyXksc6A6pV4v1L/WW217e57w== - dependencies: - esprima "^1.2.0" - estraverse "^1.5.0" - ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -3448,11 +3414,6 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== -colors@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - columnify@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3" @@ -4571,11 +4532,6 @@ espree@^9.4.0: acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" -esprima@^1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9" - integrity sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ== - esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -4595,11 +4551,6 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^1.5.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" - integrity sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA== - estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" @@ -4678,11 +4629,6 @@ execa@^5.0.0, execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -extend-object@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/extend-object/-/extend-object-1.0.0.tgz#42514f84015d1356caf5187969dfb2bc1bda0823" - integrity sha512-0dHDIXC7y7LDmCh/lp1oYkmv73K25AMugQI07r8eFopkW6f7Ufn1q+ETMsJjnV9Am14SlElkqy3O92r6xEaxPw== - external-editor@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" @@ -5686,7 +5632,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -8421,16 +8367,6 @@ raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-cmd-shim@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087" @@ -9034,13 +8970,6 @@ sort-keys@^4.0.0, sort-keys@^4.2.0: dependencies: is-plain-obj "^2.0.0" -sort-pjson@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sort-pjson/-/sort-pjson-1.0.3.tgz#79435ab838db3700cc255278175c111b407b6bb5" - integrity sha512-h/xRX+8zuV9tbnbkRwmdNNyyJbjzVTh8YFpMgEgGU2umFDFg2EDfWKtA5YOfnBwT4YoZfJf6hrc0yuXLUvUDFA== - dependencies: - "@oclif/fixpack" "^2.3.0" - source-map-support@~0.5.19: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -9311,11 +9240,6 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1. resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - strnum@^1.0.4, strnum@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" @@ -9583,7 +9507,7 @@ tslib@^1, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.4.1, tslib@^2.5.0: +tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.1, tslib@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== From b8cad9c9cf9983eeb07a7d127e7d40f01dd3bfb3 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 22 Feb 2023 18:12:37 -0600 Subject: [PATCH 2/2] feat: jit plugin-dev --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b020d812..49518ea7 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,8 @@ "@salesforce/sfdx-plugin-lwc-test" ], "jitPlugins": { - "@salesforce/plugin-sobject": "0.1.4" + "@salesforce/plugin-sobject": "0.1.4", + "@salesforce/plugin-dev": "0.7.0" }, "devPlugins": [ "@oclif/plugin-command-snapshot",