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.

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: remove core from dependencies #592

Merged
merged 3 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "jsdoc", "eslint-plugin-header"],
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
Copy link
Member Author

Choose a reason for hiding this comment

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

I found out that with the "plugin:prettier/recommended" there will be a conflict of linting with auto-save and prettier. Given that it will lint with prettier when push, there is no need to add this check with conflict.

],
"extends": ["plugin:@typescript-eslint/recommended"],
"rules": {
"ban-ts-ignore": "off",
"@typescript-eslint/ban-ts-ignore": "off",
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"/messages"
],
"dependencies": {
"@salesforce/core": "^8.1.1",
"@salesforce/kit": "^3.1.6",
"ejs": "^3.1.10",
"got": "^11.8.2",
Expand Down Expand Up @@ -85,4 +84,4 @@
"publishConfig": {
"access": "public"
}
}
}
17 changes: 11 additions & 6 deletions src/service/gitRepoUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
* See https://github.com/vercel/next.js for more information
*/

import { Global } from '@salesforce/core';
import * as crypto from 'crypto';
import * as fs from 'fs';
import got from 'got';
import * as path from 'path';
import { Stream } from 'stream';
import * as tar from 'tar';
import * as os from 'node:os';
import { promisify } from 'util';
import { nls } from '../i18n';
import { HttpsProxyAgent } from 'hpagent';
Expand All @@ -28,6 +28,15 @@ interface RepoInfo {
filePath: string;
}

const SFDX_STATE_FOLDER = '.sfdx';

/**
* The full system path to the preferred global state folder
*/
export function DIR(): string {
return path.join(os.homedir(), SFDX_STATE_FOLDER);
}

/**
* extract repo info from uri
* @param repoUri uri to git repo
Expand Down Expand Up @@ -86,11 +95,7 @@ export function getStoragePathForCustomTemplates(repoUri: URL): string {
.update(repoUri.href)
.digest('hex');

const customTemplatesPath = path.join(
Global.DIR,
'custom-templates',
folderHash
);
const customTemplatesPath = path.join(DIR(), 'custom-templates', folderHash);
return customTemplatesPath;
}

Expand Down
25 changes: 25 additions & 0 deletions test/service/gitRepoUtils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (c) 2024, salesforce.com, inc.
* All rights reserved.
* Licensed under the BSD 3-Clause license.
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/
import { SinonStub, stub } from 'sinon';
import { expect } from 'chai';
import { DIR } from '../../src/service/gitRepoUtils';
import * as os from 'os';
import * as path from 'path';

describe('DIR', () => {
let homedirStub: SinonStub;
beforeEach(() => {
homedirStub = stub(os, 'homedir');
});
it('should return DIR', () => {
const homedir = '/Users/johndoe';
homedirStub.returns(homedir);
const sfdxStateFolder = '.sfdx';
const dir = DIR();
expect(dir).to.eql(path.join(homedir, sfdxStateFolder));
});
});
Loading
Loading