Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump core version #414

Merged
merged 2 commits into from
Dec 14, 2021
Merged

feat: bump core version #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
470d3fe
feat: bump core version
shetzel Dec 14, 2021
126e3d9
chore: remove ts-ignores
shetzel Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/plugin-templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@oclif/config": "^1",
"@oclif/errors": "^1",
"@salesforce/command": "^2.2.0",
"@salesforce/core": "2.28.0",
"@salesforce/core": "2.32.0",
"@salesforce/templates": "52.6.0",
"tslib": "^1",
"yeoman-environment": "2.4.0",
Expand All @@ -34,6 +34,7 @@
"shx": "0.2.2",
"sinon": "^7.3.1",
"ts-node": "^8.6.2",
"eslint": "^8.4.1",
"tslint": "^6.1.0",
"typescript": "^3.8.3",
"yeoman-assert": "^3.1.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/plugin-templates/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.settings.json",
"compilerOptions": {
"outDir": "./lib"
"outDir": "./lib",
"skipLibCheck":true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no way around it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not without snowballing into a much larger PR.

},
"include": ["./src/**/*"]
}
657 changes: 651 additions & 6 deletions packages/plugin-templates/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"/messages"
],
"dependencies": {
"@salesforce/core": "2.28.0",
"@salesforce/core": "2.32.0",
"got": "^11.8.2",
"mime-types": "^2.1.27",
"tar": "^6.1.10",
Expand Down Expand Up @@ -42,7 +42,7 @@
"shx": "0.2.2",
"sinon": "^7.3.1",
"ts-node": "^8.6.2",
"typescript": "^3.8.3",
"typescript": "^4.3.2",
"yeoman-assert": "^3.1.1"
},
"scripts": {
Expand Down
7 changes: 6 additions & 1 deletion packages/templates/src/service/templateService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import { ForceGeneratorAdapter } from '../utils';
import { CreateOutput, TemplateOptions, TemplateType } from '../utils/types';
import { loadCustomTemplatesGitRepo } from './gitRepoUtils';

interface FsError extends Error {
code: string;
}

/**
* Template Service
*/
Expand Down Expand Up @@ -162,7 +166,8 @@ export class TemplateService {
);
}
} catch (error) {
if (error.code !== 'ERR_INVALID_URL') {
const err = error as FsError;
if (err.code !== 'ERR_INVALID_URL') {
throw error;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/templates/test/service/templateService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ describe('TemplateService', () => {
outputdir: path.join('testsoutput', 'libraryCreate', 'apexClass')
});
} catch (error) {
expect(error.message).to.equal('error');
const err = error as Error;
expect(err.message).to.equal('error');
}
runStub.restore();
});
Expand Down
3 changes: 2 additions & 1 deletion packages/templates/test/utils/createUtil.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ describe('CreateUtil', () => {
CreateUtil.checkInputs(input);
assert.fail(`Expected checkInputs to throw ${errorName} error.`);
} catch (e) {
expect(e.message).to.equal(nls.localize(errorName));
const err = e as Error;
expect(err.message).to.equal(nls.localize(errorName));
}
};
});
Expand Down
90 changes: 30 additions & 60 deletions packages/templates/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,25 +234,26 @@
mv "~2"
safe-json-stringify "~1"

"@salesforce/core@2.28.0":
version "2.28.0"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.28.0.tgz#2fb3d7be0dfac8505332f558b7dd4274afd34901"
integrity sha512-CFw2xloL3UwuvLm+0nK588kFVGPRZFmUzeUBYFCIz+34CJShc1B7yN+anPlZcHWgT12Ih9yzKYaki0BjCeIgKQ==
"@salesforce/core@2.32.0":
version "2.32.0"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.32.0.tgz#2649562f3be9bf05f436b06bc5a20014aa9a5aea"
integrity sha512-bJ9LidLQ+6xoAaC2q0M/609AmrOIVp9ErjkC/mYdlIK2XAEZWYbnbhdBGzlzInjD7KFR65Gmq+Y0c3+ESSYFrg==
dependencies:
"@salesforce/bunyan" "^2.0.0"
"@salesforce/kit" "^1.5.0"
"@salesforce/schemas" "^1.0.1"
"@salesforce/ts-types" "^1.5.13"
"@types/graceful-fs" "^4.1.5"
"@types/jsforce" "^1.9.29"
"@types/jsforce" "^1.9.35"
"@types/mkdirp" "^1.0.1"
debug "^3.1.0"
faye "^1.4.0"
graceful-fs "^4.2.4"
jsen "0.6.6"
jsforce "^1.10.1"
jsforce "^1.11.0"
jsonwebtoken "8.5.0"
mkdirp "1.0.4"
sfdx-faye "^1.0.9"
semver "^7.3.5"
ts-retry-promise "^0.6.0"

"@salesforce/kit@^1.5.0":
Expand Down Expand Up @@ -407,10 +408,10 @@
"@types/through" "*"
rxjs "^6.4.0"

"@types/jsforce@^1.9.29":
version "1.9.35"
resolved "https://registry.yarnpkg.com/@types/jsforce/-/jsforce-1.9.35.tgz#abda87c796910d286420b07a97382c782b576ca8"
integrity sha512-GEb1iMAK8raElbBbozR7aVEuMl47jrPYLNkeh+3h2vLJIG21uQ/kOk4kPgMiMFwCmgfX4/tPDugnjb7qrMav4A==
"@types/jsforce@^1.9.35":
version "1.9.36"
resolved "https://registry.yarnpkg.com/@types/jsforce/-/jsforce-1.9.36.tgz#b84ab5e424197fe3fbebb69ee4fb7ed4cabcecf8"
integrity sha512-fw4POJX7pzV0Fp7PzCoGr1SasCrzrD3mw8FJfA2D3m2Bc1xXZHttZtcGbp0H8FXhgEL07ej3gQzdEokVq65fEQ==
dependencies:
"@types/node" "*"

Expand Down Expand Up @@ -725,7 +726,7 @@ arrify@^2.0.1:
resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==

asap@*, asap@~2.0.3, asap@~2.0.6:
asap@*, asap@~2.0.3:
version "2.0.6"
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
Expand Down Expand Up @@ -1229,7 +1230,7 @@ cross-spawn@^7.0.0:
shebang-command "^2.0.0"
which "^2.0.1"

csprng@*, csprng@~0.1.2:
csprng@*:
version "0.1.2"
resolved "https://registry.yarnpkg.com/csprng/-/csprng-0.1.2.tgz#4bc68f12fa368d252a59841cbaca974b18ab45e2"
integrity sha1-S8aPEvo2jSUqWYQcusqXSxirReI=
Expand Down Expand Up @@ -1666,17 +1667,10 @@ faye-websocket@>=0.9.1:
dependencies:
websocket-driver ">=0.5.1"

faye-websocket@~0.9.1:
version "0.9.4"
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.9.4.tgz#885934c79effb0409549e0c0a3801ed17a40cdad"
integrity sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=
dependencies:
websocket-driver ">=0.5.1"

faye@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/faye/-/faye-1.3.0.tgz#a8139ad9c45eef4d5faaa52a23d2b92c38d7254b"
integrity sha512-l+IzAmEsT2OCVeGbLfZBpm8HeHQYVelkqKWNE0LA/k68jhVIT/qzHTXLygURrLpKweqiaTBCtzxxO5JTQ+dnFQ==
faye@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/faye/-/faye-1.4.0.tgz#01d3d26ed5642c1cb203eed358afb1c1444b8669"
integrity sha512-kRrIg4be8VNYhycS2PY//hpBJSzZPr/DBbcy9VWelhZMW3KhyLkQR0HL0k0MNpmVoNFF4EdfMFkNAWjTP65g6w==
dependencies:
asap "*"
csprng "*"
Expand Down Expand Up @@ -2592,18 +2586,18 @@ jsesc@^2.5.1:
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==

jsforce@^1.10.1:
version "1.10.1"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-1.10.1.tgz#ca1cf58d4439d94e1f84482d83081acd12c93269"
integrity sha512-rv+UpBR9n/sWdgLhyPOJuKgT9ZKngypYf9XOHoXVRpSllvTFCjn+M3H81Nu1oYjPH9JKXVS8hL1dmmq8+kOAJg==
jsforce@^1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-1.11.0.tgz#7e853b82c534f1fe8e18f432a344bae81881a133"
integrity sha512-vYNXJXXdz9ZQNdfRqq/MCJ/zU7JGA7iEduwafQDzChR9FeqXgTNfHTppLVbw9mIniKkQZemmxSOtl7N04lj/5Q==
dependencies:
base64-url "^2.2.0"
co-prompt "^1.0.0"
coffeescript "^1.10.0"
commander "^2.9.0"
csv-parse "^4.10.1"
csv-stringify "^1.0.4"
faye "^1.2.0"
faye "^1.4.0"
inherits "^2.0.1"
lodash "^4.17.19"
multistream "^2.0.5"
Expand Down Expand Up @@ -3560,7 +3554,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

psl@^1.1.24, psl@^1.1.28, psl@^1.1.33:
psl@^1.1.28, psl@^1.1.33:
version "1.8.0"
resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
Expand All @@ -3573,11 +3567,6 @@ pump@^3.0.0:
end-of-stream "^1.1.0"
once "^1.3.1"

punycode@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=

punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
Expand Down Expand Up @@ -3857,7 +3846,7 @@ semver@^6.0.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.1.3, semver@^7.2.1:
semver@^7.1.3, semver@^7.2.1, semver@^7.3.5:
version "7.3.5"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
Expand Down Expand Up @@ -3891,17 +3880,6 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"

sfdx-faye@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/sfdx-faye/-/sfdx-faye-1.0.9.tgz#24e678ddb783d7085f3e40a2c155ac367416be26"
integrity sha512-/p0Ifvhh9rVYj6YmYOBU+psQsP+9RrNrUU4lr1p+HhZhTgnviMIabcgKZUN12S69zUpl0YagpFdMhmxKGkf+5g==
dependencies:
asap "~2.0.6"
csprng "~0.1.2"
faye-websocket "~0.9.1"
tough-cookie "~2.4.3"
tunnel-agent "~0.6.0"

shallow-clone@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
Expand Down Expand Up @@ -4360,14 +4338,6 @@ tough-cookie@*:
punycode "^2.1.1"
universalify "^0.1.2"

tough-cookie@~2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
dependencies:
psl "^1.1.24"
punycode "^1.4.1"

tough-cookie@~2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
Expand Down Expand Up @@ -4402,7 +4372,7 @@ tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tunnel-agent@*, tunnel-agent@^0.6.0, tunnel-agent@~0.6.0:
tunnel-agent@*, tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
Expand Down Expand Up @@ -4441,10 +4411,10 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"

typescript@^3.8.3:
version "3.9.7"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
typescript@^4.3.2:
version "4.5.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==

union-value@^1.0.0:
version "1.0.1"
Expand Down