@leverege/build-tools 2.4.4 → 2.4.5

package/lib/web/packleate/Packleator.js

@@ -6,12 +6,16 @@ require("core-js/modules/es.array.concat");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.array.index-of");
 
 require("core-js/modules/es.array.iterator");
 
 require("core-js/modules/es.object.get-own-property-descriptor");
 
+require("core-js/modules/es.object.get-own-property-descriptors");
+
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -42,7 +46,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -68,15 +74,13 @@ var tar = require('tar');
 
 var semver = require('semver');
 
-var Packleator =
-/*#__PURE__*/
-function () {
+var Packleator = /*#__PURE__*/function () {
   function Packleator(options) {
     _classCallCheck(this, Packleator);
 
     var args = options.args;
     this.privatePackages = new Set();
-    this.args = args ? _objectSpread({}, args, {
+    this.args = args ? _objectSpread(_objectSpread({}, args), {}, {
       output: args.output.substr(-1) === '/' ? args.output.substr(0, args.output.length) : args.output
     }) : {}; // args || {}
 
@@ -93,9 +97,7 @@ function () {
   _createClass(Packleator, [{
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee2() {
+      var _run = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var _this = this;
 
         var deps;
@@ -145,12 +147,8 @@ function () {
                       callback();
                     });
                   });
-                },
-                /*#__PURE__*/
-                function () {
-                  var _ref = _asyncToGenerator(
-                  /*#__PURE__*/
-                  regeneratorRuntime.mark(function _callee(err) {
+                }, /*#__PURE__*/function () {
+                  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err) {
                     var _this$outputPackageJs, name, version, fileName;
 
                     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -235,9 +233,7 @@ function () {
   }, {
     key: "rebuildPackageJson",
     value: function () {
-      var _rebuildPackageJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee3() {
+      var _rebuildPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
         var _this2 = this;
 
         var packageJson, tarredPackages, _packageJson$dependen, dependencies, _packageJson$devDepen, devDependencies;
@@ -284,9 +280,7 @@ function () {
   }, {
     key: "rebuildPackageLockJson",
     value: function () {
-      var _rebuildPackageLockJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee4() {
+      var _rebuildPackageLockJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
         var packageLockJson, tarredPackages, recurseDeps;
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
@@ -335,9 +329,7 @@ function () {
   }, {
     key: "copyFiles",
     value: function () {
-      var _copyFiles = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee5() {
+      var _copyFiles = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
         var _this3 = this;
 
         var startsWith, endsWith;
@@ -397,9 +389,7 @@ function () {
   }, {
     key: "pack",
     value: function () {
-      var _pack = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee6(name, version, dir) {
+      var _pack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(name, version, dir) {
         var fileName;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
@@ -450,9 +440,7 @@ function () {
   }, {
     key: "cleanup",
     value: function () {
-      var _cleanup = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee7() {
+      var _cleanup = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
         return regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -484,9 +472,7 @@ function () {
   }, {
     key: "npmInstall",
     value: function () {
-      var _npmInstall = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee8() {
+      var _npmInstall = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
         var _this4 = this;
 
         var dir,
@@ -540,9 +526,7 @@ function () {
   }, {
     key: "getPrivateDeps",
     value: function () {
-      var _getPrivateDeps = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee9(depth) {
+      var _getPrivateDeps = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(depth) {
         var _this5 = this;
 
         return regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -587,9 +571,7 @@ function () {
   }, {
     key: "getPackageJson",
     value: function () {
-      var _getPackageJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee10() {
+      var _getPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
         var dir,
             lock,
             lockModifier,

package/lib/web/packleate/index.js

@@ -3,12 +3,14 @@
 
 require("core-js/modules/es.symbol");
 
-require("core-js/modules/es.array.concat");
-
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
+require("core-js/modules/es.object.get-own-property-descriptors");
+
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -19,7 +21,9 @@ require("core-js/modules/web.dom-collections.for-each");
 
 require("regenerator-runtime/runtime");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -105,9 +109,7 @@ function main() {
 }
 
 function _main() {
-  _main = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
+  _main = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     var packleator;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -123,7 +125,7 @@ function _main() {
             break;
 
           case 4:
-            packleator = new Packleator(_objectSpread({}, defaultConfig, {
+            packleator = new Packleator(_objectSpread(_objectSpread({}, defaultConfig), {}, {
               args: args
             }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/dockreate

@@ -4,6 +4,9 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
+# Global Vars
+pluginFile="Dockerfile.plugin"
+
 # cleanup trapper for gracefully killing, which doesn't do much right now
 cleanup() {
   printf "\nCleaning up and exiting...\n\n"
@@ -50,7 +53,7 @@ create_Dockerfile() {
   local nodeimg="${2:-erbium-alpine}"
   local apkadds="${3}"
   echo "Creating the Dockerfile for node ${nodeimg}"
-  cat<<EODOCKER > Dockerfile
+  cat<<DOCKERBLD > Dockerfile
 # Version ${regvers} @ `date`
 #
 # The FROM directive sets the Base Image for subsequent instructions
@@ -86,6 +89,16 @@ RUN apk update && \
     apk add --no-cache tini bash vim ${apkadds} && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
     mkdir -p /usr/src/app /tmp/levlog
+DOCKERBLD
+
+  if [ -f "${pluginFile}" ];
+  then
+    printf "\n# ${pluginFile} BEGIN\n" >> Dockerfile
+    cat $pluginFile >> Dockerfile
+    printf "# ${pluginFile} END\n\n" >> Dockerfile
+  fi
+
+  cat<<EODOCKER >> Dockerfile
 ENTRYPOINT [ "/sbin/tini", "--" ]
 WORKDIR /usr/src/app
  
@@ -278,12 +291,16 @@ else
   tagstat=$(colorize 'red' 'BETA RELEASE WILL NOT BE TAGGED')
 fi
 
+pluggedIn=$(colorize 'green' "no")
+[ -f "${pluginFile}" ] && pluggedIn=$(colorize 'yellow' "YES")
+
 cat<<IMGINFO
 
   Project:   $(colorize 'green'  "$project")
   Container: $(colorize 'green'  "$container")
   NodeImage: $(colorize 'green'  "$nodeimg")
   AddedPkgs: $(colorize 'green'  "$apkadds")
+  PluggedIn: ${pluggedIn}
   Version:   $(colorize 'green'  "$version")  $tagstat
   Run User:  $(colorize 'green'  "$runuser")
   Previous:  $(colorize 'yellow' "$previous")

package/src/husky-run

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+printf "\n***** Running Husky Pre-Checks *****\n\n"
+
+sleep 3
+exit 1