From 92cb98c396b3ad09165cf486538f60fc6474bc03 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 14 Jan 2019 14:28:02 -0500 Subject: [PATCH] Fix --production builds (the new babel setup doesn't pipe things nicely to uglify), update dependencies, and update the traditional bootstrap --- gulpfile.js | 10 ++- package-lock.json | 117 +++++++++++------------------ package.json | 7 +- traditional-bootstrap/gulpfile.js | 10 ++- traditional-bootstrap/package.json | 35 +++++---- 5 files changed, 77 insertions(+), 102 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 3fb2f13..aa258ea 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -144,10 +144,12 @@ function processJavaScript(ouputFilename, inputFiles, es6) { .pipe(concat(`${ouputFilename}.js`)); if (es6) { - javascript.pipe(babel()); - } - - if (isProduction) { + if (isProduction) { + javascript.pipe(babel()).pipe(stripDebug()).pipe(uglify()); + } else { + javascript.pipe(babel()); + } + } else if (isProduction) { javascript.pipe(stripDebug()).pipe(uglify()); } diff --git a/package-lock.json b/package-lock.json index 7fb54f4..c6567fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -728,9 +728,9 @@ "dev": true }, "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -1078,15 +1078,15 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { - "version": "9.4.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.4.tgz", - "integrity": "sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==", + "version": "9.4.5", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.5.tgz", + "integrity": "sha512-M602C0ZxzFpJKqD4V6eq2j+K5CkzlhekCrcQupJmAOrPEZjWJyj/wSeo6qRSNoN6M3/9mtLPQqTTrABfReytQg==", "requires": { - "browserslist": "^4.3.7", - "caniuse-lite": "^1.0.30000926", + "browserslist": "^4.4.0", + "caniuse-lite": "^1.0.30000928", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.7", + "postcss": "^7.0.11", "postcss-value-parser": "^3.3.1" } }, @@ -1110,23 +1110,6 @@ "is-buffer": "^1.1.5" } }, - "babel-plugin-transform-runtime": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", - "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, "babelify": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", @@ -1674,12 +1657,12 @@ } }, "browserslist": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.7.tgz", - "integrity": "sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.0.tgz", + "integrity": "sha512-tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw==", "requires": { - "caniuse-lite": "^1.0.30000925", - "electron-to-chromium": "^1.3.96", + "caniuse-lite": "^1.0.30000928", + "electron-to-chromium": "^1.3.100", "node-releases": "^1.1.3" } }, @@ -2206,11 +2189,6 @@ "is-plain-object": "^2.0.1" } }, - "core-js": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz", - "integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==" - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -2783,9 +2761,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.100", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.100.tgz", - "integrity": "sha512-cEUzis2g/RatrVf8x26L8lK5VEls1AGnLHk6msluBUg/NTB4wcXzExTsGscFq+Vs4WBBU2zbLLySvD4C0C3hwg==" + "version": "1.3.102", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.102.tgz", + "integrity": "sha512-2nzZuXw/KBPnI3QX3UOCSRvJiVy7o9+VHRDQ3D/EHCvVc89X6aj/GlNmEgiR2GBIhmSWXIi4W1M5okA5ScSlNg==" }, "elliptic": { "version": "6.4.1", @@ -5182,9 +5160,9 @@ "integrity": "sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==" }, "js-levenshtein": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.5.tgz", - "integrity": "sha512-ap2aTez3WZASzMmJvgvG+nsrCCrtHPQ+4YB+WQjYQpXgLkM+WqwkpzdlVs5l7Xhk128I/CisIk4CdXl7pIchUA==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", + "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==" }, "js-tokens": { "version": "4.0.0", @@ -5370,9 +5348,9 @@ } }, "limiter": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.3.tgz", - "integrity": "sha512-zrycnIMsLw/3ZxTbW7HCez56rcFGecWTx5OZNplzcXUUmJLmoYArC6qdJzmAN5BWiNXGcpjhF9RQ1HSv5zebEw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.4.tgz", + "integrity": "sha512-XCpr5bElgDI65vVgstP8TWjv6/QKWm9GU5UG0Pr5sLQ3QLo8NVKsioe+Jed5/3vFOe3IQuqE7DKwTvKQkjTHvg==", "dev": true }, "load-json-file": { @@ -5569,9 +5547,9 @@ } }, "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.2.tgz", + "integrity": "sha512-Bp2Bx2wFaUymE7pWi0bbldiheIXMvyzC3hRkT5YAv2qiqqJO5VB8KafgYgZmGCxkTmloLuAx3Jv2OmJ66990mg==", "dev": true }, "md5.js": { @@ -6199,9 +6177,9 @@ } }, "pako": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz", - "integrity": "sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz", + "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==" }, "parents": { "version": "1.0.1", @@ -6440,13 +6418,13 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.8.tgz", - "integrity": "sha512-WudsIzuTKRw9IInRTPBgVXJ7DKR26HT09Rxp0g3w0Fqh3TUtYICcUmvC0xURj04o3vdcDtnjCAUCECg/p341iQ==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.11.tgz", + "integrity": "sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", - "supports-color": "^6.0.0" + "supports-color": "^6.1.0" }, "dependencies": { "source-map": { @@ -6455,9 +6433,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "requires": { "has-flag": "^3.0.0" } @@ -7047,11 +7025,6 @@ "regenerate": "^1.4.0" } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - }, "regenerator-transform": { "version": "0.13.3", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", @@ -8892,9 +8865,9 @@ "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==" }, "vue": { - "version": "2.5.21", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.21.tgz", - "integrity": "sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ==" + "version": "2.5.22", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz", + "integrity": "sha512-pxY3ZHlXNJMFQbkjEgGVMaMMkSV1ONpz+4qB55kZuJzyJOhn6MSy/YZdzhdnumegNzVTL/Dn3Pp4UrVBYt1j/g==" }, "vue-hot-reload-api": { "version": "2.3.1", @@ -8915,18 +8888,18 @@ "integrity": "sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg==" }, "vue-template-compiler": { - "version": "2.5.21", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz", - "integrity": "sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==", + "version": "2.5.22", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.22.tgz", + "integrity": "sha512-1VTw/NPTUeHNiwhkq6NkFzO7gYLjFCueBN0FX8NEiQIemd5EUMQ5hxrF7O0zCPo5tae+U9S/scETPea+hIz8Eg==", "requires": { "de-indent": "^1.0.2", "he": "^1.1.0" } }, "vue-template-es2015-compiler": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.7.0.tgz", - "integrity": "sha512-7qDGmPSK8zPQD3NlRZHKWbAbFiKt4UFYedbNINmqS7gXcjkgO/3Lg4LFx/axYLViLMZDVoPJox9mXKRcEqLl+A==" + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.1.tgz", + "integrity": "sha512-mxBBMuSaPG9+NkVMbh28r8gvWQJ8UXxqDxVNeLy2KBUZiSNxZsagjYwLL8gjROb4oaaYtwRv3K8gAmw76I/U7Q==" }, "vueify-next": { "version": "9.5.3", diff --git a/package.json b/package.json index 0b41699..4e3b4af 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "dependencies": { "@babel/core": "^7.2.2", "@babel/preset-env": "^7.2.3", - "autoprefixer": "^9.4.4", - "babel-plugin-transform-runtime": "^6.23.0", + "autoprefixer": "^9.4.5", "babelify": "^10.0.0", "bootstrap": "4.2.1", "browserify": "^16.2.3", @@ -34,10 +33,10 @@ "popper.js": "^1.14.6", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "vue": "^2.5.21", + "vue": "^2.5.22", "vue-resource": "^1.5.1", "vue-router": "^3.0.2", - "vue-template-compiler": "^2.5.21", + "vue-template-compiler": "^2.5.22", "vueify-next": "^9.5.3", "vuex": "^3.0.1", "vuex-router-sync": "^5.0.0", diff --git a/traditional-bootstrap/gulpfile.js b/traditional-bootstrap/gulpfile.js index 565e052..663d22b 100644 --- a/traditional-bootstrap/gulpfile.js +++ b/traditional-bootstrap/gulpfile.js @@ -124,10 +124,12 @@ function processJavaScript(ouputFilename, inputFiles, es6) { .pipe(concat(`${ouputFilename}.js`)); if (es6) { - javascript.pipe(babel()); - } - - if (isProduction) { + if (isProduction) { + javascript.pipe(babel()).pipe(stripDebug()).pipe(uglify()); + } else { + javascript.pipe(babel()); + } + } else if (isProduction) { javascript.pipe(stripDebug()).pipe(uglify()); } diff --git a/traditional-bootstrap/package.json b/traditional-bootstrap/package.json index dc9dfb0..e0355c5 100644 --- a/traditional-bootstrap/package.json +++ b/traditional-bootstrap/package.json @@ -5,32 +5,31 @@ "dev": "gulp default watch" }, "devDependencies": { - "browser-sync": "2.24.5" + "browser-sync": "2.26.3" }, "dependencies": { - "autoprefixer": "^8.6.4", - "babel-core": "^6.26.3", - "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-env": "^1.7.0", - "babelify": "^8.0.0", - "bootstrap": "4.1.1", - "es6-promise": "^4.2.4", - "fancy-log": "^1.3.2", - "gsap": "^2.0.1", + "@babel/core": "^7.2.2", + "@babel/preset-env": "^7.2.3", + "autoprefixer": "^9.4.5", + "babelify": "^10.0.0", + "bootstrap": "4.2.1", + "es6-promise": "^4.2.5", + "fancy-log": "^1.3.3", + "gsap": "^2.0.2", "gulp": "^4.0.0", - "gulp-babel": "^7.0.1", - "gulp-clean-css": "^3.9.4", + "gulp-babel": "^8.0.0", + "gulp-clean-css": "^4.0.0", "gulp-concat": "^2.6.1", - "gulp-plumber": "^1.2.0", - "gulp-postcss": "^7.0.1", - "gulp-sass": "^4.0.1", + "gulp-plumber": "^1.2.1", + "gulp-postcss": "^8.0.0", + "gulp-sass": "^4.0.2", "gulp-sass-glob": "^1.0.9", "gulp-strip-debug": "^3.0.0", - "gulp-uglify": "^3.0.0", + "gulp-uglify": "^3.0.1", "jquery": "^3.3.1", "minimist": "^1.2.0", "pickadate": "^3.5.6", - "popper.js": "^1.14.3", - "what-input": "^5.1.0" + "popper.js": "^1.14.6", + "what-input": "^5.1.3" } }