Merge branch 'master' into refactor/splitcomponents

This commit is contained in:
Jia Hao 2016-01-23 10:22:22 +08:00
commit 9c0e65e89f
4 changed files with 13 additions and 3 deletions

7
.gitignore vendored
View File

@ -4,7 +4,12 @@
# Node.js
# ignore compiled lib files
lib
lib/*
app/lib/*
# commit a placeholder to keep the app/lib directory
!app/lib/.placeholder
dist
# Logs

View File

@ -1,4 +1,9 @@
6.5.6 / 2016-01-22
==================
* Workaround for windows `mkdir -p`, fixes #57
6.5.5 / 2016-01-22
==================

1
app/lib/.placeholder Normal file
View File

@ -0,0 +1 @@
Placeholder file here to commit the lib folder, as we cannot mkdir -p on Windows

View File

@ -1,6 +1,6 @@
{
"name": "nativefier",
"version": "6.5.5",
"version": "6.5.6",
"description": "Wrap web apps natively",
"keywords": [
"desktop",
@ -12,7 +12,6 @@
"main": "lib/buildApp.js",
"scripts": {
"dev-up": "npm install && (cd app && npm install)",
"postinstall": "mkdir -p app/lib",
"test": "echo \"Error: no test specified\" && exit 1",
"build-app": "browserify app/src/main.js --node --ignore-missing --detect-globals false --debug -o app/lib/main.js && cp -r app/src/static app/lib/static",
"build-module": "babel src -d lib",