Skip to content

Commit

Permalink
Merge pull request #226 from meltingice/mgenglder/update-lodash
Browse files Browse the repository at this point in the history
Update lodash to remove security vulnerability
  • Loading branch information
MgenGlder committed Sep 24, 2021
2 parents 80894fb + 28c09e4 commit d31af47
Show file tree
Hide file tree
Showing 12 changed files with 58,514 additions and 10,827 deletions.
16 changes: 16 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Tools
You'll need coffescriptnpm install -g coffee-script
`npm install -g coffee-script`

# Tests
There are none at the moment.

# Compiling
You can run `cake compile` to generate the /dist folder with the final psd.js file.

# Generating docs
You can run `cake docs:generate` to generate the docs folder with the documentation shown on the [githup pages site](https://meltingice.github.io/psd.js/).
NOTE: Current generating the docs seems throw a `ERR_INVALID_CALLBACK(callback);`.

# Run the examples
You can run the examples with the `npm run local-dev` command. This will spin up a local server where you can drag and drop filetypes and test functionality. You'll need `webpack`, `webpack-dev-server`, and `webpack-cli` for it to work. Make sure you check the file types before make a pull request to test that things are still working correctly.
29,541 changes: 18,797 additions & 10,744 deletions dist/psd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/psd.js.map

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions dist/psd.min.js

Large diffs are not rendered by default.

29,018 changes: 29,018 additions & 0 deletions examples/browser/dist/psd.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples/browser/dist/psd.js.map

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions examples/browser/dist/psd.min.js

Large diffs are not rendered by default.

67 changes: 0 additions & 67 deletions examples/browser/image.html

This file was deleted.

2 changes: 1 addition & 1 deletion lib/psd/channel_image.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = class ChannelImage extends Image
super(file, header)

@channelsInfo = @layer.channelsInfo
@hasMask = _.any @channelsInfo, (c) -> c.id < -1
@hasMask = _.some @channelsInfo, (c) -> c.id < -1
@opacity = @layer.opacity / 255.0

# Skip parsing this image by jumping to the end of the data.
Expand Down
Loading

0 comments on commit d31af47

Please sign in to comment.