Skip to content

Commit

Permalink
3.22.2 (#359)
Browse files Browse the repository at this point in the history
* Allow changing static  resource properties on a per-resource basis

* Update dependencies

* Update Slack invite link #357

* Fix issue saving binary static resource files
  • Loading branch information
daishi4u authored Jan 31, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 31a490c commit 464f0f0
Showing 7 changed files with 202 additions and 128 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Change Log

* 3.22.2
* Add ability to change settings for static resources (Per resource) via using a `forceBundleSettings.json` file in the `resource-bundle` folder. This file will be auto-generated upon save of a static resource. If the resource exists in the org, the current settings of the resource will be used in the file.
* Update Slack invite link #357
* Fix issue saving binary static resource files (JPG, PNG, etc)
* 3.22.1
* Transitioned delete functionality to SFDX. Now more types are supported for deleting from an org.
* 3.22.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ As of version 3.17.0, you will be required to install the SFDX-CLI on your syste

## Slack

ForceCode now has a Slack channel! Click [here](https://join.slack.com/t/forcecodeworkspace/shared_invite/enQtNDczMDg3Nzg2ODcxLWRhYWM2NmI3MGNmMmE1MmRkOTFkMGQzZmQ1YjlhMDhjY2YzNmU0NDEyNDU4OGM1NzdlZjU2NTg3Y2FkNTdhMjA) to join us!
ForceCode now has a Slack channel! Click [here](https://join.slack.com/t/forcecodeworkspace/shared_invite/enQtOTMwMjkwODQwNzA0LThhNWJlNDA0OTg3OWFmN2YyNzEwNTdlNzA3ZGJhODc5YWI2MTBjODY2YTFmMzE0YjZjOWUyMGMyZTY5YzVmMDU) to join us!
Use this to ask question and receive updates on upcoming features!

### Permissions
154 changes: 77 additions & 77 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "forcecode",
"version": "3.22.1",
"version": "3.22.2",
"publisher": "JohnAaronNelson",
"displayName": "ForceCode",
"description": "Visual Studio Code extension for Salesforce (SFDC) development",
@@ -273,7 +273,8 @@
"node_modules/**": true,
"bower_modules/**": true,
"**.tmp": true,
".log": true
".log": true,
"forceBundleSettings.json": true
},
"description": "An object describing the files to exclude from the Static Resource build. The key is a Nodejs \"Glob\" pattern, the value is true or false"
},
@@ -678,8 +679,8 @@
"@types/fs-extra": "8.0.1",
"@types/globule": "1.1.3",
"@types/klaw": "3.0.0",
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.13",
"@types/mocha": "^7.0.1",
"@types/node": "^10.17.14",
"@types/sinon": "^7.5.1",
"@types/universal-analytics": "0.4.3",
"@types/vscode": "1.41.0",
@@ -694,18 +695,18 @@
"jsforce": "1.9.3",
"klaw": "3.0.0",
"mime-types": "2.1.26",
"mocha": "^7.0.0",
"mocha": "^7.0.1",
"os": "0.1.1",
"remap-istanbul": "^0.13.0",
"request-light": "0.2.5",
"rimraf": "^3.0.0",
"sinon": "^8.0.4",
"rimraf": "^3.0.1",
"sinon": "^8.1.1",
"tree-kill": "1.2.2",
"ts-loader": "^6.2.1",
"tslint": "^5.20.1",
"typescript": "^3.7.4",
"tslint": "^6.0.0",
"typescript": "^3.7.5",
"universal-analytics": "0.4.20",
"uuid": "3.3.3",
"uuid": "3.4.0",
"vsce": "^1.71.0",
"vscode-test": "^1.3.0",
"webpack": "^4.41.5",
15 changes: 7 additions & 8 deletions src/commands/compile.ts
Original file line number Diff line number Diff line change
@@ -37,12 +37,12 @@ export class CompileMenu extends ForcecodeCommand {

public async command(context: any, selectedResource?: any) {
selectedResource = selectedResource ? true : false;
var document: vscode.TextDocument | undefined = vscode.window.activeTextEditor?.document;
var document: string | undefined = vscode.window.activeTextEditor?.document.fileName;
if (context) {
if (context.uri) {
context = context.uri;
}
document = await vscode.workspace.openTextDocument(context);
document = context.fsPath;
}
if (!document) {
return;
@@ -64,14 +64,15 @@ export class ForceCompile extends ForcecodeCommand {
}

export async function compile(
document: vscode.TextDocument,
thePath: string,
forceCompile: boolean,
cancellationToken: FCCancellationToken
): Promise<boolean> {
if (!document) {
if (!thePath) {
return Promise.resolve(false);
}
if (document.uri.fsPath.indexOf(vscode.window.forceCode.projectRoot + path.sep) === -1) {
const document: vscode.TextDocument = await vscode.workspace.openTextDocument(thePath);
if (document.fileName.indexOf(vscode.window.forceCode.projectRoot + path.sep) === -1) {
notifications.showError(
"The file you are trying to save to the server isn't in the current org's source folder (" +
vscode.window.forceCode.projectRoot +
@@ -87,9 +88,7 @@ export async function compile(
var exDiagnostics: vscode.Diagnostic[] = vscode.languages.getDiagnostics(document.uri);

const toolingType: string | undefined = getToolingTypeFromFolder(document.uri);
const ttMeta: forceCode.IMetadataObject | undefined = getAnyTTMetadataFromPath(
document.uri.fsPath
);
const ttMeta: forceCode.IMetadataObject | undefined = getAnyTTMetadataFromPath(document.fileName);
const folderToolingType: string | undefined = ttMeta?.xmlName;
const name: string | undefined = getName(document, toolingType);

Loading

0 comments on commit 464f0f0

Please sign in to comment.