Skip to content

Commit

Permalink
Fix issue #362 causing the Vlocode to break when build in CI/CD (issu…
Browse files Browse the repository at this point in the history
…e caused by tsconfig-paths-webpack-plugin bug)
  • Loading branch information
Codeneos committed Nov 7, 2021
1 parent 3ebb385 commit 9788183
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 25 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog Vlocity/Salesforce Integration for VSCode

## Version 0.16.15 - 2021-10-22
## Version 0.16.16 - 2021-11-07
- Fixed #362; issue with tsconfig-paths-webpack-plugin causing relative imports in modules to be incorrectly resolved to local files if they could be resolved locally

## Version 0.16.15 - 2021-11-04
- Add new feature to update profiles from the context menu; allows adding and removing of APEX Classes, VF Pages and CustomFields to locally versioned profiles
- Fixed issues with View-in-salesforce command not working properly for CustomObjects, CustomFields and CustomMetadata
- Renamed commands for consistency with official SF Extension
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vlocode",
"displayName": "Salesforce Vlocity Integration",
"description": "Salesforce and Vlocity development and deployment extension for VSCode",
"version": "0.16.15",
"version": "0.16.16",
"license": "MIT",
"icon": "resources/icon.png",
"author": {
Expand Down Expand Up @@ -1309,7 +1309,7 @@
"vsce": "^1.100.2",
"vscode-languageclient": "^7.0.0",
"vscode-test": "^1.6.1",
"webpack": "^5.61.0",
"webpack": "^5.62.1",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2",
"webpack-glob-entry": "^2.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vlocode/core",
"version": "0.16.15",
"version": "0.16.16",
"description": "Vlocode core IoC container framework library",
"main": "lib/index.js",
"readme": "../SITE.md",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"homepage": "https://github.com/Codeneos/vlocode#readme",
"dependencies": {
"@vlocode/util": "0.16.15",
"@vlocode/util": "0.16.16",
"chalk": "^4.1.2",
"globby": "^11.0.4",
"memfs": "^3.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vlocode/util",
"version": "0.16.15",
"version": "0.16.16",
"description": "Vlocode utility library",
"main": "lib/index.js",
"readme": "../SITE.md",
Expand Down
16 changes: 16 additions & 0 deletions patches/tsconfig-paths-webpack-plugin+3.5.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/node_modules/tsconfig-paths-webpack-plugin/lib/plugin.js b/node_modules/tsconfig-paths-webpack-plugin/lib/plugin.js
index 51c5502..1138970 100644
--- a/node_modules/tsconfig-paths-webpack-plugin/lib/plugin.js
+++ b/node_modules/tsconfig-paths-webpack-plugin/lib/plugin.js
@@ -70,8 +70,9 @@ function createPluginCallback(matchPath, resolver, absoluteBaseUrl, hook, extens
return (request, resolveContext, callback) => {
const innerRequest = getInnerRequest(resolver, request);
if (!innerRequest ||
- innerRequest.startsWith(".") ||
- innerRequest.startsWith("..")) {
+ !request || !request.request ||
+ request.request.startsWith(".") ||
+ request.request.startsWith("..")) {
return callback();
}
matchPath(innerRequest, readJsonAsync, fileExistAsync, extensions, (err, foundMatch) => {
3 changes: 1 addition & 2 deletions src/lib/vlocity/vlocityLogging.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Logger } from '@vlocode/core';
import * as util from '@vlocode/util';
import * as vlocityPackageManifest from 'vlocity/package.json';
import 'vlocity';
import 'vlocity/lib/vlocityutils';

// Import VlocityUtils as global from Vlocity NodeJS module
declare let VlocityUtils: {
Expand Down
4 changes: 0 additions & 4 deletions webpack.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ import { default as common } from './webpack.common';
const production: webpack.Configuration = {
mode: 'production',
devtool: false,
cache: {
type: 'filesystem',
cacheLocation: path.resolve(__dirname, '.webpack-cache', 'prod'),
},
optimization: {
mergeDuplicateChunks: true,
minimize: true,
Expand Down

0 comments on commit 9788183

Please sign in to comment.