Skip to content

Commit

Permalink
use native table by default, it's easier to set up; added npm release…
Browse files Browse the repository at this point in the history
… script
  • Loading branch information
michael-brade committed Oct 12, 2016
1 parent 57ea815 commit e480085
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions index.ls
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require! {
'./table/datatables': { Table }
# './table/native': { Table }
# './table/datatables': { Table }
'./table/native': { Table }
'derby-entities-lib/api': EntitiesApi
'derby-entities-lib/types': { supportedTypeComponents }
}
Expand Down
4 changes: 2 additions & 2 deletions index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $fa-font-path: '/fonts/font-awesome';

@import 'compass/css3/border-radius';

@mixin round-corners($radius, $adjust-top: 0px) {
@mixin round-corners($radius, $adjust-top: 0) {
&:first-child {
@include border-radius(($radius + $adjust-top) 0 0 $radius);
}
Expand All @@ -24,7 +24,7 @@ $fa-font-path: '/fonts/font-awesome';


// datatables
//@import './table/datatables';
// @import './table/datatables';

// native
@import './table/native';
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "derby-entity",
"description": "A Perfect DerbyJS CRUD Component",
"version": "1.2.0",
"version": "1.2.1",
"author": {
"name": "Michael Brade",
"email": "[email protected]"
Expand Down Expand Up @@ -33,11 +33,12 @@
"html-minifier": "3.x"
},
"scripts": {
"prebuild": "npm run clean; touch .create_stash && git stash save --include-untracked \"npm build stash\";",
"prebuild": "npm run clean;touch .create_stash && git stash save --include-untracked \"npm build stash\";npm test || { npm run postbuild; exit 1; };",
"build": "export DEST=dist;export SOURCES='*.ls';export VIEWS='*.html';export ASSETS='.*.scss|./README.md|./package.json';export IGNORE=\"./$DEST|./test|./node_modules\";echo \"\u001b[01;32mCompiling and minifying...\u001b[00m\";find -regextype posix-egrep -regex $IGNORE -prune -o -name \"$SOURCES\" -print0| xargs -n1 -P8 -0 sh -c 'echo $0...;mkdir -p \"$DEST/`dirname $0`\";lsc -cp \"$0\" | uglifyjs - -cm -o \"$DEST/${0%.*}.js\"';echo \"\u001b[01;32mMinifying views...\u001b[00m\";find -regextype posix-egrep -regex $IGNORE -prune -o -name \"$VIEWS\" -print0| xargs -n1 -P8 -0 sh -c 'echo \"$0 -> $DEST/$0\";mkdir -p \"$DEST/`dirname $0`\";html-minifier --config-file .html-minifierrc -o \"$DEST/$0\" \"$0\"'| column -t -c 3;echo \"\u001b[01;32mCopying assets...\u001b[00m\";find -regextype posix-egrep -regex $IGNORE -prune -o -regex $ASSETS -print0| xargs -n1 -0 sh -c 'echo \"$0 -> $DEST/$0\";mkdir -p \"$DEST/`dirname \"$0\"`\";cp -a \"$0\" \"$DEST/$0\"'| column -t -c 3;echo \"\u001b[01;32mDone!\u001b[00m\";",
"postbuild": "git stash pop --index && rm .create_stash;",
"clean": "rm -rf dist;",
"test": "echo \"TODO: no tests specified yet\" && exit 1;"
"test": "echo \"TODO: no tests specified yet\";",
"release": "npm run build; cd dist; npm publish;"
},
"engines": {
"node": ">= 4.x"
Expand Down
13 changes: 9 additions & 4 deletions package.json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: 'derby-entity'
description: 'A Perfect DerbyJS CRUD Component'
version: '1.2.0'
version: '1.2.1'

author:
name: 'Michael Brade'
Expand Down Expand Up @@ -45,7 +45,11 @@ scripts:

# make sure a stash will be created and stash everything not committed
# beware: --all would be really correct, but it also removes node_modules, so use --include-untracked instead
prebuild: 'npm run clean; touch .create_stash && git stash save --include-untracked "npm build stash";'
prebuild: '
npm run clean;
touch .create_stash && git stash save --include-untracked "npm build stash";
npm test || { npm run postbuild; exit 1; };
'

# build the distribution under dist: create directory structure, compile to JavaScript, uglify
# TODO: compile scss to dist/css
Expand Down Expand Up @@ -88,9 +92,10 @@ scripts:

## testing

test: "echo \"TODO: no tests specified yet\" && exit 1;"
test: 'echo "TODO: no tests specified yet";'

## publishing: run "npm run build; cd dist; npm publish"
## publishing
release: "npm run build; cd dist; npm publish;"

engines:
node: '>= 4.x'
Expand Down

0 comments on commit e480085

Please sign in to comment.