diff --git a/Rakefile b/Rakefile index 7b905798..1fdb2545 100644 --- a/Rakefile +++ b/Rakefile @@ -61,24 +61,13 @@ task :compile => [:build_slim, :build_typescript] task :build => [:dep, :compile] -task :npm_publish => [:build] do - mkdir 'npm-publish' - %w(bower.json package.json build bin README.md).each{|p| cp_r p, 'npm-publish' } - cd 'npm-publish' do - sh 'bower install --production' - sh 'npm install --save electron-prebuilt' - sh 'npm publish' - end - rm_rf 'npm-publish' -end - task :prepare_release => [:build] do mkdir_p "archive" %w(bower.json package.json build).each{|p| cp_r p, 'archive' } cd 'archive' do sh 'npm install --production' sh 'bower install --production' - sh 'npm uninstall electron-prebuilt' + sh 'npm uninstall electron' end end @@ -97,7 +86,7 @@ task :package do end end - electron_json = JSON.load(File.open('node_modules/electron-prebuilt/package.json')) + electron_json = JSON.load(File.open('node_modules/electron/package.json')) electron_ver = electron_json['version'] app_json = JSON.load(File.open('package.json')) ver = app_json['version'] @@ -167,7 +156,7 @@ task :lint do end task :clean do - %w(npm-publish build/src build/static archive).each{|tmpdir| rm_rf tmpdir} + %w(build/src build/static archive).each{|tmpdir| rm_rf tmpdir} end task :watch do diff --git a/package.json b/package.json index 9d7a31d6..6e240475 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "shiba", "productName": "Shiba", - "version": "1.0.3", + "version": "1.0.4", "description": "Live markdown previewer with linter", "main": "./build/src/browser/mainu.js", "bin": { diff --git a/renderer/marked.d.ts b/renderer/marked.d.ts index 6cb5dabc..6bf358e9 100644 --- a/renderer/marked.d.ts +++ b/renderer/marked.d.ts @@ -1,6 +1,14 @@ // Generated by typings // Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/9cfdb11648f823b889287c770254b85b78a7a4a4/marked/marked.d.ts interface MarkedStatic { + Renderer: { + new(): MarkedRenderer; + }; + + Parser: { + new(options: MarkedOptions): MarkedParser; + }; + /** * Compiles markdown to HTML. * @@ -56,14 +64,6 @@ interface MarkedStatic { * @param options Hash of options */ setOptions(options: MarkedOptions): MarkedStatic; - - Renderer: { - new(): MarkedRenderer; - }; - - Parser: { - new(options: MarkedOptions): MarkedParser; - }; } interface MarkedRenderer {