Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #229 from yhatt/0.0.13
Browse files Browse the repository at this point in the history 
[Security update] 0.0.13
  • Loading branch information
@yhatt
yhatt authored Jun 14, 2018
2 parents e0eb239 + e372ee3 commit 70abebb
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 29 deletions.
1 change: 0 additions & 1 deletion .envrc
View file

This file was deleted.

4 changes: 2 additions & 2 deletions coffee/classes/mds_markdown.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ module.exports = class MdsMarkdown
(md) ->
mdElm = $("<div>#{md.parsed}</div>")

# Sanitize HTML import
mdElm.find('link[rel="import"]').remove()
# Sanitize link tag
mdElm.find('link:not([rel="stylesheet"])').remove()

mdElm.find('p > img[alt~="bg"]').each ->
$t = $(@)
Expand Down
5 changes: 0 additions & 5 deletions gulp.bat
View file

This file was deleted.

7 changes: 3 additions & 4 deletions gulpfile.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ packageOpts =
out: 'packages'
name: config.productName
version: config.devDependencies['electron']
prune: true
packageManager: 'yarn'
prune: false
overwrite: true
'app-bundle-id': 'jp.yhatt.marp'
'app-version': config.version
Expand Down Expand Up @@ -115,7 +114,7 @@ gulp.task 'dist', ['clean:dist'], ->
.pipe $.install
commands:
'package.json': 'yarn'
yarn: ['--production']
yarn: ['--production', '--ignore-optional', '--no-bin-links']

gulp.task 'package', ['clean:packages', 'dist'], (done) ->
runSequence 'package:win32', 'package:darwin', 'package:linux', done
Expand Down Expand Up @@ -172,7 +171,7 @@ gulp.task 'archive:darwin', (done) ->
null

unless appdmg
$.util.log 'Archiving for darwin is supported only OSX.'
$.util.log 'Archiving for darwin is supported only macOS.'
return done()

globFolders 'packages/*-darwin-*', (path, globDone) ->
Expand Down
6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marp",
"version": "0.0.12",
"version": "0.0.13",
"private": true,
"description": "Markdown Presentation Writer (Powered by Electron)",
"productName": "Marp",
Expand All @@ -16,7 +16,6 @@
"author": "Yuki Hattori",
"license": "MIT",
"devDependencies": {
"appdmg": "^0.5.2",
"coffee-script": "^1.10.0",
"del": "^3.0.0",
"electron": "1.8.4",
Expand Down Expand Up @@ -54,5 +53,8 @@
"path": "^0.12.7",
"photon": "github:connors/photon",
"twemoji": "^2.5.1"
},
"optionalDependencies": {
"appdmg": "^0.5.2"
}
}
2 changes: 1 addition & 1 deletion slide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="Content-Security-Policy" content="connect-src http: https:; child-src http: https:;" />
<meta http-equiv="Content-Security-Policy" content="connect-src http: https:; child-src http: https:; script-src http: https: 'unsafe-inline';" />

<title>Marp presentation</title>

Expand Down
52 changes: 38 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,24 +397,24 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"

buffer-alloc-unsafe@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a"
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"

buffer-alloc@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303"
version "1.2.0"
resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
dependencies:
buffer-alloc-unsafe "^0.1.0"
buffer-fill "^0.1.0"
buffer-alloc-unsafe "^1.1.0"
buffer-fill "^1.0.0"

buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"

buffer-fill@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
buffer-fill@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"

buffer-from@^0.1.1:
version "0.1.2"
Expand Down Expand Up @@ -2380,8 +2380,8 @@ lru-cache@2:
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"

lru-cache@^4.0.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
version "4.1.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
dependencies:
pseudomap "^1.0.2"
yallist "^2.1.2"
Expand Down Expand Up @@ -3390,7 +3390,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable
string_decoder "~1.0.0"
util-deprecate "~1.0.1"

readable-stream@^2.0.1, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.3.5:
readable-stream@^2.0.1, readable-stream@^2.1.5, readable-stream@^2.3.5:
version "2.3.5"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
dependencies:
Expand All @@ -3402,6 +3402,18 @@ readable-stream@^2.0.1, readable-stream@^2.1.4, readable-stream@^2.1.5, readable
string_decoder "~1.0.3"
util-deprecate "~1.0.1"

readable-stream@^2.1.4:
version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
isarray "~1.0.0"
process-nextick-args "~2.0.0"
safe-buffer "~5.1.1"
string_decoder "~1.1.1"
util-deprecate "~1.0.1"

rechoir@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
Expand Down Expand Up @@ -3752,6 +3764,12 @@ string_decoder@~1.0.0, string_decoder@~1.0.3:
dependencies:
safe-buffer "~5.1.0"

string_decoder@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
dependencies:
safe-buffer "~5.1.0"

stringstream@~0.0.4:
version "0.0.5"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
Expand Down Expand Up @@ -4126,12 +4144,18 @@ which@1, which@^1.2.12, which@^1.2.9:
dependencies:
isexe "^2.0.0"

which@^1.2.14, which@^1.2.8:
which@^1.2.14:
version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies:
isexe "^2.0.0"

which@^1.2.8:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
dependencies:
isexe "^2.0.0"

wide-align@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
Expand Down

0 comments on commit 70abebb

Please sign in to comment.