Skip to content

Commit

Permalink
Merge pull request #20 from Gelio/develop
Browse files Browse the repository at this point in the history
Release v2.1.1
  • Loading branch information
Gelio authored Jan 27, 2019
2 parents 2c2ef0f + ae68afa commit 38510d4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v2.1.1 (1/27/2019)

- Fix parsing `package.json` that does not have either `devDependencies` or `dependencies` at all.

## v2.1.0 (1/27/2019)

- Allow disabling treating native NodeJS modules as dependencies.
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tslint-import-group-ordering",
"version": "2.1.0",
"version": "2.1.1",
"description": "TSLint rule for ordering import groups",
"main": "tslint-import-group-ordering.json",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions src/utils/get-dependencies-reg-exps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ function readDependenciesFromPackageJson() {
try {
const parsedPackageJson = JSON.parse(packageJsonContents);

const dependencies = Object.keys(parsedPackageJson.dependencies);
const devDependencies = Object.keys(parsedPackageJson.devDependencies);
const dependencies = Object.keys(parsedPackageJson.dependencies || {});
const devDependencies = Object.keys(
parsedPackageJson.devDependencies || {}
);

return [...dependencies, ...devDependencies];
} catch (error) {
Expand Down

0 comments on commit 38510d4

Please sign in to comment.