aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2018-01-08 19:42:29 +1100
committerSam Potts <me@sampotts.me>2018-01-08 19:42:29 +1100
commitf0322e8d94953ecc1373e31e34e31a24f7698079 (patch)
tree542bcf346a1997b60058803c99b0c852e2dbbc9a
parent3f2ac3fca00b5e5b3731e8e33fbe23b8b8050d26 (diff)
parent9872207e87dd4c1e3a0d5a589bff8fc6e4ff6cb7 (diff)
downloadplyr-f0322e8d94953ecc1373e31e34e31a24f7698079.tar.lz
plyr-f0322e8d94953ecc1373e31e34e31a24f7698079.tar.xz
plyr-f0322e8d94953ecc1373e31e34e31a24f7698079.zip
Merge branch 'develop' of github.com:sampotts/plyr into develop
-rw-r--r--gulpfile.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/gulpfile.js b/gulpfile.js
index ae48db56..c587bfec 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,7 +30,11 @@ const resolve = require('rollup-plugin-node-resolve');
const bundles = require('./bundles.json');
const pkg = require('./package.json');
-const aws = require('./aws.json');
+
+let aws;
+try {
+ aws = require('./aws.json');
+} catch (err) {}
// Paths
const root = __dirname;
@@ -240,7 +244,7 @@ const options = {
};
// If aws is setup
-if ('cdn' in aws) {
+if (aws && 'cdn' in aws) {
const regex = '(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*).(?:0|[1-9][0-9]*)(?:-[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?(?:\\+[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?';
const cdnpath = new RegExp(`${aws.cdn.domain}/${regex}`, 'gi');
const semver = new RegExp(`v${regex}`, 'gi');