Skip to content

Commit 14d7dc4

Browse files
authored
fix(deps): Switch back to non-shortened @heroku/functions-core dependency name (#595)
In #403 and heroku/sf-functions-core#22 various measures were taken to try and shorten the maximum on-disk filepath of files in the two packages, so as to prevent the CI failures seen in: https://app.circleci.com/pipelines/github/salesforcecli/plugin-functions/2415/workflows/510a1bac-1a64-4a1b-a5a5-e765100b08d2/jobs/8514 One of these measure was to use a package alias of `@hk/functions-core` for the `@heroku/functions-core` package, so the on-disk directory path was 4 characters shorter. However, this change stops Dependabot from working, and looking at recent tarfile verification logs in CI, it appears we might not need to save these four characters any more - since none of the salesforce-core dep paths appear in the "close to the limit" warnings. As such, we can undo this aliasing, to fix Dependabot for this package. @W-12466399@
1 parent 32d075e commit 14d7dc4

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@heroku-cli/schema": "^1.0.25",
1313
"@heroku/eventsource": "^1.0.7",
1414
"@heroku/function-toml": "^0.0.3",
15+
"@heroku/functions-core": "^0.5.5",
1516
"@heroku/project-descriptor": "0.0.6",
16-
"@hk/functions-core": "npm:@heroku/functions-core@^0.5.3",
1717
"@oclif/core": "^1.26.1",
1818
"@salesforce/core": "^3.32.12",
1919
"@salesforce/sf-plugins-core": "^1.22.3",

src/commands/generate/function.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import herokuColor from '@heroku-cli/color';
88
import { Messages } from '@salesforce/core';
99
import { Errors, Flags } from '@oclif/core';
10-
import { generateFunction, Language } from '@hk/functions-core';
10+
import { generateFunction, Language } from '@heroku/functions-core';
1111
import Command from '../../lib/base';
1212

1313
Messages.importMessagesDirectory(__dirname);

src/commands/run/function.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
import * as fs from 'fs';
88
import { Errors, Flags } from '@oclif/core';
9-
import { runFunction, RunFunctionOptions } from '@hk/functions-core';
9+
import { runFunction, RunFunctionOptions } from '@heroku/functions-core';
1010
import { cli } from 'cli-ux';
1111
import herokuColor from '@heroku-cli/color';
1212
import { AxiosResponse, AxiosError } from 'axios';

src/commands/run/function/start/container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as path from 'path';
88
import herokuColor from '@heroku-cli/color';
99
import { Messages } from '@salesforce/core';
1010
import { Command, Flags } from '@oclif/core';
11-
import { getFunctionsBinary, getProjectDescriptor } from '@hk/functions-core';
11+
import { getFunctionsBinary, getProjectDescriptor } from '@heroku/functions-core';
1212
import { cli } from 'cli-ux';
1313
import { JsonMap } from '@salesforce/ts-types';
1414

src/commands/run/function/start/local.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import * as path from 'path';
88
import * as process from 'process';
99
import { Command, Flags } from '@oclif/core';
10-
import { LocalRun } from '@hk/functions-core';
10+
import { LocalRun } from '@heroku/functions-core';
1111
import { Messages } from '@salesforce/core';
12-
import { LangRunnerOpts } from '@hk/functions-core/dist/lang-runner';
12+
import { LangRunnerOpts } from '@heroku/functions-core/dist/lang-runner';
1313

1414
Messages.importMessagesDirectory(__dirname);
1515
const messages = Messages.loadMessages('@salesforce/plugin-functions', 'run.function.start.local');

test/commands/generate/function.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
import { expect, test } from '@oclif/test';
88
import * as sinon from 'sinon';
9-
import * as library from '@hk/functions-core';
9+
import * as library from '@heroku/functions-core';
1010
import vacuum from '../../helpers/vacuum';
1111

1212
describe('sf generate function', () => {

test/commands/run/function.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { cli } from 'cli-ux';
1111
import { MockTestOrgData, testSetup } from '@salesforce/core/lib/testSetup';
1212
import * as sinon from 'sinon';
1313

14-
import * as library from '@hk/functions-core';
14+
import * as library from '@heroku/functions-core';
1515
import vacuum from '../../helpers/vacuum';
1616

1717
describe('sf run function', () => {

test/commands/run/function/start.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { EventEmitter } from 'events';
99
import { Readable } from 'stream';
1010
import { expect, test } from '@oclif/test';
1111
import * as sinon from 'sinon';
12-
import { LocalRun, LocalRunProcess } from '@hk/functions-core';
12+
import { LocalRun, LocalRunProcess } from '@heroku/functions-core';
1313

1414
describe('sdf run function start', () => {
1515
let sandbox: sinon.SinonSandbox;

test/commands/run/function/start/container.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import * as events from 'events';
88
import { expect, test } from '@oclif/test';
99
import * as sinon from 'sinon';
1010

11-
import * as library from '@hk/functions-core';
12-
import { Benny } from '@hk/functions-core';
11+
import * as library from '@heroku/functions-core';
12+
import { Benny } from '@heroku/functions-core';
1313

1414
describe('sd function start container', () => {
1515
let sandbox: sinon.SinonSandbox;

test/commands/run/function/start/local.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { ChildProcess } from 'child_process';
99
import { EventEmitter } from 'events';
1010
import { expect, test } from '@oclif/test';
1111
import * as sinon from 'sinon';
12-
import { LocalRun, LocalRunProcess } from '@hk/functions-core';
12+
import { LocalRun, LocalRunProcess } from '@heroku/functions-core';
1313
import { SinonStub, SinonStubbedInstance } from 'sinon';
14-
import { LangRunnerOpts } from '@hk/functions-core/dist/lang-runner';
14+
import { LangRunnerOpts } from '@heroku/functions-core/dist/lang-runner';
1515
import Local from '../../../../../src/commands/run/function/start/local';
1616

1717
describe('sf run function start local', () => {

0 commit comments

Comments
 (0)