Skip to content

Commit

Permalink
Merge pull request #6 from CobusKruger/master
Browse files Browse the repository at this point in the history
Updated dependencies to use new version of @cobuskruger/combine-files.
  • Loading branch information
CobusKruger authored Apr 19, 2019
2 parents 403002a + e5a366e commit aa4e9b4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 26 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Nothing for now.

## [2.0.3] - 2019-04-19

Updated one of the upstream dependencies to fix a bug causing selected files being included in a file for every configuration.

## [2.0.2] - 2019-04-10

1. Enabled dynamic loading of configuration types.
Expand Down
30 changes: 7 additions & 23 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 @@ -3,7 +3,7 @@
"displayName": "Combine Files",
"description": "Create a single combined output file from several input files.",
"icon": "icons/main-icon.png",
"version": "2.0.2",
"version": "2.0.3",
"publisher": "BateleurIO",
"repository": "https://github.com/BateleurIO/vscode-combine-files.git",
"engines": {
Expand Down Expand Up @@ -252,7 +252,7 @@
"vscode": "^1.1.33"
},
"dependencies": {
"@cobuskruger/combine-files": "^1.0.4",
"@cobuskruger/combine-files": "^1.0.5",
"tmp": "0.0.33",
"url-parse": "^1.4.4"
}
Expand Down
1 change: 0 additions & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export function activate(context: vscode.ExtensionContext) {
}
}
const configLoader = new ConfigLoader({ fileGroups: configFileGroups });
// [vscodeConfig.sqlScripts, vscodeConfig.markdown, vscodeConfig.textFiles] });
const configFilePath = path.resolve(rootPath, '.combinefilesrc.json');
if (fs.existsSync(configFilePath)) {
configLoader.addConfigFile(configFilePath);
Expand Down

0 comments on commit aa4e9b4

Please sign in to comment.