Updated third party libs, license, updated async

Author: cloudcms

README.md

@@ -105,59 +105,44 @@ The command line for doing this is basically:
     git clone https://github.com/gitana/alpaca.git
 
 
-### Prerequisites
+### Build
 
-To build Alpaca, you will need to have Node.js, Gulp and Bower installed.  If you're new to Node.js or Gulp, you could
-check out this writeup - http://travismaynard.com/writing/getting-started-with-gulp.
-
-Once you have Node.js installed, you essentially need to do this:
-
-    npm install -g gulp
-    npm install -g bower
-
-Alpaca requires python 2.7.x to build some of it's node_module dependencies.  Make sure you have this installed.
-If you're currently using Python 3.x, you will need to tell the build to use 2.7.x:
-
-    npm install --python=python2.7
-    (or)
-    npm config set python python2.7
-
-
-### Building Alpaca
+To build Alpaca, you will need to have Node.js installed.
 
 Building Alpaca is pretty easy.  Just run:
 
     npm install
+    
+And then:
 
-This will do the following for you:
+    npm run build
+    
+This will build to `build/alpaca`
 
-- pull down all of the Node module dependencies
-- run Bower to pull down client-side (browser) dependencies
+To clean the build:
 
-To then build, you can do this:
+    npm run clean
+    
 
-    npm start
+### Building the Web Site
 
-If you want to use Gulp directly, you can alternatively run this:
+To build the web site, you will also need to have Python and Jekyll installed (as global dependencies).
 
-    gulp clean default
+You will then also need to install the `redcarpet` and `pygments.rb` gems, sort of like this:
 
-Either ```npm start``` or ```gulp clean default``` will build everything.
-The build distribution assets will be in ```build/alpaca```.
+    gem install redcarpet
+    gem install pygments.rb
 
+Then run:    
 
-### Building the Web Site and Running a local Web Server
+    npm run site
 
-Alpaca includes a web site along with documentation, samples and much more.
-To build the web site, you will first need to install Jekyll (not covered here).
 
-Simply do this:
-
-    gulp site
+### Running a Local Web Server
 
 And you can run a local web server like this:
 
-    gulp server
+    npm run server
 
 
 ### Alpaca Distributions
@@ -174,27 +159,6 @@ Each directory contains a JS file and a CSS file for its respective build.
 Each JS file is UMD ready and will work within both an AMD and CommonJS container.
 
 
-### Troubleshooting
-
-If you run into any Bower related issues during the build, you might want to clear out your Bower cache using this
-command:
-
-    bower cache clean
-
-And then try again.
-
-
-### Manual build commands
-
-While ```npm install``` will pretty much do everything for you, there are also some manual commands you can run if you
-need to perform individual steps:
-
-- To install Bower assets, do ```bower install```
-- To clear Bower cache, do ```bower cache clean```
-- To run the Gulp build, do ```gulp```
-- To build the Alpaca web site, do ```gulp default server```
-- To run a local Alpaca web server, ```gulp default server```
-
 
 ## Contributors
 

config/license.txt.template

@@ -1,7 +1,7 @@
 /*!
 Alpaca <%= version %>
 
-Copyright 2016 Gitana Software, Inc.
+Copyright 2019 Gitana Software, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); 
 you may not use this file except in compliance with the License. 

gulpfile.js

@@ -42,6 +42,7 @@ var paths = {
             "thirdparty/base/Base.js",
 
             "src/js/Alpaca.js",
+            "src/js/Alpaca-async.js",
             "src/js/ObservableUtils.js",
             "src/js/Observables.js",
             "src/js/Observable.js",
@@ -411,23 +412,16 @@ gulp.task("build-scripts", function(cb) {
                 .pipe(wrapUmd(web_wrap))
                 .pipe(gulp.dest('build/alpaca/web'))
                 .pipe(concat('alpaca.min.js'))
-                .pipe(uglify())
+                //.pipe(uglify())
                 .pipe(gulp.dest('build/alpaca/web')),
-            /*
-            gulp.src(paths.scripts.web)
-                .pipe(concat('alpaca-nobuilder.js'))
-                .pipe(wrap(web_wrap))
-                .pipe(stripper())
-                .pipe(gulp.dest('build/alpaca/web')),
-            */
 
             // bootstrap
             gulp.src(paths.scripts.bootstrap)
                 .pipe(concat('alpaca.js'))
                 .pipe(wrapUmd(bootstrap_wrap))
                 .pipe(gulp.dest('build/alpaca/bootstrap'))
                 .pipe(concat('alpaca.min.js'))
-                .pipe(uglify())
+                //.pipe(uglify())
                 .pipe(gulp.dest('build/alpaca/bootstrap')),
 
             // jqueryui
@@ -436,7 +430,7 @@ gulp.task("build-scripts", function(cb) {
                 .pipe(wrapUmd(jqueryui_warp))
                 .pipe(gulp.dest('build/alpaca/jqueryui'))
                 .pipe(concat('alpaca.min.js'))
-                .pipe(uglify())
+                //.pipe(uglify())
                 .pipe(gulp.dest('build/alpaca/jqueryui')),
 
             // jquerymobile
@@ -445,7 +439,7 @@ gulp.task("build-scripts", function(cb) {
                 .pipe(wrapUmd(jquerymobile_wrap))
                 .pipe(gulp.dest('build/alpaca/jquerymobile'))
                 .pipe(concat('alpaca.min.js'))
-                .pipe(uglify())
+                //.pipe(uglify())
                 .pipe(gulp.dest('build/alpaca/jquerymobile'))
 
         ).pipe(es.wait(function() {

license.txt

@@ -1,7 +1,7 @@
 /*!
 Alpaca 1.5.24
 
-Copyright 2016 Gitana Software, Inc.
+Copyright 2019 Gitana Software, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); 
 you may not use this file except in compliance with the License. 

package.json

@@ -1,9 +1,10 @@
 {
   "name": "alpaca",
   "scripts": {
-    "postinstall": "./node_modules/.bin/bower install --force",
-    "postupdate": "./node_modules/.bin/bower update",
-    "start": "./node_modules/.bin/gulp clean default"
+    "build": "./node_modules/gulp/bin/gulp.js default",
+    "site": "./node_modules/gulp/bin/gulp.js site",
+    "server": "./node_modules/gulp/bin/gulp.js server",
+    "clean": "./node_modules/gulp/bin/gulp.js clean"
   },
   "repository": {
     "type": "git",
@@ -13,49 +14,48 @@
   "version": "1.5.24",
   "main": "dist/alpaca/bootstrap/alpaca.js",
   "devDependencies": {
-    "bower": "*",
-    "stream-browserify": "*",
+    "bower": "^1.8.4",
     "cucumber": "~0.3.3",
-    "event-stream": "*",
-    "express": "3.5.1",
-    "handlebars": "4.0.5",
-    "grunt": "~0.4.x",
-    "grunt-aws-s3": "^0.9.4",
-    "grunt-cloudfront": "^0.2.0",
-    "grunt-invalidate-cloudfront": "^0.1.5",
-    "grunt-jsdoc": "^0.6.1",
-    "gulp": "*",
-    "gulp-awspublish": "0.0.23",
-    "gulp-bump": "^0.1.11",
-    "gulp-clean": "*",
-    "gulp-concat": "*",
-    "gulp-declare": "*",
-    "gulp-handlebars": "4.0.0",
-    "gulp-jshint": "*",
-    "gulp-minify-css": "*",
-    "gulp-nodemon": "*",
-    "gulp-notify": "*",
-    "gulp-order": "*",
-    "gulp-rename": "*",
-    "gulp-template": "^3.1.0",
-    "gulp-uglify": "*",
-    "gulp-util": "*",
-    "gulp-watch": "*",
-    "gulp-wrap": "^0.11.0",
-    "gulp-wrap-umd": "^0.2.0",
-    "jquery": "*",
+    "event-stream": "^4.0.1",
+    "express": "^4.16.4",
+    "grunt": "^1.0.3",
+    "grunt-aws-s3": "^2.0.0",
+    "grunt-cloudfront": "^0.2.2",
+    "grunt-invalidate-cloudfront": "^1.0.0",
+    "grunt-jsdoc": "^2.3.0",
+    "gulp": "^3.9.1",
+    "gulp-awspublish": "^3.4.0",
+    "gulp-bump": "^3.1.1",
+    "gulp-clean": "^0.4.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-declare": "^0.3.0",
+    "gulp-handlebars": "^5.0.2",
+    "gulp-jshint": "^2.1.0",
+    "gulp-minify-css": "^1.2.4",
+    "gulp-nodemon": "^2.4.2",
+    "gulp-notify": "^3.2.0",
+    "gulp-order": "^1.2.0",
+    "gulp-rename": "^1.4.0",
+    "gulp-template": "^5.0.0",
+    "gulp-uglify": "^3.0.1",
+    "gulp-util": "^3.0.8",
+    "gulp-watch": "^5.0.1",
+    "gulp-wrap": "^0.14.0",
+    "gulp-wrap-umd": "^0.2.1",
+    "handlebars": "^4.0.12",
+    "jquery": "^3.3.1",
     "jsdom": "^9.12.0",
-    "jshint": "*",
-    "jshint-stylish": "*",
-    "lodash": "*",
-    "node-gyp": "*",
-    "node-static": "*",
-    "phantom": "0.6.3",
-    "q": "^1.0.1",
-    "run-sequence": "*",
-    "through2": "*",
-    "wd": "*",
-    "wrench": "*"
-  },
-  "dependencies": {}
+    "jshint": "^2.9.7",
+    "jshint-stylish": "^2.2.1",
+    "lodash": "^4.17.11",
+    "node-gyp": "^3.8.0",
+    "node-static": "^0.7.11",
+    "phantom": "^6.0.3",
+    "q": "^1.5.1",
+    "run-sequence": "^2.2.1",
+    "stream-browserify": "^2.0.1",
+    "through2": "^3.0.0",
+    "wd": "^1.11.1",
+    "wrench": "^1.5.9"
+  }
 }

server/webserver.js

@@ -1,17 +1,22 @@
-var path    = require('path');
-var express = require('express');
+var path = require("path");
+var express = require("express");
 
-var app       = express();
-var publicDir = path.join(__dirname, '..', 'build', 'web');
-var port      = process.env.PORT || 9999;
+var port = process.env.PORT || 9999;
 
-app.configure(function() {
-    app.use(express.json());
-    app.use(express.urlencoded());
-});
+var app = express();
+
+var publicDir = path.join(__dirname, '..', 'build', 'web');
 
 app.use(express.static(publicDir));
 
 app.listen(port, function() {
     console.log('App is now listening on port: ' + port);
 });
+
+/*
+app.configure(function() {
+    app.use(express.json());
+    app.use(express.urlencoded());
+});
+
+ */