@lookit/templates 1.0.0 → 1.1.0

package/dist/index.browser.js

@@ -85,17 +85,17 @@ var chsTemplates = (function () {
 	// Sourced from lodash
 	// https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
 	/* eslint-disable func-style */
-	var isFunction$1 = function isFunction(value) {
+	var isFunction = function isFunction(value) {
 	  return typeof value === 'function';
 	};
 	// fallback for older versions of Chrome and Safari
 	/* istanbul ignore next */
-	if (isFunction$1(/x/)) {
-	  utils.isFunction = isFunction$1 = function (value) {
+	if (isFunction(/x/)) {
+	  utils.isFunction = isFunction = function (value) {
 	    return typeof value === 'function' && toString.call(value) === '[object Function]';
 	  };
 	}
-	utils.isFunction = isFunction$1;
+	utils.isFunction = isFunction;
 
 	/* eslint-enable func-style */
 
@@ -8821,123 +8821,7 @@ var chsTemplates = (function () {
 	    }
 	}
 
-	const consoleLogger = {
-	  type: 'logger',
-	  log(args) {
-	    this.output('log', args);
-	  },
-	  warn(args) {
-	    this.output('warn', args);
-	  },
-	  error(args) {
-	    this.output('error', args);
-	  },
-	  output(type, args) {
-	    if (console && console[type]) console[type].apply(console, args);
-	  }
-	};
-	class Logger {
-	  constructor(concreteLogger) {
-	    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-	    this.init(concreteLogger, options);
-	  }
-	  init(concreteLogger) {
-	    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-	    this.prefix = options.prefix || 'i18next:';
-	    this.logger = concreteLogger || consoleLogger;
-	    this.options = options;
-	    this.debug = options.debug;
-	  }
-	  log() {
-	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-	      args[_key] = arguments[_key];
-	    }
-	    return this.forward(args, 'log', '', true);
-	  }
-	  warn() {
-	    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-	      args[_key2] = arguments[_key2];
-	    }
-	    return this.forward(args, 'warn', '', true);
-	  }
-	  error() {
-	    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-	      args[_key3] = arguments[_key3];
-	    }
-	    return this.forward(args, 'error', '');
-	  }
-	  deprecate() {
-	    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-	      args[_key4] = arguments[_key4];
-	    }
-	    return this.forward(args, 'warn', 'WARNING DEPRECATED: ', true);
-	  }
-	  forward(args, lvl, prefix, debugOnly) {
-	    if (debugOnly && !this.debug) return null;
-	    if (typeof args[0] === 'string') args[0] = `${prefix}${this.prefix} ${args[0]}`;
-	    return this.logger[lvl](args);
-	  }
-	  create(moduleName) {
-	    return new Logger(this.logger, {
-	      ...{
-	        prefix: `${this.prefix}:${moduleName}:`
-	      },
-	      ...this.options
-	    });
-	  }
-	  clone(options) {
-	    options = options || this.options;
-	    options.prefix = options.prefix || this.prefix;
-	    return new Logger(this.logger, options);
-	  }
-	}
-	var baseLogger = new Logger();
-
-	class EventEmitter {
-	  constructor() {
-	    this.observers = {};
-	  }
-	  on(events, listener) {
-	    events.split(' ').forEach(event => {
-	      if (!this.observers[event]) this.observers[event] = new Map();
-	      const numListeners = this.observers[event].get(listener) || 0;
-	      this.observers[event].set(listener, numListeners + 1);
-	    });
-	    return this;
-	  }
-	  off(event, listener) {
-	    if (!this.observers[event]) return;
-	    if (!listener) {
-	      delete this.observers[event];
-	      return;
-	    }
-	    this.observers[event].delete(listener);
-	  }
-	  emit(event) {
-	    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-	      args[_key - 1] = arguments[_key];
-	    }
-	    if (this.observers[event]) {
-	      const cloned = Array.from(this.observers[event].entries());
-	      cloned.forEach(_ref => {
-	        let [observer, numTimesAdded] = _ref;
-	        for (let i = 0; i < numTimesAdded; i++) {
-	          observer(...args);
-	        }
-	      });
-	    }
-	    if (this.observers['*']) {
-	      const cloned = Array.from(this.observers['*'].entries());
-	      cloned.forEach(_ref2 => {
-	        let [observer, numTimesAdded] = _ref2;
-	        for (let i = 0; i < numTimesAdded; i++) {
-	          observer.apply(observer, [event, ...args]);
-	        }
-	      });
-	    }
-	  }
-	}
-
+	const isString = obj => typeof obj === 'string';
 	const defer = () => {
 	  let res;
 	  let rej;
@@ -8960,9 +8844,9 @@ var chsTemplates = (function () {
 	};
 	const lastOfPathSeparatorRegExp = /###/g;
 	const cleanKey = key => key && key.indexOf('###') > -1 ? key.replace(lastOfPathSeparatorRegExp, '.') : key;
-	const canNotTraverseDeeper = object => !object || typeof object === 'string';
+	const canNotTraverseDeeper = object => !object || isString(object);
 	const getLastOfPath$1 = (object, path, Empty) => {
-	  const stack = typeof path !== 'string' ? path : path.split('.');
+	  const stack = !isString(path) ? path : path.split('.');
 	  let stackIndex = 0;
 	  while (stackIndex < stack.length - 1) {
 	    if (canNotTraverseDeeper(object)) return {};
@@ -9030,7 +8914,7 @@ var chsTemplates = (function () {
 	  for (const prop in source) {
 	    if (prop !== '__proto__' && prop !== 'constructor') {
 	      if (prop in target) {
-	        if (typeof target[prop] === 'string' || target[prop] instanceof String || typeof source[prop] === 'string' || source[prop] instanceof String) {
+	        if (isString(target[prop]) || target[prop] instanceof String || isString(source[prop]) || source[prop] instanceof String) {
 	          if (overwrite) target[prop] = source[prop];
 	        } else {
 	          deepExtend(target[prop], source[prop], overwrite);
@@ -9052,7 +8936,7 @@ var chsTemplates = (function () {
 	  '/': '&#x2F;'
 	};
 	const escape = data => {
-	  if (typeof data === 'string') {
+	  if (isString(data)) {
 	    return data.replace(/[&<>"'\/]/g, s => _entityMap[s]);
 	  }
 	  return data;
@@ -9124,10 +9008,124 @@ var chsTemplates = (function () {
 	  }
 	  return current;
 	};
-	const getCleanedCode = code => {
-	  if (code && code.indexOf('_') > 0) return code.replace('_', '-');
-	  return code;
+	const getCleanedCode = code => code && code.replace('_', '-');
+
+	const consoleLogger = {
+	  type: 'logger',
+	  log(args) {
+	    this.output('log', args);
+	  },
+	  warn(args) {
+	    this.output('warn', args);
+	  },
+	  error(args) {
+	    this.output('error', args);
+	  },
+	  output(type, args) {
+	    if (console && console[type]) console[type].apply(console, args);
+	  }
 	};
+	class Logger {
+	  constructor(concreteLogger) {
+	    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    this.init(concreteLogger, options);
+	  }
+	  init(concreteLogger) {
+	    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    this.prefix = options.prefix || 'i18next:';
+	    this.logger = concreteLogger || consoleLogger;
+	    this.options = options;
+	    this.debug = options.debug;
+	  }
+	  log() {
+	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+	      args[_key] = arguments[_key];
+	    }
+	    return this.forward(args, 'log', '', true);
+	  }
+	  warn() {
+	    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+	      args[_key2] = arguments[_key2];
+	    }
+	    return this.forward(args, 'warn', '', true);
+	  }
+	  error() {
+	    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+	      args[_key3] = arguments[_key3];
+	    }
+	    return this.forward(args, 'error', '');
+	  }
+	  deprecate() {
+	    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+	      args[_key4] = arguments[_key4];
+	    }
+	    return this.forward(args, 'warn', 'WARNING DEPRECATED: ', true);
+	  }
+	  forward(args, lvl, prefix, debugOnly) {
+	    if (debugOnly && !this.debug) return null;
+	    if (isString(args[0])) args[0] = `${prefix}${this.prefix} ${args[0]}`;
+	    return this.logger[lvl](args);
+	  }
+	  create(moduleName) {
+	    return new Logger(this.logger, {
+	      ...{
+	        prefix: `${this.prefix}:${moduleName}:`
+	      },
+	      ...this.options
+	    });
+	  }
+	  clone(options) {
+	    options = options || this.options;
+	    options.prefix = options.prefix || this.prefix;
+	    return new Logger(this.logger, options);
+	  }
+	}
+	var baseLogger = new Logger();
+
+	class EventEmitter {
+	  constructor() {
+	    this.observers = {};
+	  }
+	  on(events, listener) {
+	    events.split(' ').forEach(event => {
+	      if (!this.observers[event]) this.observers[event] = new Map();
+	      const numListeners = this.observers[event].get(listener) || 0;
+	      this.observers[event].set(listener, numListeners + 1);
+	    });
+	    return this;
+	  }
+	  off(event, listener) {
+	    if (!this.observers[event]) return;
+	    if (!listener) {
+	      delete this.observers[event];
+	      return;
+	    }
+	    this.observers[event].delete(listener);
+	  }
+	  emit(event) {
+	    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+	      args[_key - 1] = arguments[_key];
+	    }
+	    if (this.observers[event]) {
+	      const cloned = Array.from(this.observers[event].entries());
+	      cloned.forEach(_ref => {
+	        let [observer, numTimesAdded] = _ref;
+	        for (let i = 0; i < numTimesAdded; i++) {
+	          observer(...args);
+	        }
+	      });
+	    }
+	    if (this.observers['*']) {
+	      const cloned = Array.from(this.observers['*'].entries());
+	      cloned.forEach(_ref2 => {
+	        let [observer, numTimesAdded] = _ref2;
+	        for (let i = 0; i < numTimesAdded; i++) {
+	          observer.apply(observer, [event, ...args]);
+	        }
+	      });
+	    }
+	  }
+	}
 
 	class ResourceStore extends EventEmitter {
 	  constructor(data) {
@@ -9168,7 +9166,7 @@ var chsTemplates = (function () {
 	      if (key) {
 	        if (Array.isArray(key)) {
 	          path.push(...key);
-	        } else if (typeof key === 'string' && keySeparator) {
+	        } else if (isString(key) && keySeparator) {
 	          path.push(...key.split(keySeparator));
 	        } else {
 	          path.push(key);
@@ -9181,7 +9179,7 @@ var chsTemplates = (function () {
 	      ns = path[1];
 	      key = path.slice(2).join('.');
 	    }
-	    if (result || !ignoreJSONStructure || typeof key !== 'string') return result;
+	    if (result || !ignoreJSONStructure || !isString(key)) return result;
 	    return deepFind(this.data && this.data[lng] && this.data[lng][ns], key, keySeparator);
 	  }
 	  addResource(lng, ns, key, value) {
@@ -9205,7 +9203,7 @@ var chsTemplates = (function () {
 	      silent: false
 	    };
 	    for (const m in resources) {
-	      if (typeof resources[m] === 'string' || Array.isArray(resources[m])) this.addResource(lng, ns, m, resources[m], {
+	      if (isString(resources[m]) || Array.isArray(resources[m])) this.addResource(lng, ns, m, resources[m], {
 	        silent: true
 	      });
 	    }
@@ -9325,7 +9323,7 @@ var chsTemplates = (function () {
 	      if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
 	      key = parts.join(keySeparator);
 	    }
-	    if (typeof namespaces === 'string') namespaces = [namespaces];
+	    if (isString(namespaces)) namespaces = [namespaces];
 	    return {
 	      key,
 	      namespaces
@@ -9385,8 +9383,8 @@ var chsTemplates = (function () {
 	    const noObject = ['[object Number]', '[object Function]', '[object RegExp]'];
 	    const joinArrays = options.joinArrays !== undefined ? options.joinArrays : this.options.joinArrays;
 	    const handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
-	    const handleAsObject = typeof res !== 'string' && typeof res !== 'boolean' && typeof res !== 'number';
-	    if (handleAsObjectInI18nFormat && res && handleAsObject && noObject.indexOf(resType) < 0 && !(typeof joinArrays === 'string' && Array.isArray(res))) {
+	    const handleAsObject = !isString(res) && typeof res !== 'boolean' && typeof res !== 'number';
+	    if (handleAsObjectInI18nFormat && res && handleAsObject && noObject.indexOf(resType) < 0 && !(isString(joinArrays) && Array.isArray(res))) {
 	      if (!options.returnObjects && !this.options.returnObjects) {
 	        if (!this.options.returnedObjectHandler) {
 	          this.logger.warn('accessing an object - but returnObjects options is not enabled!');
@@ -9421,13 +9419,13 @@ var chsTemplates = (function () {
 	        }
 	        res = copy;
 	      }
-	    } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && Array.isArray(res)) {
+	    } else if (handleAsObjectInI18nFormat && isString(joinArrays) && Array.isArray(res)) {
 	      res = res.join(joinArrays);
 	      if (res) res = this.extendTranslation(res, keys, options, lastKey);
 	    } else {
 	      let usedDefault = false;
 	      let usedKey = false;
-	      const needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
+	      const needsPluralHandling = options.count !== undefined && !isString(options.count);
 	      const hasDefaultValue = Translator.hasDefaultValue(options);
 	      const defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : '';
 	      const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
@@ -9527,13 +9525,13 @@ var chsTemplates = (function () {
 	          }
 	        }
 	      });
-	      const skipOnVariables = typeof res === 'string' && (options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
+	      const skipOnVariables = isString(res) && (options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
 	      let nestBef;
 	      if (skipOnVariables) {
 	        const nb = res.match(this.interpolator.nestingRegexp);
 	        nestBef = nb && nb.length;
 	      }
-	      let data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
+	      let data = options.replace && !isString(options.replace) ? options.replace : options;
 	      if (this.options.interpolation.defaultVariables) data = {
 	        ...this.options.interpolation.defaultVariables,
 	        ...data
@@ -9558,7 +9556,7 @@ var chsTemplates = (function () {
 	      if (options.interpolation) this.interpolator.reset();
 	    }
 	    const postProcess = options.postProcess || this.options.postProcess;
-	    const postProcessorNames = typeof postProcess === 'string' ? [postProcess] : postProcess;
+	    const postProcessorNames = isString(postProcess) ? [postProcess] : postProcess;
 	    if (res !== undefined && res !== null && postProcessorNames && postProcessorNames.length && options.applyPostProcessor !== false) {
 	      res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? {
 	        i18nResolved: {
@@ -9577,7 +9575,7 @@ var chsTemplates = (function () {
 	    let exactUsedKey;
 	    let usedLng;
 	    let usedNS;
-	    if (typeof keys === 'string') keys = [keys];
+	    if (isString(keys)) keys = [keys];
 	    keys.forEach(k => {
 	      if (this.isValidLookup(found)) return;
 	      const extracted = this.extractFromKey(k, options);
@@ -9585,9 +9583,9 @@ var chsTemplates = (function () {
 	      usedKey = key;
 	      let namespaces = extracted.namespaces;
 	      if (this.options.fallbackNS) namespaces = namespaces.concat(this.options.fallbackNS);
-	      const needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
+	      const needsPluralHandling = options.count !== undefined && !isString(options.count);
 	      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
-	      const needsContextHandling = options.context !== undefined && (typeof options.context === 'string' || typeof options.context === 'number') && options.context !== '';
+	      const needsContextHandling = options.context !== undefined && (isString(options.context) || typeof options.context === 'number') && options.context !== '';
 	      const codes = options.lngs ? options.lngs : this.languageUtils.toResolveHierarchy(options.lng || this.language, options.fallbackLng);
 	      namespaces.forEach(ns => {
 	        if (this.isValidLookup(found)) return;
@@ -9659,7 +9657,7 @@ var chsTemplates = (function () {
 	  getUsedParamsDetails() {
 	    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	    const optionsKeys = ['defaultValue', 'ordinal', 'context', 'replace', 'lng', 'lngs', 'fallbackLng', 'ns', 'keySeparator', 'nsSeparator', 'returnObjects', 'returnDetails', 'joinArrays', 'postProcess', 'interpolation'];
-	    const useOptionsReplaceForData = options.replace && typeof options.replace !== 'string';
+	    const useOptionsReplaceForData = options.replace && !isString(options.replace);
 	    let data = useOptionsReplaceForData ? options.replace : options;
 	    if (useOptionsReplaceForData && typeof options.count !== 'undefined') {
 	      data.count = options.count;
@@ -9714,7 +9712,16 @@ var chsTemplates = (function () {
 	    return this.formatLanguageCode(p[0]);
 	  }
 	  formatLanguageCode(code) {
-	    if (typeof code === 'string' && code.indexOf('-') > -1) {
+	    if (isString(code) && code.indexOf('-') > -1) {
+	      if (typeof Intl !== 'undefined' && typeof Intl.getCanonicalLocales !== 'undefined') {
+	        try {
+	          let formattedCode = Intl.getCanonicalLocales(code)[0];
+	          if (formattedCode && this.options.lowerCaseLng) {
+	            formattedCode = formattedCode.toLowerCase();
+	          }
+	          if (formattedCode) return formattedCode;
+	        } catch (e) {}
+	      }
 	      const specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab'];
 	      let p = code.split('-');
 	      if (this.options.lowerCaseLng) {
@@ -9767,7 +9774,7 @@ var chsTemplates = (function () {
 	  getFallbackCodes(fallbacks, code) {
 	    if (!fallbacks) return [];
 	    if (typeof fallbacks === 'function') fallbacks = fallbacks(code);
-	    if (typeof fallbacks === 'string') fallbacks = [fallbacks];
+	    if (isString(fallbacks)) fallbacks = [fallbacks];
 	    if (Array.isArray(fallbacks)) return fallbacks;
 	    if (!code) return fallbacks.default || [];
 	    let found = fallbacks[code];
@@ -9788,11 +9795,11 @@ var chsTemplates = (function () {
 	        this.logger.warn(`rejecting language code not found in supportedLngs: ${c}`);
 	      }
 	    };
-	    if (typeof code === 'string' && (code.indexOf('-') > -1 || code.indexOf('_') > -1)) {
+	    if (isString(code) && (code.indexOf('-') > -1 || code.indexOf('_') > -1)) {
 	      if (this.options.load !== 'languageOnly') addCode(this.formatLanguageCode(code));
 	      if (this.options.load !== 'languageOnly' && this.options.load !== 'currentOnly') addCode(this.getScriptPartFromCode(code));
 	      if (this.options.load !== 'currentOnly') addCode(this.getLanguagePartFromCode(code));
-	    } else if (typeof code === 'string') {
+	    } else if (isString(code)) {
 	      addCode(this.formatLanguageCode(code));
 	    }
 	    fallbackCodes.forEach(fc => {
@@ -10050,7 +10057,7 @@ var chsTemplates = (function () {
 	  let keySeparator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '.';
 	  let ignoreJSONStructure = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
 	  let path = getPathWithDefaults(data, defaultData, key);
-	  if (!path && ignoreJSONStructure && typeof key === 'string') {
+	  if (!path && ignoreJSONStructure && isString(key)) {
 	    path = deepFind(data, key, keySeparator);
 	    if (path === undefined) path = deepFind(defaultData, key, keySeparator);
 	  }
@@ -10160,7 +10167,7 @@ var chsTemplates = (function () {
 	        if (value === undefined) {
 	          if (typeof missingInterpolationHandler === 'function') {
 	            const temp = missingInterpolationHandler(str, match, options);
-	            value = typeof temp === 'string' ? temp : '';
+	            value = isString(temp) ? temp : '';
 	          } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
 	            value = '';
 	          } else if (skipOnVariables) {
@@ -10170,7 +10177,7 @@ var chsTemplates = (function () {
 	            this.logger.warn(`missed to pass in variable ${matchedVar} for interpolating ${str}`);
 	            value = '';
 	          }
-	        } else if (typeof value !== 'string' && !this.useRawValueToEscape) {
+	        } else if (!isString(value) && !this.useRawValueToEscape) {
 	          value = makeString(value);
 	        }
 	        const safeValue = todo.safeValue(value);
@@ -10224,7 +10231,7 @@ var chsTemplates = (function () {
 	      clonedOptions = {
 	        ...options
 	      };
-	      clonedOptions = clonedOptions.replace && typeof clonedOptions.replace !== 'string' ? clonedOptions.replace : clonedOptions;
+	      clonedOptions = clonedOptions.replace && !isString(clonedOptions.replace) ? clonedOptions.replace : clonedOptions;
 	      clonedOptions.applyPostProcessor = false;
 	      delete clonedOptions.defaultValue;
 	      let doReduce = false;
@@ -10235,8 +10242,8 @@ var chsTemplates = (function () {
 	        doReduce = true;
 	      }
 	      value = fc(handleHasOptions.call(this, match[1].trim(), clonedOptions), clonedOptions);
-	      if (value && match[0] === str && typeof value !== 'string') return value;
-	      if (typeof value !== 'string') value = makeString(value);
+	      if (value && match[0] === str && !isString(value)) return value;
+	      if (!isString(value)) value = makeString(value);
 	      if (!value) {
 	        this.logger.warn(`missed to resolve ${match[1]} for nesting ${str}`);
 	        value = '';
@@ -10348,8 +10355,7 @@ var chsTemplates = (function () {
 	    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
 	      interpolation: {}
 	    };
-	    const iOpts = options.interpolation;
-	    this.formatSeparator = iOpts.formatSeparator ? iOpts.formatSeparator : iOpts.formatSeparator || ',';
+	    this.formatSeparator = options.interpolation.formatSeparator || ',';
 	  }
 	  add(name, fc) {
 	    this.formats[name.toLowerCase().trim()] = fc;
@@ -10550,8 +10556,8 @@ var chsTemplates = (function () {
 	      this.logger.warn('No backend was added via i18next.use. Will not load resources.');
 	      return callback && callback();
 	    }
-	    if (typeof languages === 'string') languages = this.languageUtils.toResolveHierarchy(languages);
-	    if (typeof namespaces === 'string') namespaces = [namespaces];
+	    if (isString(languages)) languages = this.languageUtils.toResolveHierarchy(languages);
+	    if (isString(namespaces)) namespaces = [namespaces];
 	    const toLoad = this.queueLoad(languages, namespaces, options, callback);
 	    if (!toLoad.toLoad.length) {
 	      if (!toLoad.pending.length) callback();
@@ -10655,8 +10661,8 @@ var chsTemplates = (function () {
 	  overloadTranslationOptionHandler: args => {
 	    let ret = {};
 	    if (typeof args[1] === 'object') ret = args[1];
-	    if (typeof args[1] === 'string') ret.defaultValue = args[1];
-	    if (typeof args[2] === 'string') ret.tDescription = args[2];
+	    if (isString(args[1])) ret.defaultValue = args[1];
+	    if (isString(args[2])) ret.tDescription = args[2];
 	    if (typeof args[2] === 'object' || typeof args[3] === 'object') {
 	      const options = args[3] || args[2];
 	      Object.keys(options).forEach(key => {
@@ -10680,9 +10686,9 @@ var chsTemplates = (function () {
 	  }
 	});
 	const transformOptions = options => {
-	  if (typeof options.ns === 'string') options.ns = [options.ns];
-	  if (typeof options.fallbackLng === 'string') options.fallbackLng = [options.fallbackLng];
-	  if (typeof options.fallbackNS === 'string') options.fallbackNS = [options.fallbackNS];
+	  if (isString(options.ns)) options.ns = [options.ns];
+	  if (isString(options.fallbackLng)) options.fallbackLng = [options.fallbackLng];
+	  if (isString(options.fallbackNS)) options.fallbackNS = [options.fallbackNS];
 	  if (options.supportedLngs && options.supportedLngs.indexOf('cimode') < 0) {
 	    options.supportedLngs = options.supportedLngs.concat(['cimode']);
 	  }
@@ -10730,7 +10736,7 @@ var chsTemplates = (function () {
 	      options = {};
 	    }
 	    if (!options.defaultNS && options.defaultNS !== false && options.ns) {
-	      if (typeof options.ns === 'string') {
+	      if (isString(options.ns)) {
 	        options.defaultNS = options.ns;
 	      } else if (options.ns.indexOf('translation') < 0) {
 	        options.defaultNS = options.ns[0];
@@ -10863,7 +10869,7 @@ var chsTemplates = (function () {
 	  loadResources(language) {
 	    let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
 	    let usedCallback = callback;
-	    const usedLng = typeof language === 'string' ? language : this.language;
+	    const usedLng = isString(language) ? language : this.language;
 	    if (typeof language === 'function') usedCallback = language;
 	    if (!this.options.resources || this.options.partialBundledLanguages) {
 	      if (usedLng && usedLng.toLowerCase() === 'cimode' && (!this.options.preload || this.options.preload.length === 0)) return usedCallback();
@@ -10981,7 +10987,7 @@ var chsTemplates = (function () {
 	    };
 	    const setLng = lngs => {
 	      if (!lng && !lngs && this.services.languageDetector) lngs = [];
-	      const l = typeof lngs === 'string' ? lngs : this.services.languageUtils.getBestMatchFromCodes(lngs);
+	      const l = isString(lngs) ? lngs : this.services.languageUtils.getBestMatchFromCodes(lngs);
 	      if (l) {
 	        if (!this.language) {
 	          setLngProps(l);
@@ -11033,7 +11039,7 @@ var chsTemplates = (function () {
 	      }
 	      return _this3.t(resultKey, options);
 	    };
-	    if (typeof lng === 'string') {
+	    if (isString(lng)) {
 	      fixedT.lng = lng;
 	    } else {
 	      fixedT.lngs = lng;
@@ -11084,7 +11090,7 @@ var chsTemplates = (function () {
 	      if (callback) callback();
 	      return Promise.resolve();
 	    }
-	    if (typeof ns === 'string') ns = [ns];
+	    if (isString(ns)) ns = [ns];
 	    ns.forEach(n => {
 	      if (this.options.ns.indexOf(n) < 0) this.options.ns.push(n);
 	    });
@@ -11096,7 +11102,7 @@ var chsTemplates = (function () {
 	  }
 	  loadLanguages(lngs, callback) {
 	    const deferred = defer();
-	    if (typeof lngs === 'string') lngs = [lngs];
+	    if (isString(lngs)) lngs = [lngs];
 	    const preloaded = this.options.preload || [];
 	    const newLngs = lngs.filter(lng => preloaded.indexOf(lng) < 0 && this.services.languageUtils.isSupportedCode(lng));
 	    if (!newLngs.length) {
@@ -13484,7 +13490,7 @@ var chsTemplates = (function () {
 	            }
 	            return obj;
 	        };
-	var codePointAt = hasNativeCodePointAt
+	var codePointAt$1 = hasNativeCodePointAt
 	    ? // Native
 	        function codePointAt(s, index) {
 	            return s.codePointAt(index);
@@ -13544,7 +13550,7 @@ var chsTemplates = (function () {
 	    matchIdentifierAtIndex = function matchIdentifierAtIndex(s, index) {
 	        var match = [];
 	        while (true) {
-	            var c = codePointAt(s, index);
+	            var c = codePointAt$1(s, index);
 	            if (c === undefined || _isWhiteSpace(c) || _isPatternSyntax(c)) {
 	                break;
 	            }
@@ -14261,7 +14267,7 @@ var chsTemplates = (function () {
 	        if (offset >= this.message.length) {
 	            throw Error('out of bound');
 	        }
-	        var code = codePointAt(this.message, offset);
+	        var code = codePointAt$1(this.message, offset);
 	        if (code === undefined) {
 	            throw Error("Offset ".concat(offset, " is at invalid UTF-16 code unit boundary"));
 	        }
@@ -15363,12 +15369,7 @@ var chsTemplates = (function () {
 
 	ICU.type = 'i18nFormat';
 
-	var jsYaml$1 = {};
-
-	var loader$1 = {};
-
-	var common$6 = {};
-
+	/*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
 	function isNothing(subject) {
 	  return (typeof subject === 'undefined') || (subject === null);
 	}
@@ -15419,21 +15420,52 @@ var chsTemplates = (function () {
 	}
 
 
-	common$6.isNothing      = isNothing;
-	common$6.isObject       = isObject;
-	common$6.toArray        = toArray;
-	common$6.repeat         = repeat;
-	common$6.isNegativeZero = isNegativeZero;
-	common$6.extend         = extend;
+	var isNothing_1      = isNothing;
+	var isObject_1       = isObject;
+	var toArray_1        = toArray;
+	var repeat_1         = repeat;
+	var isNegativeZero_1 = isNegativeZero;
+	var extend_1         = extend;
 
-	function YAMLException$4(reason, mark) {
+	var common = {
+		isNothing: isNothing_1,
+		isObject: isObject_1,
+		toArray: toArray_1,
+		repeat: repeat_1,
+		isNegativeZero: isNegativeZero_1,
+		extend: extend_1
+	};
+
+	// YAML error class. http://stackoverflow.com/questions/8458984
+
+
+	function formatError(exception, compact) {
+	  var where = '', message = exception.reason || '(unknown reason)';
+
+	  if (!exception.mark) return message;
+
+	  if (exception.mark.name) {
+	    where += 'in "' + exception.mark.name + '" ';
+	  }
+
+	  where += '(' + (exception.mark.line + 1) + ':' + (exception.mark.column + 1) + ')';
+
+	  if (!compact && exception.mark.snippet) {
+	    where += '\n\n' + exception.mark.snippet;
+	  }
+
+	  return message + ' ' + where;
+	}
+
+
+	function YAMLException$1(reason, mark) {
 	  // Super constructor
 	  Error.call(this);
 
 	  this.name = 'YAMLException';
 	  this.reason = reason;
 	  this.mark = mark;
-	  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');
+	  this.message = formatError(this, false);
 
 	  // Include stack trace in error object
 	  if (Error.captureStackTrace) {
@@ -15447,108 +15479,122 @@ var chsTemplates = (function () {
 
 
 	// Inherit from Error
-	YAMLException$4.prototype = Object.create(Error.prototype);
-	YAMLException$4.prototype.constructor = YAMLException$4;
+	YAMLException$1.prototype = Object.create(Error.prototype);
+	YAMLException$1.prototype.constructor = YAMLException$1;
 
 
-	YAMLException$4.prototype.toString = function toString(compact) {
-	  var result = this.name + ': ';
+	YAMLException$1.prototype.toString = function toString(compact) {
+	  return this.name + ': ' + formatError(this, compact);
+	};
 
-	  result += this.reason || '(unknown reason)';
 
-	  if (!compact && this.mark) {
-	    result += ' ' + this.mark.toString();
-	  }
+	var exception = YAMLException$1;
 
-	  return result;
-	};
+	// get snippet for a single line, respecting maxLength
+	function getLine(buffer, lineStart, lineEnd, position, maxLineLength) {
+	  var head = '';
+	  var tail = '';
+	  var maxHalfLength = Math.floor(maxLineLength / 2) - 1;
 
+	  if (position - lineStart > maxHalfLength) {
+	    head = ' ... ';
+	    lineStart = position - maxHalfLength + head.length;
+	  }
 
-	var exception = YAMLException$4;
+	  if (lineEnd - position > maxHalfLength) {
+	    tail = ' ...';
+	    lineEnd = position + maxHalfLength - tail.length;
+	  }
 
-	var common$5 = common$6;
+	  return {
+	    str: head + buffer.slice(lineStart, lineEnd).replace(/\t/g, '→') + tail,
+	    pos: position - lineStart + head.length // relative position
+	  };
+	}
 
 
-	function Mark$1(name, buffer, position, line, column) {
-	  this.name     = name;
-	  this.buffer   = buffer;
-	  this.position = position;
-	  this.line     = line;
-	  this.column   = column;
+	function padStart(string, max) {
+	  return common.repeat(' ', max - string.length) + string;
 	}
 
 
-	Mark$1.prototype.getSnippet = function getSnippet(indent, maxLength) {
-	  var head, start, tail, end, snippet;
+	function makeSnippet(mark, options) {
+	  options = Object.create(options || null);
 
-	  if (!this.buffer) return null;
+	  if (!mark.buffer) return null;
 
-	  indent = indent || 4;
-	  maxLength = maxLength || 75;
+	  if (!options.maxLength) options.maxLength = 79;
+	  if (typeof options.indent      !== 'number') options.indent      = 1;
+	  if (typeof options.linesBefore !== 'number') options.linesBefore = 3;
+	  if (typeof options.linesAfter  !== 'number') options.linesAfter  = 2;
 
-	  head = '';
-	  start = this.position;
-
-	  while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {
-	    start -= 1;
-	    if (this.position - start > (maxLength / 2 - 1)) {
-	      head = ' ... ';
-	      start += 5;
-	      break;
-	    }
-	  }
+	  var re = /\r?\n|\r|\0/g;
+	  var lineStarts = [ 0 ];
+	  var lineEnds = [];
+	  var match;
+	  var foundLineNo = -1;
 
-	  tail = '';
-	  end = this.position;
+	  while ((match = re.exec(mark.buffer))) {
+	    lineEnds.push(match.index);
+	    lineStarts.push(match.index + match[0].length);
 
-	  while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) {
-	    end += 1;
-	    if (end - this.position > (maxLength / 2 - 1)) {
-	      tail = ' ... ';
-	      end -= 5;
-	      break;
+	    if (mark.position <= match.index && foundLineNo < 0) {
+	      foundLineNo = lineStarts.length - 2;
 	    }
 	  }
 
-	  snippet = this.buffer.slice(start, end);
-
-	  return common$5.repeat(' ', indent) + head + snippet + tail + '\n' +
-	         common$5.repeat(' ', indent + this.position - start + head.length) + '^';
-	};
+	  if (foundLineNo < 0) foundLineNo = lineStarts.length - 1;
 
+	  var result = '', i, line;
+	  var lineNoLength = Math.min(mark.line + options.linesAfter, lineEnds.length).toString().length;
+	  var maxLineLength = options.maxLength - (options.indent + lineNoLength + 3);
 
-	Mark$1.prototype.toString = function toString(compact) {
-	  var snippet, where = '';
-
-	  if (this.name) {
-	    where += 'in "' + this.name + '" ';
+	  for (i = 1; i <= options.linesBefore; i++) {
+	    if (foundLineNo - i < 0) break;
+	    line = getLine(
+	      mark.buffer,
+	      lineStarts[foundLineNo - i],
+	      lineEnds[foundLineNo - i],
+	      mark.position - (lineStarts[foundLineNo] - lineStarts[foundLineNo - i]),
+	      maxLineLength
+	    );
+	    result = common.repeat(' ', options.indent) + padStart((mark.line - i + 1).toString(), lineNoLength) +
+	      ' | ' + line.str + '\n' + result;
 	  }
 
-	  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);
-
-	  if (!compact) {
-	    snippet = this.getSnippet();
+	  line = getLine(mark.buffer, lineStarts[foundLineNo], lineEnds[foundLineNo], mark.position, maxLineLength);
+	  result += common.repeat(' ', options.indent) + padStart((mark.line + 1).toString(), lineNoLength) +
+	    ' | ' + line.str + '\n';
+	  result += common.repeat('-', options.indent + lineNoLength + 3 + line.pos) + '^' + '\n';
 
-	    if (snippet) {
-	      where += ':\n' + snippet;
-	    }
+	  for (i = 1; i <= options.linesAfter; i++) {
+	    if (foundLineNo + i >= lineEnds.length) break;
+	    line = getLine(
+	      mark.buffer,
+	      lineStarts[foundLineNo + i],
+	      lineEnds[foundLineNo + i],
+	      mark.position - (lineStarts[foundLineNo] - lineStarts[foundLineNo + i]),
+	      maxLineLength
+	    );
+	    result += common.repeat(' ', options.indent) + padStart((mark.line + i + 1).toString(), lineNoLength) +
+	      ' | ' + line.str + '\n';
 	  }
 
-	  return where;
-	};
-
+	  return result.replace(/\n$/, '');
+	}
 
-	var mark = Mark$1;
 
-	var YAMLException$3 = exception;
+	var snippet = makeSnippet;
 
 	var TYPE_CONSTRUCTOR_OPTIONS = [
 	  'kind',
+	  'multi',
 	  'resolve',
 	  'construct',
 	  'instanceOf',
 	  'predicate',
 	  'represent',
+	  'representName',
 	  'defaultStyle',
 	  'styleAliases'
 	];
@@ -15573,60 +15619,61 @@ var chsTemplates = (function () {
 	  return result;
 	}
 
-	function Type$h(tag, options) {
+	function Type$1(tag, options) {
 	  options = options || {};
 
 	  Object.keys(options).forEach(function (name) {
 	    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {
-	      throw new YAMLException$3('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
+	      throw new exception('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
 	    }
 	  });
 
 	  // TODO: Add tag format check.
-	  this.tag          = tag;
-	  this.kind         = options['kind']         || null;
-	  this.resolve      = options['resolve']      || function () { return true; };
-	  this.construct    = options['construct']    || function (data) { return data; };
-	  this.instanceOf   = options['instanceOf']   || null;
-	  this.predicate    = options['predicate']    || null;
-	  this.represent    = options['represent']    || null;
-	  this.defaultStyle = options['defaultStyle'] || null;
-	  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);
+	  this.options       = options; // keep original options in case user wants to extend this type later
+	  this.tag           = tag;
+	  this.kind          = options['kind']          || null;
+	  this.resolve       = options['resolve']       || function () { return true; };
+	  this.construct     = options['construct']     || function (data) { return data; };
+	  this.instanceOf    = options['instanceOf']    || null;
+	  this.predicate     = options['predicate']     || null;
+	  this.represent     = options['represent']     || null;
+	  this.representName = options['representName'] || null;
+	  this.defaultStyle  = options['defaultStyle']  || null;
+	  this.multi         = options['multi']         || false;
+	  this.styleAliases  = compileStyleAliases(options['styleAliases'] || null);
 
 	  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {
-	    throw new YAMLException$3('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
+	    throw new exception('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
 	  }
 	}
 
-	var type = Type$h;
+	var type = Type$1;
 
 	/*eslint-disable max-len*/
 
-	var common$4        = common$6;
-	var YAMLException$2 = exception;
-	var Type$g          = type;
 
 
-	function compileList(schema, name, result) {
-	  var exclude = [];
 
-	  schema.include.forEach(function (includedSchema) {
-	    result = compileList(includedSchema, name, result);
-	  });
+
+	function compileList(schema, name) {
+	  var result = [];
 
 	  schema[name].forEach(function (currentType) {
+	    var newIndex = result.length;
+
 	    result.forEach(function (previousType, previousIndex) {
-	      if (previousType.tag === currentType.tag && previousType.kind === currentType.kind) {
-	        exclude.push(previousIndex);
+	      if (previousType.tag === currentType.tag &&
+	          previousType.kind === currentType.kind &&
+	          previousType.multi === currentType.multi) {
+
+	        newIndex = previousIndex;
 	      }
 	    });
 
-	    result.push(currentType);
+	    result[newIndex] = currentType;
 	  });
 
-	  return result.filter(function (type, index) {
-	    return exclude.indexOf(index) === -1;
-	  });
+	  return result;
 	}
 
 
@@ -15635,11 +15682,22 @@ var chsTemplates = (function () {
 	        scalar: {},
 	        sequence: {},
 	        mapping: {},
-	        fallback: {}
+	        fallback: {},
+	        multi: {
+	          scalar: [],
+	          sequence: [],
+	          mapping: [],
+	          fallback: []
+	        }
 	      }, index, length;
 
 	  function collectType(type) {
-	    result[type.kind][type.tag] = result['fallback'][type.tag] = type;
+	    if (type.multi) {
+	      result.multi[type.kind].push(type);
+	      result.multi['fallback'].push(type);
+	    } else {
+	      result[type.kind][type.tag] = result['fallback'][type.tag] = type;
+	    }
 	  }
 
 	  for (index = 0, length = arguments.length; index < length; index += 1) {
@@ -15649,89 +15707,84 @@ var chsTemplates = (function () {
 	}
 
 
-	function Schema$5(definition) {
-	  this.include  = definition.include  || [];
-	  this.implicit = definition.implicit || [];
-	  this.explicit = definition.explicit || [];
-
-	  this.implicit.forEach(function (type) {
-	    if (type.loadKind && type.loadKind !== 'scalar') {
-	      throw new YAMLException$2('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
-	    }
-	  });
-
-	  this.compiledImplicit = compileList(this, 'implicit', []);
-	  this.compiledExplicit = compileList(this, 'explicit', []);
-	  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);
+	function Schema$1(definition) {
+	  return this.extend(definition);
 	}
 
 
-	Schema$5.DEFAULT = null;
+	Schema$1.prototype.extend = function extend(definition) {
+	  var implicit = [];
+	  var explicit = [];
 
+	  if (definition instanceof type) {
+	    // Schema.extend(type)
+	    explicit.push(definition);
 
-	Schema$5.create = function createSchema() {
-	  var schemas, types;
+	  } else if (Array.isArray(definition)) {
+	    // Schema.extend([ type1, type2, ... ])
+	    explicit = explicit.concat(definition);
 
-	  switch (arguments.length) {
-	    case 1:
-	      schemas = Schema$5.DEFAULT;
-	      types = arguments[0];
-	      break;
-
-	    case 2:
-	      schemas = arguments[0];
-	      types = arguments[1];
-	      break;
+	  } else if (definition && (Array.isArray(definition.implicit) || Array.isArray(definition.explicit))) {
+	    // Schema.extend({ explicit: [ type1, type2, ... ], implicit: [ type1, type2, ... ] })
+	    if (definition.implicit) implicit = implicit.concat(definition.implicit);
+	    if (definition.explicit) explicit = explicit.concat(definition.explicit);
 
-	    default:
-	      throw new YAMLException$2('Wrong number of arguments for Schema.create function');
+	  } else {
+	    throw new exception('Schema.extend argument should be a Type, [ Type ], ' +
+	      'or a schema definition ({ implicit: [...], explicit: [...] })');
 	  }
 
-	  schemas = common$4.toArray(schemas);
-	  types = common$4.toArray(types);
+	  implicit.forEach(function (type$1) {
+	    if (!(type$1 instanceof type)) {
+	      throw new exception('Specified list of YAML types (or a single Type object) contains a non-Type object.');
+	    }
 
-	  if (!schemas.every(function (schema) { return schema instanceof Schema$5; })) {
-	    throw new YAMLException$2('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');
-	  }
+	    if (type$1.loadKind && type$1.loadKind !== 'scalar') {
+	      throw new exception('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
+	    }
 
-	  if (!types.every(function (type) { return type instanceof Type$g; })) {
-	    throw new YAMLException$2('Specified list of YAML types (or a single Type object) contains a non-Type object.');
-	  }
+	    if (type$1.multi) {
+	      throw new exception('There is a multi type in the implicit list of a schema. Multi tags can only be listed as explicit.');
+	    }
+	  });
 
-	  return new Schema$5({
-	    include: schemas,
-	    explicit: types
+	  explicit.forEach(function (type$1) {
+	    if (!(type$1 instanceof type)) {
+	      throw new exception('Specified list of YAML types (or a single Type object) contains a non-Type object.');
+	    }
 	  });
-	};
 
+	  var result = Object.create(Schema$1.prototype);
 
-	var schema = Schema$5;
+	  result.implicit = (this.implicit || []).concat(implicit);
+	  result.explicit = (this.explicit || []).concat(explicit);
 
-	var Type$f = type;
+	  result.compiledImplicit = compileList(result, 'implicit');
+	  result.compiledExplicit = compileList(result, 'explicit');
+	  result.compiledTypeMap  = compileMap(result.compiledImplicit, result.compiledExplicit);
+
+	  return result;
+	};
 
-	var str = new Type$f('tag:yaml.org,2002:str', {
+
+	var schema = Schema$1;
+
+	var str = new type('tag:yaml.org,2002:str', {
 	  kind: 'scalar',
 	  construct: function (data) { return data !== null ? data : ''; }
 	});
 
-	var Type$e = type;
-
-	var seq = new Type$e('tag:yaml.org,2002:seq', {
+	var seq = new type('tag:yaml.org,2002:seq', {
 	  kind: 'sequence',
 	  construct: function (data) { return data !== null ? data : []; }
 	});
 
-	var Type$d = type;
-
-	var map = new Type$d('tag:yaml.org,2002:map', {
+	var map = new type('tag:yaml.org,2002:map', {
 	  kind: 'mapping',
 	  construct: function (data) { return data !== null ? data : {}; }
 	});
 
-	var Schema$4 = schema;
-
-
-	var failsafe = new Schema$4({
+	var failsafe = new schema({
 	  explicit: [
 	    str,
 	    seq,
@@ -15739,8 +15792,6 @@ var chsTemplates = (function () {
 	  ]
 	});
 
-	var Type$c = type;
-
 	function resolveYamlNull(data) {
 	  if (data === null) return true;
 
@@ -15758,7 +15809,7 @@ var chsTemplates = (function () {
 	  return object === null;
 	}
 
-	var _null = new Type$c('tag:yaml.org,2002:null', {
+	var _null = new type('tag:yaml.org,2002:null', {
 	  kind: 'scalar',
 	  resolve: resolveYamlNull,
 	  construct: constructYamlNull,
@@ -15767,13 +15818,12 @@ var chsTemplates = (function () {
 	    canonical: function () { return '~';    },
 	    lowercase: function () { return 'null'; },
 	    uppercase: function () { return 'NULL'; },
-	    camelcase: function () { return 'Null'; }
+	    camelcase: function () { return 'Null'; },
+	    empty:     function () { return '';     }
 	  },
 	  defaultStyle: 'lowercase'
 	});
 
-	var Type$b = type;
-
 	function resolveYamlBoolean(data) {
 	  if (data === null) return false;
 
@@ -15793,7 +15843,7 @@ var chsTemplates = (function () {
 	  return Object.prototype.toString.call(object) === '[object Boolean]';
 	}
 
-	var bool = new Type$b('tag:yaml.org,2002:bool', {
+	var bool = new type('tag:yaml.org,2002:bool', {
 	  kind: 'scalar',
 	  resolve: resolveYamlBoolean,
 	  construct: constructYamlBoolean,
@@ -15806,9 +15856,6 @@ var chsTemplates = (function () {
 	  defaultStyle: 'lowercase'
 	});
 
-	var common$3 = common$6;
-	var Type$a   = type;
-
 	function isHexCode(c) {
 	  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||
 	         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||
@@ -15874,17 +15921,22 @@ var chsTemplates = (function () {
 	      return hasDigits && ch !== '_';
 	    }
 
-	    // base 8
-	    for (; index < max; index++) {
-	      ch = data[index];
-	      if (ch === '_') continue;
-	      if (!isOctCode(data.charCodeAt(index))) return false;
-	      hasDigits = true;
+
+	    if (ch === 'o') {
+	      // base 8
+	      index++;
+
+	      for (; index < max; index++) {
+	        ch = data[index];
+	        if (ch === '_') continue;
+	        if (!isOctCode(data.charCodeAt(index))) return false;
+	        hasDigits = true;
+	      }
+	      return hasDigits && ch !== '_';
 	    }
-	    return hasDigits && ch !== '_';
 	  }
 
-	  // base 10 (except 0) or base 60
+	  // base 10 (except 0)
 
 	  // value should not start with `_`;
 	  if (ch === '_') return false;
@@ -15892,7 +15944,6 @@ var chsTemplates = (function () {
 	  for (; index < max; index++) {
 	    ch = data[index];
 	    if (ch === '_') continue;
-	    if (ch === ':') break;
 	    if (!isDecCode(data.charCodeAt(index))) {
 	      return false;
 	    }
@@ -15902,15 +15953,11 @@ var chsTemplates = (function () {
 	  // Should have digits and should not end with `_`
 	  if (!hasDigits || ch === '_') return false;
 
-	  // if !base60 - done;
-	  if (ch !== ':') return true;
-
-	  // base60 almost not used, no needs to optimize
-	  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));
+	  return true;
 	}
 
 	function constructYamlInteger(data) {
-	  var value = data, sign = 1, ch, base, digits = [];
+	  var value = data, sign = 1, ch;
 
 	  if (value.indexOf('_') !== -1) {
 	    value = value.replace(/_/g, '');
@@ -15928,25 +15975,8 @@ var chsTemplates = (function () {
 
 	  if (ch === '0') {
 	    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);
-	    if (value[1] === 'x') return sign * parseInt(value, 16);
-	    return sign * parseInt(value, 8);
-	  }
-
-	  if (value.indexOf(':') !== -1) {
-	    value.split(':').forEach(function (v) {
-	      digits.unshift(parseInt(v, 10));
-	    });
-
-	    value = 0;
-	    base = 1;
-
-	    digits.forEach(function (d) {
-	      value += (d * base);
-	      base *= 60;
-	    });
-
-	    return sign * value;
-
+	    if (value[1] === 'x') return sign * parseInt(value.slice(2), 16);
+	    if (value[1] === 'o') return sign * parseInt(value.slice(2), 8);
 	  }
 
 	  return sign * parseInt(value, 10);
@@ -15954,17 +15984,17 @@ var chsTemplates = (function () {
 
 	function isInteger(object) {
 	  return (Object.prototype.toString.call(object)) === '[object Number]' &&
-	         (object % 1 === 0 && !common$3.isNegativeZero(object));
+	         (object % 1 === 0 && !common.isNegativeZero(object));
 	}
 
-	var int = new Type$a('tag:yaml.org,2002:int', {
+	var int = new type('tag:yaml.org,2002:int', {
 	  kind: 'scalar',
 	  resolve: resolveYamlInteger,
 	  construct: constructYamlInteger,
 	  predicate: isInteger,
 	  represent: {
 	    binary:      function (obj) { return obj >= 0 ? '0b' + obj.toString(2) : '-0b' + obj.toString(2).slice(1); },
-	    octal:       function (obj) { return obj >= 0 ? '0'  + obj.toString(8) : '-0'  + obj.toString(8).slice(1); },
+	    octal:       function (obj) { return obj >= 0 ? '0o'  + obj.toString(8) : '-0o'  + obj.toString(8).slice(1); },
 	    decimal:     function (obj) { return obj.toString(10); },
 	    /* eslint-disable max-len */
 	    hexadecimal: function (obj) { return obj >= 0 ? '0x' + obj.toString(16).toUpperCase() :  '-0x' + obj.toString(16).toUpperCase().slice(1); }
@@ -15978,17 +16008,12 @@ var chsTemplates = (function () {
 	  }
 	});
 
-	var common$2 = common$6;
-	var Type$9   = type;
-
 	var YAML_FLOAT_PATTERN = new RegExp(
 	  // 2.5e4, 2.5 and integers
-	  '^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?' +
+	  '^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?' +
 	  // .2e4, .2
 	  // special case, seems not from spec
 	  '|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?' +
-	  // 20:59
-	  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*' +
 	  // .inf
 	  '|[-+]?\\.(?:inf|Inf|INF)' +
 	  // .nan
@@ -16008,11 +16033,10 @@ var chsTemplates = (function () {
 	}
 
 	function constructYamlFloat(data) {
-	  var value, sign, base, digits;
+	  var value, sign;
 
 	  value  = data.replace(/_/g, '').toLowerCase();
 	  sign   = value[0] === '-' ? -1 : 1;
-	  digits = [];
 
 	  if ('+-'.indexOf(value[0]) >= 0) {
 	    value = value.slice(1);
@@ -16023,22 +16047,6 @@ var chsTemplates = (function () {
 
 	  } else if (value === '.nan') {
 	    return NaN;
-
-	  } else if (value.indexOf(':') >= 0) {
-	    value.split(':').forEach(function (v) {
-	      digits.unshift(parseFloat(v, 10));
-	    });
-
-	    value = 0.0;
-	    base = 1;
-
-	    digits.forEach(function (d) {
-	      value += d * base;
-	      base *= 60;
-	    });
-
-	    return sign * value;
-
 	  }
 	  return sign * parseFloat(value, 10);
 	}
@@ -16067,7 +16075,7 @@ var chsTemplates = (function () {
 	      case 'uppercase': return '-.INF';
 	      case 'camelcase': return '-.Inf';
 	    }
-	  } else if (common$2.isNegativeZero(object)) {
+	  } else if (common.isNegativeZero(object)) {
 	    return '-0.0';
 	  }
 
@@ -16081,10 +16089,10 @@ var chsTemplates = (function () {
 
 	function isFloat(object) {
 	  return (Object.prototype.toString.call(object) === '[object Number]') &&
-	         (object % 1 !== 0 || common$2.isNegativeZero(object));
+	         (object % 1 !== 0 || common.isNegativeZero(object));
 	}
 
-	var float = new Type$9('tag:yaml.org,2002:float', {
+	var float = new type('tag:yaml.org,2002:float', {
 	  kind: 'scalar',
 	  resolve: resolveYamlFloat,
 	  construct: constructYamlFloat,
@@ -16093,13 +16101,7 @@ var chsTemplates = (function () {
 	  defaultStyle: 'lowercase'
 	});
 
-	var Schema$3 = schema;
-
-
-	var json = new Schema$3({
-	  include: [
-	    failsafe
-	  ],
+	var json = failsafe.extend({
 	  implicit: [
 	    _null,
 	    bool,
@@ -16108,16 +16110,7 @@ var chsTemplates = (function () {
 	  ]
 	});
 
-	var Schema$2 = schema;
-
-
-	var core = new Schema$2({
-	  include: [
-	    json
-	  ]
-	});
-
-	var Type$8 = type;
+	var core = json;
 
 	var YAML_DATE_REGEXP = new RegExp(
 	  '^([0-9][0-9][0-9][0-9])'          + // [1] year
@@ -16196,7 +16189,7 @@ var chsTemplates = (function () {
 	  return object.toISOString();
 	}
 
-	var timestamp = new Type$8('tag:yaml.org,2002:timestamp', {
+	var timestamp = new type('tag:yaml.org,2002:timestamp', {
 	  kind: 'scalar',
 	  resolve: resolveYamlTimestamp,
 	  construct: constructYamlTimestamp,
@@ -16204,28 +16197,19 @@ var chsTemplates = (function () {
 	  represent: representYamlTimestamp
 	});
 
-	var Type$7 = type;
-
 	function resolveYamlMerge(data) {
 	  return data === '<<' || data === null;
 	}
 
-	var merge = new Type$7('tag:yaml.org,2002:merge', {
+	var merge = new type('tag:yaml.org,2002:merge', {
 	  kind: 'scalar',
 	  resolve: resolveYamlMerge
 	});
 
 	/*eslint-disable no-bitwise*/
 
-	var NodeBuffer;
 
-	try {
-	  // A trick for browserified version, to not include `Buffer` shim
-	  var _require$1 = commonjsRequire;
-	  NodeBuffer = _require$1('buffer').Buffer;
-	} catch (__) {}
 
-	var Type$6       = type;
 
 
 	// [ 64, 65, 66 ] -> [ padding, CR, LF ]
@@ -16289,13 +16273,7 @@ var chsTemplates = (function () {
 	    result.push((bits >> 4) & 0xFF);
 	  }
 
-	  // Wrap into Buffer for NodeJS and leave Array for browser
-	  if (NodeBuffer) {
-	    // Support node 6.+ Buffer API when available
-	    return NodeBuffer.from ? NodeBuffer.from(result) : new NodeBuffer(result);
-	  }
-
-	  return result;
+	  return new Uint8Array(result);
 	}
 
 	function representYamlBinary(object /*, style*/) {
@@ -16340,11 +16318,11 @@ var chsTemplates = (function () {
 	  return result;
 	}
 
-	function isBinary(object) {
-	  return NodeBuffer && NodeBuffer.isBuffer(object);
+	function isBinary(obj) {
+	  return Object.prototype.toString.call(obj) ===  '[object Uint8Array]';
 	}
 
-	var binary = new Type$6('tag:yaml.org,2002:binary', {
+	var binary = new type('tag:yaml.org,2002:binary', {
 	  kind: 'scalar',
 	  resolve: resolveYamlBinary,
 	  construct: constructYamlBinary,
@@ -16352,8 +16330,6 @@ var chsTemplates = (function () {
 	  represent: representYamlBinary
 	});
 
-	var Type$5 = type;
-
 	var _hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 	var _toString$2       = Object.prototype.toString;
 
@@ -16389,14 +16365,12 @@ var chsTemplates = (function () {
 	  return data !== null ? data : [];
 	}
 
-	var omap = new Type$5('tag:yaml.org,2002:omap', {
+	var omap = new type('tag:yaml.org,2002:omap', {
 	  kind: 'sequence',
 	  resolve: resolveYamlOmap,
 	  construct: constructYamlOmap
 	});
 
-	var Type$4 = type;
-
 	var _toString$1 = Object.prototype.toString;
 
 	function resolveYamlPairs(data) {
@@ -16426,273 +16400,72 @@ var chsTemplates = (function () {
 	  if (data === null) return [];
 
 	  var index, length, pair, keys, result,
-	      object = data;
-
-	  result = new Array(object.length);
-
-	  for (index = 0, length = object.length; index < length; index += 1) {
-	    pair = object[index];
-
-	    keys = Object.keys(pair);
-
-	    result[index] = [ keys[0], pair[keys[0]] ];
-	  }
-
-	  return result;
-	}
-
-	var pairs = new Type$4('tag:yaml.org,2002:pairs', {
-	  kind: 'sequence',
-	  resolve: resolveYamlPairs,
-	  construct: constructYamlPairs
-	});
-
-	var Type$3 = type;
-
-	var _hasOwnProperty$2 = Object.prototype.hasOwnProperty;
-
-	function resolveYamlSet(data) {
-	  if (data === null) return true;
-
-	  var key, object = data;
-
-	  for (key in object) {
-	    if (_hasOwnProperty$2.call(object, key)) {
-	      if (object[key] !== null) return false;
-	    }
-	  }
-
-	  return true;
-	}
-
-	function constructYamlSet(data) {
-	  return data !== null ? data : {};
-	}
-
-	var set = new Type$3('tag:yaml.org,2002:set', {
-	  kind: 'mapping',
-	  resolve: resolveYamlSet,
-	  construct: constructYamlSet
-	});
-
-	var Schema$1 = schema;
-
-
-	var default_safe = new Schema$1({
-	  include: [
-	    core
-	  ],
-	  implicit: [
-	    timestamp,
-	    merge
-	  ],
-	  explicit: [
-	    binary,
-	    omap,
-	    pairs,
-	    set
-	  ]
-	});
-
-	var Type$2 = type;
-
-	function resolveJavascriptUndefined() {
-	  return true;
-	}
-
-	function constructJavascriptUndefined() {
-	  /*eslint-disable no-undefined*/
-	  return undefined;
-	}
-
-	function representJavascriptUndefined() {
-	  return '';
-	}
-
-	function isUndefined(object) {
-	  return typeof object === 'undefined';
-	}
-
-	var _undefined = new Type$2('tag:yaml.org,2002:js/undefined', {
-	  kind: 'scalar',
-	  resolve: resolveJavascriptUndefined,
-	  construct: constructJavascriptUndefined,
-	  predicate: isUndefined,
-	  represent: representJavascriptUndefined
-	});
-
-	var Type$1 = type;
-
-	function resolveJavascriptRegExp(data) {
-	  if (data === null) return false;
-	  if (data.length === 0) return false;
-
-	  var regexp = data,
-	      tail   = /\/([gim]*)$/.exec(data),
-	      modifiers = '';
-
-	  // if regexp starts with '/' it can have modifiers and must be properly closed
-	  // `/foo/gim` - modifiers tail can be maximum 3 chars
-	  if (regexp[0] === '/') {
-	    if (tail) modifiers = tail[1];
-
-	    if (modifiers.length > 3) return false;
-	    // if expression starts with /, is should be properly terminated
-	    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;
-	  }
-
-	  return true;
-	}
-
-	function constructJavascriptRegExp(data) {
-	  var regexp = data,
-	      tail   = /\/([gim]*)$/.exec(data),
-	      modifiers = '';
-
-	  // `/foo/gim` - tail can be maximum 4 chars
-	  if (regexp[0] === '/') {
-	    if (tail) modifiers = tail[1];
-	    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
-	  }
-
-	  return new RegExp(regexp, modifiers);
-	}
-
-	function representJavascriptRegExp(object /*, style*/) {
-	  var result = '/' + object.source + '/';
-
-	  if (object.global) result += 'g';
-	  if (object.multiline) result += 'm';
-	  if (object.ignoreCase) result += 'i';
-
-	  return result;
-	}
-
-	function isRegExp(object) {
-	  return Object.prototype.toString.call(object) === '[object RegExp]';
-	}
-
-	var regexp = new Type$1('tag:yaml.org,2002:js/regexp', {
-	  kind: 'scalar',
-	  resolve: resolveJavascriptRegExp,
-	  construct: constructJavascriptRegExp,
-	  predicate: isRegExp,
-	  represent: representJavascriptRegExp
-	});
-
-	var esprima;
-
-	// Browserified version does not have esprima
-	//
-	// 1. For node.js just require module as deps
-	// 2. For browser try to require mudule via external AMD system.
-	//    If not found - try to fallback to window.esprima. If not
-	//    found too - then fail to parse.
-	//
-	try {
-	  // workaround to exclude package from browserify list.
-	  var _require = commonjsRequire;
-	  esprima = _require('esprima');
-	} catch (_) {
-	  /* eslint-disable no-redeclare */
-	  /* global window */
-	  if (typeof window !== 'undefined') esprima = window.esprima;
-	}
+	      object = data;
 
-	var Type = type;
+	  result = new Array(object.length);
 
-	function resolveJavascriptFunction(data) {
-	  if (data === null) return false;
+	  for (index = 0, length = object.length; index < length; index += 1) {
+	    pair = object[index];
 
-	  try {
-	    var source = '(' + data + ')',
-	        ast    = esprima.parse(source, { range: true });
-
-	    if (ast.type                    !== 'Program'             ||
-	        ast.body.length             !== 1                     ||
-	        ast.body[0].type            !== 'ExpressionStatement' ||
-	        (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
-	          ast.body[0].expression.type !== 'FunctionExpression')) {
-	      return false;
-	    }
+	    keys = Object.keys(pair);
 
-	    return true;
-	  } catch (err) {
-	    return false;
+	    result[index] = [ keys[0], pair[keys[0]] ];
 	  }
-	}
 
-	function constructJavascriptFunction(data) {
-	  /*jslint evil:true*/
+	  return result;
+	}
 
-	  var source = '(' + data + ')',
-	      ast    = esprima.parse(source, { range: true }),
-	      params = [],
-	      body;
+	var pairs = new type('tag:yaml.org,2002:pairs', {
+	  kind: 'sequence',
+	  resolve: resolveYamlPairs,
+	  construct: constructYamlPairs
+	});
 
-	  if (ast.type                    !== 'Program'             ||
-	      ast.body.length             !== 1                     ||
-	      ast.body[0].type            !== 'ExpressionStatement' ||
-	      (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
-	        ast.body[0].expression.type !== 'FunctionExpression')) {
-	    throw new Error('Failed to resolve function');
-	  }
+	var _hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 
-	  ast.body[0].expression.params.forEach(function (param) {
-	    params.push(param.name);
-	  });
+	function resolveYamlSet(data) {
+	  if (data === null) return true;
 
-	  body = ast.body[0].expression.body.range;
+	  var key, object = data;
 
-	  // Esprima's ranges include the first '{' and the last '}' characters on
-	  // function expressions. So cut them out.
-	  if (ast.body[0].expression.body.type === 'BlockStatement') {
-	    /*eslint-disable no-new-func*/
-	    return new Function(params, source.slice(body[0] + 1, body[1] - 1));
+	  for (key in object) {
+	    if (_hasOwnProperty$2.call(object, key)) {
+	      if (object[key] !== null) return false;
+	    }
 	  }
-	  // ES6 arrow functions can omit the BlockStatement. In that case, just return
-	  // the body.
-	  /*eslint-disable no-new-func*/
-	  return new Function(params, 'return ' + source.slice(body[0], body[1]));
-	}
 
-	function representJavascriptFunction(object /*, style*/) {
-	  return object.toString();
+	  return true;
 	}
 
-	function isFunction(object) {
-	  return Object.prototype.toString.call(object) === '[object Function]';
+	function constructYamlSet(data) {
+	  return data !== null ? data : {};
 	}
 
-	var _function = new Type('tag:yaml.org,2002:js/function', {
-	  kind: 'scalar',
-	  resolve: resolveJavascriptFunction,
-	  construct: constructJavascriptFunction,
-	  predicate: isFunction,
-	  represent: representJavascriptFunction
+	var set = new type('tag:yaml.org,2002:set', {
+	  kind: 'mapping',
+	  resolve: resolveYamlSet,
+	  construct: constructYamlSet
 	});
 
-	var Schema = schema;
-
-
-	var default_full = Schema.DEFAULT = new Schema({
-	  include: [
-	    default_safe
+	var _default = core.extend({
+	  implicit: [
+	    timestamp,
+	    merge
 	  ],
 	  explicit: [
-	    _undefined,
-	    regexp,
-	    _function
+	    binary,
+	    omap,
+	    pairs,
+	    set
 	  ]
 	});
 
 	/*eslint-disable max-len,no-use-before-define*/
 
-	var common$1              = common$6;
-	var YAMLException$1       = exception;
-	var Mark                = mark;
-	var DEFAULT_SAFE_SCHEMA$1 = default_safe;
-	var DEFAULT_FULL_SCHEMA$1 = default_full;
+
+
+
+
 
 
 	var _hasOwnProperty$1 = Object.prototype.hasOwnProperty;
@@ -16819,9 +16592,12 @@ var chsTemplates = (function () {
 	  this.input = input;
 
 	  this.filename  = options['filename']  || null;
-	  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA$1;
+	  this.schema    = options['schema']    || _default;
 	  this.onWarning = options['onWarning'] || null;
+	  // (Hidden) Remove? makes the loader to expect YAML 1.1 documents
+	  // if such documents have no explicit %YAML directive
 	  this.legacy    = options['legacy']    || false;
+
 	  this.json      = options['json']      || false;
 	  this.listener  = options['listener']  || null;
 
@@ -16834,6 +16610,10 @@ var chsTemplates = (function () {
 	  this.lineStart  = 0;
 	  this.lineIndent = 0;
 
+	  // position of first leading tab in the current line,
+	  // used to make sure there are no tabs in the indentation
+	  this.firstTabInLine = -1;
+
 	  this.documents = [];
 
 	  /*
@@ -16850,9 +16630,17 @@ var chsTemplates = (function () {
 
 
 	function generateError(state, message) {
-	  return new YAMLException$1(
-	    message,
-	    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));
+	  var mark = {
+	    name:     state.filename,
+	    buffer:   state.input.slice(0, -1), // omit trailing \0
+	    position: state.position,
+	    line:     state.line,
+	    column:   state.position - state.lineStart
+	  };
+
+	  mark.snippet = snippet(mark);
+
+	  return new exception(message, mark);
 	}
 
 	function throwError(state, message) {
@@ -16924,6 +16712,12 @@ var chsTemplates = (function () {
 	      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
 	    }
 
+	    try {
+	      prefix = decodeURIComponent(prefix);
+	    } catch (err) {
+	      throwError(state, 'tag prefix is malformed: ' + prefix);
+	    }
+
 	    state.tagMap[handle] = prefix;
 	  }
 	};
@@ -16954,7 +16748,7 @@ var chsTemplates = (function () {
 	function mergeMappings(state, destination, source, overridableKeys) {
 	  var sourceKeys, key, index, quantity;
 
-	  if (!common$1.isObject(source)) {
+	  if (!common.isObject(source)) {
 	    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');
 	  }
 
@@ -16970,7 +16764,9 @@ var chsTemplates = (function () {
 	  }
 	}
 
-	function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, startLine, startPos) {
+	function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode,
+	  startLine, startLineStart, startPos) {
+
 	  var index, quantity;
 
 	  // The output is a plain object here, so keys can only be strings.
@@ -17017,10 +16813,22 @@ var chsTemplates = (function () {
 	        !_hasOwnProperty$1.call(overridableKeys, keyNode) &&
 	        _hasOwnProperty$1.call(_result, keyNode)) {
 	      state.line = startLine || state.line;
+	      state.lineStart = startLineStart || state.lineStart;
 	      state.position = startPos || state.position;
 	      throwError(state, 'duplicated mapping key');
 	    }
-	    _result[keyNode] = valueNode;
+
+	    // used for this specific key only because Object.defineProperty is slow
+	    if (keyNode === '__proto__') {
+	      Object.defineProperty(_result, keyNode, {
+	        configurable: true,
+	        enumerable: true,
+	        writable: true,
+	        value: valueNode
+	      });
+	    } else {
+	      _result[keyNode] = valueNode;
+	    }
 	    delete overridableKeys[keyNode];
 	  }
 
@@ -17045,6 +16853,7 @@ var chsTemplates = (function () {
 
 	  state.line += 1;
 	  state.lineStart = state.position;
+	  state.firstTabInLine = -1;
 	}
 
 	function skipSeparationSpace(state, allowComments, checkIndent) {
@@ -17053,6 +16862,9 @@ var chsTemplates = (function () {
 
 	  while (ch !== 0) {
 	    while (is_WHITE_SPACE(ch)) {
+	      if (ch === 0x09/* Tab */ && state.firstTabInLine === -1) {
+	        state.firstTabInLine = state.position;
+	      }
 	      ch = state.input.charCodeAt(++state.position);
 	    }
 
@@ -17113,7 +16925,7 @@ var chsTemplates = (function () {
 	  if (count === 1) {
 	    state.result += ' ';
 	  } else if (count > 1) {
-	    state.result += common$1.repeat('\n', count - 1);
+	    state.result += common.repeat('\n', count - 1);
 	  }
 	}
 
@@ -17354,6 +17166,8 @@ var chsTemplates = (function () {
 	function readFlowCollection(state, nodeIndent) {
 	  var readNext = true,
 	      _line,
+	      _lineStart,
+	      _pos,
 	      _tag     = state.tag,
 	      _result,
 	      _anchor  = state.anchor,
@@ -17362,7 +17176,7 @@ var chsTemplates = (function () {
 	      isPair,
 	      isExplicitPair,
 	      isMapping,
-	      overridableKeys = {},
+	      overridableKeys = Object.create(null),
 	      keyNode,
 	      keyTag,
 	      valueNode,
@@ -17402,6 +17216,9 @@ var chsTemplates = (function () {
 	      return true;
 	    } else if (!readNext) {
 	      throwError(state, 'missed comma between flow collection entries');
+	    } else if (ch === 0x2C/* , */) {
+	      // "flow collection entries can never be completely empty", as per YAML 1.2, section 7.4
+	      throwError(state, "expected the node content, but found ','");
 	    }
 
 	    keyTag = keyNode = valueNode = null;
@@ -17417,7 +17234,9 @@ var chsTemplates = (function () {
 	      }
 	    }
 
-	    _line = state.line;
+	    _line = state.line; // Save the current line.
+	    _lineStart = state.lineStart;
+	    _pos = state.position;
 	    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
 	    keyTag = state.tag;
 	    keyNode = state.result;
@@ -17434,9 +17253,9 @@ var chsTemplates = (function () {
 	    }
 
 	    if (isMapping) {
-	      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
+	      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _line, _lineStart, _pos);
 	    } else if (isPair) {
-	      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));
+	      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode, _line, _lineStart, _pos));
 	    } else {
 	      _result.push(keyNode);
 	    }
@@ -17542,7 +17361,7 @@ var chsTemplates = (function () {
 
 	      // Perform the chomping.
 	      if (chomping === CHOMPING_KEEP) {
-	        state.result += common$1.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+	        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
 	      } else if (chomping === CHOMPING_CLIP) {
 	        if (didReadContent) { // i.e. only if the scalar is not empty.
 	          state.result += '\n';
@@ -17560,12 +17379,12 @@ var chsTemplates = (function () {
 	      if (is_WHITE_SPACE(ch)) {
 	        atMoreIndented = true;
 	        // except for the first content line (cf. Example 8.1)
-	        state.result += common$1.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+	        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
 
 	      // End of more-indented block.
 	      } else if (atMoreIndented) {
 	        atMoreIndented = false;
-	        state.result += common$1.repeat('\n', emptyLines + 1);
+	        state.result += common.repeat('\n', emptyLines + 1);
 
 	      // Just one line break - perceive as the same line.
 	      } else if (emptyLines === 0) {
@@ -17575,13 +17394,13 @@ var chsTemplates = (function () {
 
 	      // Several line breaks - perceive as different lines.
 	      } else {
-	        state.result += common$1.repeat('\n', emptyLines);
+	        state.result += common.repeat('\n', emptyLines);
 	      }
 
 	    // Literal style: just add exact number of line breaks between content lines.
 	    } else {
 	      // Keep all line breaks except the header line break.
-	      state.result += common$1.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+	      state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
 	    }
 
 	    didReadContent = true;
@@ -17608,6 +17427,10 @@ var chsTemplates = (function () {
 	      detected  = false,
 	      ch;
 
+	  // there is a leading tab before this token, so it can't be a block sequence/mapping;
+	  // it can still be flow sequence/mapping or a scalar
+	  if (state.firstTabInLine !== -1) return false;
+
 	  if (state.anchor !== null) {
 	    state.anchorMap[state.anchor] = _result;
 	  }
@@ -17615,6 +17438,10 @@ var chsTemplates = (function () {
 	  ch = state.input.charCodeAt(state.position);
 
 	  while (ch !== 0) {
+	    if (state.firstTabInLine !== -1) {
+	      state.position = state.firstTabInLine;
+	      throwError(state, 'tab characters must not be used in indentation');
+	    }
 
 	    if (ch !== 0x2D/* - */) {
 	      break;
@@ -17665,11 +17492,13 @@ var chsTemplates = (function () {
 	  var following,
 	      allowCompact,
 	      _line,
-	      _pos,
+	      _keyLine,
+	      _keyLineStart,
+	      _keyPos,
 	      _tag          = state.tag,
 	      _anchor       = state.anchor,
 	      _result       = {},
-	      overridableKeys = {},
+	      overridableKeys = Object.create(null),
 	      keyTag        = null,
 	      keyNode       = null,
 	      valueNode     = null,
@@ -17677,6 +17506,10 @@ var chsTemplates = (function () {
 	      detected      = false,
 	      ch;
 
+	  // there is a leading tab before this token, so it can't be a block sequence/mapping;
+	  // it can still be flow sequence/mapping or a scalar
+	  if (state.firstTabInLine !== -1) return false;
+
 	  if (state.anchor !== null) {
 	    state.anchorMap[state.anchor] = _result;
 	  }
@@ -17684,9 +17517,13 @@ var chsTemplates = (function () {
 	  ch = state.input.charCodeAt(state.position);
 
 	  while (ch !== 0) {
+	    if (!atExplicitKey && state.firstTabInLine !== -1) {
+	      state.position = state.firstTabInLine;
+	      throwError(state, 'tab characters must not be used in indentation');
+	    }
+
 	    following = state.input.charCodeAt(state.position + 1);
 	    _line = state.line; // Save the current line.
-	    _pos = state.position;
 
 	    //
 	    // Explicit notation case. There are two separate blocks:
@@ -17696,7 +17533,7 @@ var chsTemplates = (function () {
 
 	      if (ch === 0x3F/* ? */) {
 	        if (atExplicitKey) {
-	          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+	          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null, _keyLine, _keyLineStart, _keyPos);
 	          keyTag = keyNode = valueNode = null;
 	        }
 
@@ -17719,7 +17556,16 @@ var chsTemplates = (function () {
 	    //
 	    // Implicit notation case. Flow-style node as the key first, then ":", and the value.
 	    //
-	    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {
+	    } else {
+	      _keyLine = state.line;
+	      _keyLineStart = state.lineStart;
+	      _keyPos = state.position;
+
+	      if (!composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {
+	        // Neither implicit nor explicit notation.
+	        // Reading is done. Go to the epilogue.
+	        break;
+	      }
 
 	      if (state.line === _line) {
 	        ch = state.input.charCodeAt(state.position);
@@ -17736,7 +17582,7 @@ var chsTemplates = (function () {
 	          }
 
 	          if (atExplicitKey) {
-	            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+	            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null, _keyLine, _keyLineStart, _keyPos);
 	            keyTag = keyNode = valueNode = null;
 	          }
 
@@ -17763,15 +17609,18 @@ var chsTemplates = (function () {
 	        state.anchor = _anchor;
 	        return true; // Keep the result of `composeNode`.
 	      }
-
-	    } else {
-	      break; // Reading is done. Go to the epilogue.
 	    }
 
 	    //
 	    // Common reading code for both explicit and implicit notations.
 	    //
 	    if (state.line === _line || state.lineIndent > nodeIndent) {
+	      if (atExplicitKey) {
+	        _keyLine = state.line;
+	        _keyLineStart = state.lineStart;
+	        _keyPos = state.position;
+	      }
+
 	      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {
 	        if (atExplicitKey) {
 	          keyNode = state.result;
@@ -17781,7 +17630,7 @@ var chsTemplates = (function () {
 	      }
 
 	      if (!atExplicitKey) {
-	        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _line, _pos);
+	        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _keyLine, _keyLineStart, _keyPos);
 	        keyTag = keyNode = valueNode = null;
 	      }
 
@@ -17789,7 +17638,7 @@ var chsTemplates = (function () {
 	      ch = state.input.charCodeAt(state.position);
 	    }
 
-	    if (state.lineIndent > nodeIndent && (ch !== 0)) {
+	    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {
 	      throwError(state, 'bad indentation of a mapping entry');
 	    } else if (state.lineIndent < nodeIndent) {
 	      break;
@@ -17802,7 +17651,7 @@ var chsTemplates = (function () {
 
 	  // Special case: last mapping's node contains only the key in explicit notation.
 	  if (atExplicitKey) {
-	    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+	    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null, _keyLine, _keyLineStart, _keyPos);
 	  }
 
 	  // Expose the resulting mapping.
@@ -17891,6 +17740,12 @@ var chsTemplates = (function () {
 	    throwError(state, 'tag name cannot contain such characters: ' + tagName);
 	  }
 
+	  try {
+	    tagName = decodeURIComponent(tagName);
+	  } catch (err) {
+	    throwError(state, 'tag name is malformed: ' + tagName);
+	  }
+
 	  if (isVerbatim) {
 	    state.tag = tagName;
 
@@ -17976,6 +17831,7 @@ var chsTemplates = (function () {
 	      hasContent = false,
 	      typeIndex,
 	      typeQuantity,
+	      typeList,
 	      type,
 	      flowIndent,
 	      blockIndent;
@@ -18077,48 +17933,66 @@ var chsTemplates = (function () {
 	    }
 	  }
 
-	  if (state.tag !== null && state.tag !== '!') {
-	    if (state.tag === '?') {
-	      // Implicit resolving is not allowed for non-scalar types, and '?'
-	      // non-specific tag is only automatically assigned to plain scalars.
-	      //
-	      // We only need to check kind conformity in case user explicitly assigns '?'
-	      // tag, for example like this: "!<?> [0]"
-	      //
-	      if (state.result !== null && state.kind !== 'scalar') {
-	        throwError(state, 'unacceptable node kind for !<?> tag; it should be "scalar", not "' + state.kind + '"');
-	      }
-
-	      for (typeIndex = 0, typeQuantity = state.implicitTypes.length; typeIndex < typeQuantity; typeIndex += 1) {
-	        type = state.implicitTypes[typeIndex];
+	  if (state.tag === null) {
+	    if (state.anchor !== null) {
+	      state.anchorMap[state.anchor] = state.result;
+	    }
 
-	        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
-	          state.result = type.construct(state.result);
-	          state.tag = type.tag;
-	          if (state.anchor !== null) {
-	            state.anchorMap[state.anchor] = state.result;
-	          }
-	          break;
-	        }
-	      }
-	    } else if (_hasOwnProperty$1.call(state.typeMap[state.kind || 'fallback'], state.tag)) {
-	      type = state.typeMap[state.kind || 'fallback'][state.tag];
+	  } else if (state.tag === '?') {
+	    // Implicit resolving is not allowed for non-scalar types, and '?'
+	    // non-specific tag is only automatically assigned to plain scalars.
+	    //
+	    // We only need to check kind conformity in case user explicitly assigns '?'
+	    // tag, for example like this: "!<?> [0]"
+	    //
+	    if (state.result !== null && state.kind !== 'scalar') {
+	      throwError(state, 'unacceptable node kind for !<?> tag; it should be "scalar", not "' + state.kind + '"');
+	    }
 
-	      if (state.result !== null && type.kind !== state.kind) {
-	        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
-	      }
+	    for (typeIndex = 0, typeQuantity = state.implicitTypes.length; typeIndex < typeQuantity; typeIndex += 1) {
+	      type = state.implicitTypes[typeIndex];
 
-	      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched
-	        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
-	      } else {
+	      if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
 	        state.result = type.construct(state.result);
+	        state.tag = type.tag;
 	        if (state.anchor !== null) {
 	          state.anchorMap[state.anchor] = state.result;
 	        }
+	        break;
 	      }
+	    }
+	  } else if (state.tag !== '!') {
+	    if (_hasOwnProperty$1.call(state.typeMap[state.kind || 'fallback'], state.tag)) {
+	      type = state.typeMap[state.kind || 'fallback'][state.tag];
 	    } else {
+	      // looking for multi type
+	      type = null;
+	      typeList = state.typeMap.multi[state.kind || 'fallback'];
+
+	      for (typeIndex = 0, typeQuantity = typeList.length; typeIndex < typeQuantity; typeIndex += 1) {
+	        if (state.tag.slice(0, typeList[typeIndex].tag.length) === typeList[typeIndex].tag) {
+	          type = typeList[typeIndex];
+	          break;
+	        }
+	      }
+	    }
+
+	    if (!type) {
 	      throwError(state, 'unknown tag !<' + state.tag + '>');
 	    }
+
+	    if (state.result !== null && type.kind !== state.kind) {
+	      throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
+	    }
+
+	    if (!type.resolve(state.result, state.tag)) { // `state.result` updated in resolver if matched
+	      throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
+	    } else {
+	      state.result = type.construct(state.result, state.tag);
+	      if (state.anchor !== null) {
+	        state.anchorMap[state.anchor] = state.result;
+	      }
+	    }
 	  }
 
 	  if (state.listener !== null) {
@@ -18137,8 +18011,8 @@ var chsTemplates = (function () {
 
 	  state.version = null;
 	  state.checkLineBreaks = state.legacy;
-	  state.tagMap = {};
-	  state.anchorMap = {};
+	  state.tagMap = Object.create(null);
+	  state.anchorMap = Object.create(null);
 
 	  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
 	    skipSeparationSpace(state, true, -1);
@@ -18278,7 +18152,7 @@ var chsTemplates = (function () {
 	}
 
 
-	function loadAll(input, iterator, options) {
+	function loadAll$1(input, iterator, options) {
 	  if (iterator !== null && typeof iterator === 'object' && typeof options === 'undefined') {
 	    options = iterator;
 	    iterator = null;
@@ -18296,7 +18170,7 @@ var chsTemplates = (function () {
 	}
 
 
-	function load(input, options) {
+	function load$1(input, options) {
 	  var documents = loadDocuments(input, options);
 
 	  if (documents.length === 0) {
@@ -18305,42 +18179,28 @@ var chsTemplates = (function () {
 	  } else if (documents.length === 1) {
 	    return documents[0];
 	  }
-	  throw new YAMLException$1('expected a single document in the stream, but found more');
+	  throw new exception('expected a single document in the stream, but found more');
 	}
 
 
-	function safeLoadAll(input, iterator, options) {
-	  if (typeof iterator === 'object' && iterator !== null && typeof options === 'undefined') {
-	    options = iterator;
-	    iterator = null;
-	  }
-
-	  return loadAll(input, iterator, common$1.extend({ schema: DEFAULT_SAFE_SCHEMA$1 }, options));
-	}
-
+	var loadAll_1 = loadAll$1;
+	var load_1    = load$1;
 
-	function safeLoad(input, options) {
-	  return load(input, common$1.extend({ schema: DEFAULT_SAFE_SCHEMA$1 }, options));
-	}
+	var loader = {
+		loadAll: loadAll_1,
+		load: load_1
+	};
 
+	/*eslint-disable no-use-before-define*/
 
-	loader$1.loadAll     = loadAll;
-	loader$1.load        = load;
-	loader$1.safeLoadAll = safeLoadAll;
-	loader$1.safeLoad    = safeLoad;
 
-	var dumper$1 = {};
 
-	/*eslint-disable no-use-before-define*/
 
-	var common              = common$6;
-	var YAMLException       = exception;
-	var DEFAULT_FULL_SCHEMA = default_full;
-	var DEFAULT_SAFE_SCHEMA = default_safe;
 
 	var _toString       = Object.prototype.toString;
 	var _hasOwnProperty = Object.prototype.hasOwnProperty;
 
+	var CHAR_BOM                  = 0xFEFF;
 	var CHAR_TAB                  = 0x09; /* Tab */
 	var CHAR_LINE_FEED            = 0x0A; /* LF */
 	var CHAR_CARRIAGE_RETURN      = 0x0D; /* CR */
@@ -18389,6 +18249,8 @@ var chsTemplates = (function () {
 	  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'
 	];
 
+	var DEPRECATED_BASE60_SYNTAX = /^[-+]?[0-9_]+(?::[0-9_]+)+(?:\.[0-9_]*)?$/;
+
 	function compileStyleMap(schema, map) {
 	  var result, keys, index, length, tag, style, type;
 
@@ -18431,14 +18293,18 @@ var chsTemplates = (function () {
 	    handle = 'U';
 	    length = 8;
 	  } else {
-	    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');
+	    throw new exception('code point within a string may not be greater than 0xFFFFFFFF');
 	  }
 
 	  return '\\' + handle + common.repeat('0', length - string.length) + string;
 	}
 
+
+	var QUOTING_TYPE_SINGLE = 1,
+	    QUOTING_TYPE_DOUBLE = 2;
+
 	function State(options) {
-	  this.schema        = options['schema'] || DEFAULT_FULL_SCHEMA;
+	  this.schema        = options['schema'] || _default;
 	  this.indent        = Math.max(1, (options['indent'] || 2));
 	  this.noArrayIndent = options['noArrayIndent'] || false;
 	  this.skipInvalid   = options['skipInvalid'] || false;
@@ -18449,6 +18315,9 @@ var chsTemplates = (function () {
 	  this.noRefs        = options['noRefs'] || false;
 	  this.noCompatMode  = options['noCompatMode'] || false;
 	  this.condenseFlow  = options['condenseFlow'] || false;
+	  this.quotingType   = options['quotingType'] === '"' ? QUOTING_TYPE_DOUBLE : QUOTING_TYPE_SINGLE;
+	  this.forceQuotes   = options['forceQuotes'] || false;
+	  this.replacer      = typeof options['replacer'] === 'function' ? options['replacer'] : null;
 
 	  this.implicitTypes = this.schema.compiledImplicit;
 	  this.explicitTypes = this.schema.compiledExplicit;
@@ -18517,47 +18386,60 @@ var chsTemplates = (function () {
 	function isPrintable(c) {
 	  return  (0x00020 <= c && c <= 0x00007E)
 	      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)
-	      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)
+	      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== CHAR_BOM)
 	      ||  (0x10000 <= c && c <= 0x10FFFF);
 	}
 
 	// [34] ns-char ::= nb-char - s-white
 	// [27] nb-char ::= c-printable - b-char - c-byte-order-mark
 	// [26] b-char  ::= b-line-feed | b-carriage-return
-	// [24] b-line-feed       ::=     #xA    /* LF */
-	// [25] b-carriage-return ::=     #xD    /* CR */
-	// [3]  c-byte-order-mark ::=     #xFEFF
-	function isNsChar(c) {
-	  return isPrintable(c) && !isWhitespace(c)
-	    // byte-order-mark
-	    && c !== 0xFEFF
-	    // b-char
+	// Including s-white (for some reason, examples doesn't match specs in this aspect)
+	// ns-char ::= c-printable - b-line-feed - b-carriage-return - c-byte-order-mark
+	function isNsCharOrWhitespace(c) {
+	  return isPrintable(c)
+	    && c !== CHAR_BOM
+	    // - b-char
 	    && c !== CHAR_CARRIAGE_RETURN
 	    && c !== CHAR_LINE_FEED;
 	}
 
-	// Simplified test for values allowed after the first character in plain style.
-	function isPlainSafe(c, prev) {
-	  // Uses a subset of nb-char - c-flow-indicator - ":" - "#"
-	  // where nb-char ::= c-printable - b-char - c-byte-order-mark.
-	  return isPrintable(c) && c !== 0xFEFF
-	    // - c-flow-indicator
-	    && c !== CHAR_COMMA
-	    && c !== CHAR_LEFT_SQUARE_BRACKET
-	    && c !== CHAR_RIGHT_SQUARE_BRACKET
-	    && c !== CHAR_LEFT_CURLY_BRACKET
-	    && c !== CHAR_RIGHT_CURLY_BRACKET
-	    // - ":" - "#"
-	    // /* An ns-char preceding */ "#"
-	    && c !== CHAR_COLON
-	    && ((c !== CHAR_SHARP) || (prev && isNsChar(prev)));
+	// [127]  ns-plain-safe(c) ::= c = flow-out  ⇒ ns-plain-safe-out
+	//                             c = flow-in   ⇒ ns-plain-safe-in
+	//                             c = block-key ⇒ ns-plain-safe-out
+	//                             c = flow-key  ⇒ ns-plain-safe-in
+	// [128] ns-plain-safe-out ::= ns-char
+	// [129]  ns-plain-safe-in ::= ns-char - c-flow-indicator
+	// [130]  ns-plain-char(c) ::=  ( ns-plain-safe(c) - “:” - “#” )
+	//                            | ( /* An ns-char preceding */ “#” )
+	//                            | ( “:” /* Followed by an ns-plain-safe(c) */ )
+	function isPlainSafe(c, prev, inblock) {
+	  var cIsNsCharOrWhitespace = isNsCharOrWhitespace(c);
+	  var cIsNsChar = cIsNsCharOrWhitespace && !isWhitespace(c);
+	  return (
+	    // ns-plain-safe
+	    inblock ? // c = flow-in
+	      cIsNsCharOrWhitespace
+	      : cIsNsCharOrWhitespace
+	        // - c-flow-indicator
+	        && c !== CHAR_COMMA
+	        && c !== CHAR_LEFT_SQUARE_BRACKET
+	        && c !== CHAR_RIGHT_SQUARE_BRACKET
+	        && c !== CHAR_LEFT_CURLY_BRACKET
+	        && c !== CHAR_RIGHT_CURLY_BRACKET
+	  )
+	    // ns-plain-char
+	    && c !== CHAR_SHARP // false on '#'
+	    && !(prev === CHAR_COLON && !cIsNsChar) // false on ': '
+	    || (isNsCharOrWhitespace(prev) && !isWhitespace(prev) && c === CHAR_SHARP) // change to true on '[^ ]#'
+	    || (prev === CHAR_COLON && cIsNsChar); // change to true on ':[^ ]'
 	}
 
 	// Simplified test for values allowed as the first character in plain style.
 	function isPlainSafeFirst(c) {
 	  // Uses a subset of ns-char - c-indicator
 	  // where ns-char = nb-char - s-white.
-	  return isPrintable(c) && c !== 0xFEFF
+	  // No support of ( ( “?” | “:” | “-” ) /* Followed by an ns-plain-safe(c)) */ ) part
+	  return isPrintable(c) && c !== CHAR_BOM
 	    && !isWhitespace(c) // - s-white
 	    // - (c-indicator ::=
 	    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”
@@ -18585,6 +18467,25 @@ var chsTemplates = (function () {
 	    && c !== CHAR_GRAVE_ACCENT;
 	}
 
+	// Simplified test for values allowed as the last character in plain style.
+	function isPlainSafeLast(c) {
+	  // just not whitespace or colon, it will be checked to be plain character later
+	  return !isWhitespace(c) && c !== CHAR_COLON;
+	}
+
+	// Same as 'string'.codePointAt(pos), but works in older browsers.
+	function codePointAt(string, pos) {
+	  var first = string.charCodeAt(pos), second;
+	  if (first >= 0xD800 && first <= 0xDBFF && pos + 1 < string.length) {
+	    second = string.charCodeAt(pos + 1);
+	    if (second >= 0xDC00 && second <= 0xDFFF) {
+	      // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+	      return (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
+	    }
+	  }
+	  return first;
+	}
+
 	// Determines whether block indentation indicator is required.
 	function needIndentIndicator(string) {
 	  var leadingSpaceRe = /^\n* /;
@@ -18604,31 +18505,34 @@ var chsTemplates = (function () {
 	//    STYLE_PLAIN or STYLE_SINGLE => no \n are in the string.
 	//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).
 	//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).
-	function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {
+	function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth,
+	  testAmbiguousType, quotingType, forceQuotes, inblock) {
+
 	  var i;
-	  var char, prev_char;
+	  var char = 0;
+	  var prevChar = null;
 	  var hasLineBreak = false;
 	  var hasFoldableLine = false; // only checked if shouldTrackWidth
 	  var shouldTrackWidth = lineWidth !== -1;
 	  var previousLineBreak = -1; // count the first line correctly
-	  var plain = isPlainSafeFirst(string.charCodeAt(0))
-	          && !isWhitespace(string.charCodeAt(string.length - 1));
+	  var plain = isPlainSafeFirst(codePointAt(string, 0))
+	          && isPlainSafeLast(codePointAt(string, string.length - 1));
 
-	  if (singleLineOnly) {
+	  if (singleLineOnly || forceQuotes) {
 	    // Case: no block styles.
 	    // Check for disallowed characters to rule out plain and single.
-	    for (i = 0; i < string.length; i++) {
-	      char = string.charCodeAt(i);
+	    for (i = 0; i < string.length; char >= 0x10000 ? i += 2 : i++) {
+	      char = codePointAt(string, i);
 	      if (!isPrintable(char)) {
 	        return STYLE_DOUBLE;
 	      }
-	      prev_char = i > 0 ? string.charCodeAt(i - 1) : null;
-	      plain = plain && isPlainSafe(char, prev_char);
+	      plain = plain && isPlainSafe(char, prevChar, inblock);
+	      prevChar = char;
 	    }
 	  } else {
 	    // Case: block styles permitted.
-	    for (i = 0; i < string.length; i++) {
-	      char = string.charCodeAt(i);
+	    for (i = 0; i < string.length; char >= 0x10000 ? i += 2 : i++) {
+	      char = codePointAt(string, i);
 	      if (char === CHAR_LINE_FEED) {
 	        hasLineBreak = true;
 	        // Check if any line can be folded.
@@ -18642,8 +18546,8 @@ var chsTemplates = (function () {
 	      } else if (!isPrintable(char)) {
 	        return STYLE_DOUBLE;
 	      }
-	      prev_char = i > 0 ? string.charCodeAt(i - 1) : null;
-	      plain = plain && isPlainSafe(char, prev_char);
+	      plain = plain && isPlainSafe(char, prevChar, inblock);
+	      prevChar = char;
 	    }
 	    // in case the end is missing a \n
 	    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&
@@ -18656,8 +18560,10 @@ var chsTemplates = (function () {
 	  if (!hasLineBreak && !hasFoldableLine) {
 	    // Strings interpretable as another type have to be quoted;
 	    // e.g. the string 'true' vs. the boolean true.
-	    return plain && !testAmbiguousType(string)
-	      ? STYLE_PLAIN : STYLE_SINGLE;
+	    if (plain && !forceQuotes && !testAmbiguousType(string)) {
+	      return STYLE_PLAIN;
+	    }
+	    return quotingType === QUOTING_TYPE_DOUBLE ? STYLE_DOUBLE : STYLE_SINGLE;
 	  }
 	  // Edge case: block indentation indicator can only have one digit.
 	  if (indentPerLevel > 9 && needIndentIndicator(string)) {
@@ -18665,7 +18571,10 @@ var chsTemplates = (function () {
 	  }
 	  // At this point we know block styles are valid.
 	  // Prefer literal style unless we want to fold.
-	  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
+	  if (!forceQuotes) {
+	    return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
+	  }
+	  return quotingType === QUOTING_TYPE_DOUBLE ? STYLE_DOUBLE : STYLE_SINGLE;
 	}
 
 	// Note: line breaking/folding is implemented for only the folded style.
@@ -18674,14 +18583,15 @@ var chsTemplates = (function () {
 	//    • No ending newline => unaffected; already using strip "-" chomping.
 	//    • Ending newline    => removed then restored.
 	//  Importantly, this keeps the "+" chomp indicator from gaining an extra line.
-	function writeScalar(state, string, level, iskey) {
+	function writeScalar(state, string, level, iskey, inblock) {
 	  state.dump = (function () {
 	    if (string.length === 0) {
-	      return "''";
+	      return state.quotingType === QUOTING_TYPE_DOUBLE ? '""' : "''";
 	    }
-	    if (!state.noCompatMode &&
-	        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {
-	      return "'" + string + "'";
+	    if (!state.noCompatMode) {
+	      if (DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1 || DEPRECATED_BASE60_SYNTAX.test(string)) {
+	        return state.quotingType === QUOTING_TYPE_DOUBLE ? ('"' + string + '"') : ("'" + string + "'");
+	      }
 	    }
 
 	    var indent = state.indent * Math.max(1, level); // no 0-indent scalars
@@ -18703,7 +18613,9 @@ var chsTemplates = (function () {
 	      return testImplicitResolving(state, string);
 	    }
 
-	    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {
+	    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth,
+	      testAmbiguity, state.quotingType, state.forceQuotes && !iskey, inblock)) {
+
 	      case STYLE_PLAIN:
 	        return string;
 	      case STYLE_SINGLE:
@@ -18717,7 +18629,7 @@ var chsTemplates = (function () {
 	      case STYLE_DOUBLE:
 	        return '"' + escapeString(string) + '"';
 	      default:
-	        throw new YAMLException('impossible error: invalid scalar style');
+	        throw new exception('impossible error: invalid scalar style');
 	    }
 	  }());
 	}
@@ -18820,25 +18732,19 @@ var chsTemplates = (function () {
 	// Escapes a double-quoted string.
 	function escapeString(string) {
 	  var result = '';
-	  var char, nextChar;
+	  var char = 0;
 	  var escapeSeq;
 
-	  for (var i = 0; i < string.length; i++) {
-	    char = string.charCodeAt(i);
-	    // Check for surrogate pairs (reference Unicode 3.0 section "3.7 Surrogates").
-	    if (char >= 0xD800 && char <= 0xDBFF/* high surrogate */) {
-	      nextChar = string.charCodeAt(i + 1);
-	      if (nextChar >= 0xDC00 && nextChar <= 0xDFFF/* low surrogate */) {
-	        // Combine the surrogate pair and store it escaped.
-	        result += encodeHex((char - 0xD800) * 0x400 + nextChar - 0xDC00 + 0x10000);
-	        // Advance index one extra since we already used that char here.
-	        i++; continue;
-	      }
-	    }
+	  for (var i = 0; i < string.length; char >= 0x10000 ? i += 2 : i++) {
+	    char = codePointAt(string, i);
 	    escapeSeq = ESCAPE_SEQUENCES[char];
-	    result += !escapeSeq && isPrintable(char)
-	      ? string[i]
-	      : escapeSeq || encodeHex(char);
+
+	    if (!escapeSeq && isPrintable(char)) {
+	      result += string[i];
+	      if (char >= 0x10000) result += string[i + 1];
+	    } else {
+	      result += escapeSeq || encodeHex(char);
+	    }
 	  }
 
 	  return result;
@@ -18848,12 +18754,22 @@ var chsTemplates = (function () {
 	  var _result = '',
 	      _tag    = state.tag,
 	      index,
-	      length;
+	      length,
+	      value;
 
 	  for (index = 0, length = object.length; index < length; index += 1) {
-	    // Write only valid elements.
-	    if (writeNode(state, level, object[index], false, false)) {
-	      if (index !== 0) _result += ',' + (!state.condenseFlow ? ' ' : '');
+	    value = object[index];
+
+	    if (state.replacer) {
+	      value = state.replacer.call(object, String(index), value);
+	    }
+
+	    // Write only valid elements, put null instead of invalid elements.
+	    if (writeNode(state, level, value, false, false) ||
+	        (typeof value === 'undefined' &&
+	         writeNode(state, level, null, false, false))) {
+
+	      if (_result !== '') _result += ',' + (!state.condenseFlow ? ' ' : '');
 	      _result += state.dump;
 	    }
 	  }
@@ -18866,12 +18782,22 @@ var chsTemplates = (function () {
 	  var _result = '',
 	      _tag    = state.tag,
 	      index,
-	      length;
+	      length,
+	      value;
 
 	  for (index = 0, length = object.length; index < length; index += 1) {
-	    // Write only valid elements.
-	    if (writeNode(state, level + 1, object[index], true, true)) {
-	      if (!compact || index !== 0) {
+	    value = object[index];
+
+	    if (state.replacer) {
+	      value = state.replacer.call(object, String(index), value);
+	    }
+
+	    // Write only valid elements, put null instead of invalid elements.
+	    if (writeNode(state, level + 1, value, true, true, false, true) ||
+	        (typeof value === 'undefined' &&
+	         writeNode(state, level + 1, null, true, true, false, true))) {
+
+	      if (!compact || _result !== '') {
 	        _result += generateNextLine(state, level);
 	      }
 
@@ -18902,13 +18828,17 @@ var chsTemplates = (function () {
 	  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
 
 	    pairBuffer = '';
-	    if (index !== 0) pairBuffer += ', ';
+	    if (_result !== '') pairBuffer += ', ';
 
 	    if (state.condenseFlow) pairBuffer += '"';
 
 	    objectKey = objectKeyList[index];
 	    objectValue = object[objectKey];
 
+	    if (state.replacer) {
+	      objectValue = state.replacer.call(object, objectKey, objectValue);
+	    }
+
 	    if (!writeNode(state, level, objectKey, false, false)) {
 	      continue; // Skip this pair because of invalid key;
 	    }
@@ -18951,19 +18881,23 @@ var chsTemplates = (function () {
 	    objectKeyList.sort(state.sortKeys);
 	  } else if (state.sortKeys) {
 	    // Something is wrong
-	    throw new YAMLException('sortKeys must be a boolean or a function');
+	    throw new exception('sortKeys must be a boolean or a function');
 	  }
 
 	  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
 	    pairBuffer = '';
 
-	    if (!compact || index !== 0) {
+	    if (!compact || _result !== '') {
 	      pairBuffer += generateNextLine(state, level);
 	    }
 
 	    objectKey = objectKeyList[index];
 	    objectValue = object[objectKey];
 
+	    if (state.replacer) {
+	      objectValue = state.replacer.call(object, objectKey, objectValue);
+	    }
+
 	    if (!writeNode(state, level + 1, objectKey, true, true, true)) {
 	      continue; // Skip this pair because of invalid key.
 	    }
@@ -19017,7 +18951,15 @@ var chsTemplates = (function () {
 	        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&
 	        (!type.predicate  || type.predicate(object))) {
 
-	      state.tag = explicit ? type.tag : '?';
+	      if (explicit) {
+	        if (type.multi && type.representName) {
+	          state.tag = type.representName(object);
+	        } else {
+	          state.tag = type.tag;
+	        }
+	      } else {
+	        state.tag = '?';
+	      }
 
 	      if (type.represent) {
 	        style = state.styleMap[type.tag] || type.defaultStyle;
@@ -19027,7 +18969,7 @@ var chsTemplates = (function () {
 	        } else if (_hasOwnProperty.call(type.represent, style)) {
 	          _result = type.represent[style](object, style);
 	        } else {
-	          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not "' + style + '" style');
+	          throw new exception('!<' + type.tag + '> tag resolver accepts not "' + style + '" style');
 	        }
 
 	        state.dump = _result;
@@ -19043,7 +18985,7 @@ var chsTemplates = (function () {
 	// Serializes `object` and writes it to global `result`.
 	// Returns true on success, or false on invalid object.
 	//
-	function writeNode(state, level, object, block, compact, iskey) {
+	function writeNode(state, level, object, block, compact, iskey, isblockseq) {
 	  state.tag = null;
 	  state.dump = object;
 
@@ -19052,6 +18994,8 @@ var chsTemplates = (function () {
 	  }
 
 	  var type = _toString.call(state.dump);
+	  var inblock = block;
+	  var tagStr;
 
 	  if (block) {
 	    block = (state.flowLevel < 0 || state.flowLevel > level);
@@ -19089,29 +19033,59 @@ var chsTemplates = (function () {
 	        }
 	      }
 	    } else if (type === '[object Array]') {
-	      var arrayLevel = (state.noArrayIndent && (level > 0)) ? level - 1 : level;
 	      if (block && (state.dump.length !== 0)) {
-	        writeBlockSequence(state, arrayLevel, state.dump, compact);
+	        if (state.noArrayIndent && !isblockseq && level > 0) {
+	          writeBlockSequence(state, level - 1, state.dump, compact);
+	        } else {
+	          writeBlockSequence(state, level, state.dump, compact);
+	        }
 	        if (duplicate) {
 	          state.dump = '&ref_' + duplicateIndex + state.dump;
 	        }
 	      } else {
-	        writeFlowSequence(state, arrayLevel, state.dump);
+	        writeFlowSequence(state, level, state.dump);
 	        if (duplicate) {
 	          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
 	        }
 	      }
 	    } else if (type === '[object String]') {
 	      if (state.tag !== '?') {
-	        writeScalar(state, state.dump, level, iskey);
+	        writeScalar(state, state.dump, level, iskey, inblock);
 	      }
+	    } else if (type === '[object Undefined]') {
+	      return false;
 	    } else {
 	      if (state.skipInvalid) return false;
-	      throw new YAMLException('unacceptable kind of an object to dump ' + type);
+	      throw new exception('unacceptable kind of an object to dump ' + type);
 	    }
 
 	    if (state.tag !== null && state.tag !== '?') {
-	      state.dump = '!<' + state.tag + '> ' + state.dump;
+	      // Need to encode all characters except those allowed by the spec:
+	      //
+	      // [35] ns-dec-digit    ::=  [#x30-#x39] /* 0-9 */
+	      // [36] ns-hex-digit    ::=  ns-dec-digit
+	      //                         | [#x41-#x46] /* A-F */ | [#x61-#x66] /* a-f */
+	      // [37] ns-ascii-letter ::=  [#x41-#x5A] /* A-Z */ | [#x61-#x7A] /* a-z */
+	      // [38] ns-word-char    ::=  ns-dec-digit | ns-ascii-letter | “-”
+	      // [39] ns-uri-char     ::=  “%” ns-hex-digit ns-hex-digit | ns-word-char | “#”
+	      //                         | “;” | “/” | “?” | “:” | “@” | “&” | “=” | “+” | “$” | “,”
+	      //                         | “_” | “.” | “!” | “~” | “*” | “'” | “(” | “)” | “[” | “]”
+	      //
+	      // Also need to encode '!' because it has special meaning (end of tag prefix).
+	      //
+	      tagStr = encodeURI(
+	        state.tag[0] === '!' ? state.tag.slice(1) : state.tag
+	      ).replace(/!/g, '%21');
+
+	      if (state.tag[0] === '!') {
+	        tagStr = '!' + tagStr;
+	      } else if (tagStr.slice(0, 18) === 'tag:yaml.org,2002:') {
+	        tagStr = '!!' + tagStr.slice(18);
+	      } else {
+	        tagStr = '!<' + tagStr + '>';
+	      }
+
+	      state.dump = tagStr + ' ' + state.dump;
 	    }
 	  }
 
@@ -19161,68 +19135,87 @@ var chsTemplates = (function () {
 	  }
 	}
 
-	function dump(input, options) {
+	function dump$1(input, options) {
 	  options = options || {};
 
 	  var state = new State(options);
 
 	  if (!state.noRefs) getDuplicateReferences(input, state);
 
-	  if (writeNode(state, 0, input, true, true)) return state.dump + '\n';
+	  var value = input;
 
-	  return '';
-	}
+	  if (state.replacer) {
+	    value = state.replacer.call({ '': value }, '', value);
+	  }
 
-	function safeDump(input, options) {
-	  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-	}
+	  if (writeNode(state, 0, value, true, true)) return state.dump + '\n';
 
-	dumper$1.dump     = dump;
-	dumper$1.safeDump = safeDump;
+	  return '';
+	}
 
-	var loader = loader$1;
-	var dumper = dumper$1;
+	var dump_1 = dump$1;
 
+	var dumper = {
+		dump: dump_1
+	};
 
-	function deprecated(name) {
+	function renamed(from, to) {
 	  return function () {
-	    throw new Error('Function ' + name + ' is deprecated and cannot be used.');
+	    throw new Error('Function yaml.' + from + ' is removed in js-yaml 4. ' +
+	      'Use yaml.' + to + ' instead, which is now safe by default.');
 	  };
 	}
 
 
-	jsYaml$1.Type                = type;
-	jsYaml$1.Schema              = schema;
-	jsYaml$1.FAILSAFE_SCHEMA     = failsafe;
-	jsYaml$1.JSON_SCHEMA         = json;
-	jsYaml$1.CORE_SCHEMA         = core;
-	jsYaml$1.DEFAULT_SAFE_SCHEMA = default_safe;
-	jsYaml$1.DEFAULT_FULL_SCHEMA = default_full;
-	jsYaml$1.load                = loader.load;
-	jsYaml$1.loadAll             = loader.loadAll;
-	jsYaml$1.safeLoad            = loader.safeLoad;
-	jsYaml$1.safeLoadAll         = loader.safeLoadAll;
-	jsYaml$1.dump                = dumper.dump;
-	jsYaml$1.safeDump            = dumper.safeDump;
-	jsYaml$1.YAMLException       = exception;
-
-	// Deprecated schema names from JS-YAML 2.0.x
-	jsYaml$1.MINIMAL_SCHEMA = failsafe;
-	jsYaml$1.SAFE_SCHEMA    = default_safe;
-	jsYaml$1.DEFAULT_SCHEMA = default_full;
-
-	// Deprecated functions from JS-YAML 1.x.x
-	jsYaml$1.scan           = deprecated('scan');
-	jsYaml$1.parse          = deprecated('parse');
-	jsYaml$1.compose        = deprecated('compose');
-	jsYaml$1.addConstructor = deprecated('addConstructor');
-
-	var yaml = jsYaml$1;
-
+	var Type                = type;
+	var Schema              = schema;
+	var FAILSAFE_SCHEMA     = failsafe;
+	var JSON_SCHEMA         = json;
+	var CORE_SCHEMA         = core;
+	var DEFAULT_SCHEMA      = _default;
+	var load                = loader.load;
+	var loadAll             = loader.loadAll;
+	var dump                = dumper.dump;
+	var YAMLException       = exception;
 
-	var jsYaml = yaml;
+	// Re-export all types in case user wants to create custom schema
+	var types = {
+	  binary:    binary,
+	  float:     float,
+	  map:       map,
+	  null:      _null,
+	  pairs:     pairs,
+	  set:       set,
+	  timestamp: timestamp,
+	  bool:      bool,
+	  int:       int,
+	  merge:     merge,
+	  omap:      omap,
+	  seq:       seq,
+	  str:       str
+	};
 
-	var Yaml = /*@__PURE__*/getDefaultExportFromCjs(jsYaml);
+	// Removed functions from JS-YAML 3.0.x
+	var safeLoad            = renamed('safeLoad', 'load');
+	var safeLoadAll         = renamed('safeLoadAll', 'loadAll');
+	var safeDump            = renamed('safeDump', 'dump');
+
+	var jsYaml = {
+		Type: Type,
+		Schema: Schema,
+		FAILSAFE_SCHEMA: FAILSAFE_SCHEMA,
+		JSON_SCHEMA: JSON_SCHEMA,
+		CORE_SCHEMA: CORE_SCHEMA,
+		DEFAULT_SCHEMA: DEFAULT_SCHEMA,
+		load: load,
+		loadAll: loadAll,
+		dump: dump,
+		YAMLException: YAMLException,
+		types: types,
+		safeLoad: safeLoad,
+		safeLoadAll: safeLoadAll,
+		safeDump: safeDump
+	};
 
 	var en_us = `No: No
 Yes: Yes
@@ -19833,10 +19826,10 @@ exp-video-config:
   click-here-to-detect: click here to detect
   see-troubleshooting:
     See the troubleshooting directions below if you're having trouble!
-  step-1:
-    Make sure you can see yourself to the left! You may need to click "Allow" so
-    that we can access your webcam and microphone. On Firefox, make sure to also
-    check "Remember this decision"!
+  step-1-title: Make sure you can see yourself to the left!
+  step-1-text:
+    You may need to click "Allow" so that we can access your webcam and
+    microphone. On Firefox, make sure to also check "Remember this decision"!
   looks-good: Looks good!
   no-webcam-detected: No webcam detected
   step-2-click-directions: Make sure your webcam settings got saved by clicking
@@ -19845,9 +19838,7 @@ exp-video-config:
     Your webcam should re-appear WITHOUT you having to allow access again. (If
     you do see a dialogue, click "Remember this decision" or "Always allow" and
     try again!)
-  step-3:
-    Make sure we'll be able to hear you! This box will be filled in once we hear
-    a loud enough sound
+  step-3: Make sure we'll be able to hear you!
   sounds-good: Sounds good!
   try-clapping: Try clapping or saying hi.
   step-2-warning:
@@ -20551,10 +20542,11 @@ exp-video-config:
   click-here-to-detect: klikatu hemen kamera hautemateko
   see-troubleshooting:
     Arazorik baduzu, ikusi behean dauden arazoak konpontzeko jarraibideak!
-  step-1:
-    Ziurtatu zeure burua ezkerretara ikusten duzula! Beharbada "Baimendu"
-    klikatu beharko duzu webcamerako eta mikrofonorako sarbidea izan dezagun.
-    Firefoxen, ziurtatu "Aukera hau gogoratu" tikatzen duzula!
+  step-1-title: Ziurtatu zeure burua ezkerretara ikusten duzula!
+  step-1-text:
+    Beharbada "Baimendu" klikatu beharko duzu webcamerako eta mikrofonorako
+    sarbidea izan dezagun. Firefoxen, ziurtatu "Aukera hau gogoratu" tikatzen
+    duzula!
   looks-good: Itxura ona du!
   no-webcam-detected: Ez da webcamik hauteman
   step-2-click-directions: Ziurtatu webcam ezarpenak gorde direla
@@ -20563,9 +20555,7 @@ exp-video-config:
     Webcamak berriz agertu beharko luke berriz baimenik eman GABE. (Dialogo bat
     agertzen bada, sakatu "Gogoratu aukera hau" edo "Beti baimendu" eta berriz
     saiatu!)
-  step-3:
-    Entzun zaitzakegula egiaztatu! Hotsa behar bezain altua denean kutxa hau
-    beteko da
+  step-3: Entzun zaitzakegula egiaztatu!
   sounds-good: Itxura ona du!
   try-clapping: Txalo egin edo kaixo esan.
   step-2-warning:
@@ -21369,11 +21359,11 @@ exp-video-config:
   see-troubleshooting:
     Voir les conseils ci-dessous pour la résolution de problèmes si vous avez
     des difficultés.
-  step-1:
-    Assurez-vous que vous soyez visible à gauche. Il peut être nécessaire de
-    cliquer «Permettre» pour que nous puissions avoir accès à votre webcam et
-    micro. Sur Firefox, assurez-vous aussi de sélectionner «Se souvenir de ce
-    choix»!
+  step-1-title: Assurez-vous que vous soyez visible à gauche.
+  step-1-text:
+    Il peut être nécessaire de cliquer «Permettre» pour que nous puissions avoir
+    accès à votre webcam et micro. Sur Firefox, assurez-vous aussi de
+    sélectionner «Se souvenir de ce choix»!
   looks-good: Très bien!
   no-webcam-detected: Aucune webcam n'est détectée
   step-2-click-directions:
@@ -21383,9 +21373,7 @@ exp-video-config:
     Votre webcam devrait réapparaître SANS que vous ayez besoin d'approuver à
     nouveau l'accès. (Si vous voyez encore une boîte de dialogue, cliquez «Se
     souvenir de ce choix» ou «Toujours permettre» et essayez à nouveau!)
-  step-3:
-    Assurez-vous que nous puissions vous entendre! Cette boîte se remplira une
-    fois que nous aurons entendu un son suffisamment long
+  step-3: Assurez-vous que nous puissions vous entendre!
   sounds-good: Très bien!
   try-clapping: Essayez de taper des mains ou de dire bonjour.
   step-2-warning:
@@ -22149,11 +22137,11 @@ exp-video-config:
   click-here-to-detect: klikkeljen ide
   see-troubleshooting:
     Ha problémába ütközöl, olvasd el az alábbi hibaelhárítási utasításokat!
-  step-1:
-    Győződjön meg róla, hogy a bal oldalon látja magát! Előfordulhat, hogy az
-    "Engedélyezés" gombra kell kattintania, hogy hozzáférhessünk webkamerájához
-    és mikrofonjához. Firefoxban jelölje be a "Jegyezze meg ezt a döntést"
-    jelölőnégyzetet is!
+  step-1-title: Győződjön meg róla, hogy a bal oldalon látja magát!
+  step-1-text:
+    Előfordulhat, hogy az "Engedélyezés" gombra kell kattintania, hogy
+    hozzáférhessünk webkamerájához és mikrofonjához. Firefoxban jelölje be a
+    "Jegyezze meg ezt a döntést" jelölőnégyzetet is!
   looks-good: Minden rendben!
   no-webcam-detected: Nincs webkamera
   step-2-click-directions:
@@ -22165,9 +22153,7 @@ exp-video-config:
     kellene a hozzáférést. (Ha lát egy párbeszédablakot, kattintson a
     "Emlékezzen erre a döntésre" vagy a "Mindig engedélyezze" gombra, és
     próbálja újra!)
-  step-3:
-    Győződjön meg róla, hogy halljuk Önt! Ez a mező akkor lesz teli, ha elég
-    hangos hangot hallunk
+  step-3: Győződjön meg róla, hogy halljuk Önt!
   sounds-good: Jòl hallhatò!
   try-clapping: Pròbáljon tapsolni vagy köszönjön.
   step-2-warning:
@@ -22671,11 +22657,11 @@ exp-video-config:
   see-troubleshooting:
     Se hai problemi, consulta le istruzioni per la risoluzione dei problemi di
     seguito!
-  step-1:
-    Assicurati di essere nell'inquadratura a sinistra! Potrebbe essere
-    necessario fare clic su "Consenti" per farci accedere alla tua webcam e
-    microfono. Su Firefox, assicurati di selezionare anche "Ricorda questa
-    decisione"!
+  step-1-title: Assicurati di essere nell'inquadratura a sinistra!
+  step-1-text:
+    Potrebbe essere necessario fare clic su "Consenti" per farci accedere alla
+    tua webcam e microfono. Su Firefox, assicurati di selezionare anche "Ricorda
+    questa decisione"!
   looks-good: Ti vediamo bene!
   no-webcam-detected: Nessuna webcam e' stata rilevata
   step-2-click-directions:
@@ -22686,9 +22672,7 @@ exp-video-config:
     La tua webcam dovrebbe riapparire SENZA che tu debba consentire nuovamente
     l'accesso. (Se vedi una finestra di dialogo, fai clic su "Ricorda questa
     decisione" o "Consenti sempre" e riprova!)
-  step-3:
-    Assicurati che possiamo sentirti chiaramente! Questa casella diventerà verde
-    quando sentiremo un suono abbastanza alto
+  step-3: Assicurati che possiamo sentirti chiaramente!
   sounds-good: Ti sentiamo bene!
   try-clapping: Prova ad applaudire o a salutare.
   step-2-warning:
@@ -23016,11 +23000,12 @@ exp-video-config:
   see-troubleshooting: 問題がある場合は、以下のトラブルシューティングの方法をご覧ください。
   setup-tips-header: セットアップのヒントとトラブルシューティング
   sounds-good: 良さそうです！
-  step-1: 左側に自分の姿が見えることを確認してください。Webカメラとマイクにアクセスできるように、「許可」をクリックする必要があるかもしれません。Firefoxでは、「この決定を記憶する」にもチェックを入れてください。
+  step-1-title: 左側に自分の姿が見えることを確認してください。
+  step-1-text: Webカメラとマイクにアクセスできるように、「許可」をクリックする必要があるかもしれません。Firefoxでは、「この決定を記憶する」にもチェックを入れてください。
   step-2-click-directions: 「設定確認」をクリックして、ウェブカメラの設定が保存されていることを確認してください。
   step-2-warning: 最初に「ウェブカメラを再読み込み」ボタンを押して、「許可」をクリックしなくても再び表示されることを確認してください。
   step-2-what-should-happen: 再度アクセスを許可しなくても、ウェブカメラが表示されるはずです。(ダイアログが表示された場合は、「この決定を記憶する」または「常に許可する」をクリックして、もう一度試してみてください）。
-  step-3: 声が聞こえるかどうか確認してください。このボックスは、十分な大きさの音が聞こえると緑色に塗りつぶされます
+  step-3: 声が聞こえるかどうか確認してください。
   step-3-warning: まず、録音した音声が十分な大きさであることを確認してください。音を出してみてください。
   support-message: Lookitは現在、FirefoxとChromeの最近のバージョンにのみ対応しています。携帯電話やタブレットなどのモバイルデバイスではまだ動作しません。
   supported-setup: お使いのデバイスとブラウザの確認
@@ -23444,10 +23429,11 @@ exp-video-config:
   see-troubleshooting:
     Raadpleeg de onderstaande instructies voor oplossingen als u problemen
     ondervindt!
-  step-1:
-    Zorg ervoor dat je jezelf aan de linkerkant kunt zien! Mogelijk moet u op
-    "Toestaan" klikken zodat we toegang hebben tot uw webcam en microfoon. Zorg
-    er in Firefox voor dat u ook "Onthoud deze beslissing" aanvinkt!
+  step-1-title: Zorg ervoor dat je jezelf aan de linkerkant kunt zien!
+  step-1-text:
+    Mogelijk moet u op "Toestaan" klikken zodat we toegang hebben tot uw webcam
+    en microfoon. Zorg er in Firefox voor dat u ook "Onthoud deze beslissing"
+    aanvinkt!
   looks-good: Ziet er goed uit!
   no-webcam-detected: Geen webcam gedetecteerd
   step-2-click-directions:
@@ -23457,9 +23443,7 @@ exp-video-config:
     Uw webcam zou opnieuw moeten verschijnen ZONDER dat u opnieuw toegang hoeft
     te verlenen. (Als je een dialoogvenster ziet, klik dan op 'Onthoud deze
     beslissing' of 'Altijd toestaan' en probeer het opnieuw!)
-  step-3:
-    Zorg ervoor dat we u kunnen horen! Dit vak wordt ingevuld zodra we een
-    voldoende luid geluid horen
+  step-3: Zorg ervoor dat we u kunnen horen!
   sounds-good: Klinkt goed!
   try-clapping: Probeer te klappen of hallo te zeggen.
   step-2-warning:
@@ -24274,10 +24258,11 @@ exp-video-config:
     problemas!
   setup-tips-header: Dicas de configuração e solução de problemas
   sounds-good: Parece bom!
-  step-1:
-    Certifique-se de que você pode se ver à esquerda! Pode ser necessário clicar
-    em "Permitir" para que possamos acessar sua webcam e microfone. No Firefox,
-    certifique-se de marcar também "Lembrar desta decisão"!
+  step-1-title: Certifique-se de que você pode se ver à esquerda!
+  step-1-text:
+    Pode ser necessário clicar em "Permitir" para que possamos acessar sua
+    webcam e microfone. No Firefox, certifique-se de marcar também "Lembrar
+    desta decisão"!
   step-2-click-directions:
     Certifique-se de que as configurações da sua webcam foram salvas clicando em
   step-2-warning:
@@ -24287,9 +24272,7 @@ exp-video-config:
     Sua webcam deve reaparecer SEM que você precise permitir o acesso novamente.
     (Se você vir uma caixa de diálogo, clique em "Lembrar desta decisão" ou
     "Sempre permitir" e tente novamente!)
-  step-3:
-    Certifique-se de que podemos ouvi-lo! Esta caixa será preenchida assim que
-    ouvirmos um som alto o suficiente
+  step-3: Certifique-se de que podemos ouvi-lo!
   step-3-warning:
     Verifique primeiro se o áudio da sua gravação está alto o suficiente. Faça
     algum Barulho!
@@ -24754,10 +24737,11 @@ exp-video-config:
     problemas!
   setup-tips-header: Dicas de configuração e solução de problemas
   sounds-good: Soa bem!
-  step-1:
-    Certifique-se de que você pode se ver à esquerda! Pode ser necessário clicar
-    em "Permitir" para que possamos acessar sua webcam e microfone. No Firefox,
-    certifique-se de marcar também "Lembrar desta decisão"!
+  step-1-title: Certifique-se de que você pode se ver à esquerda!
+  step-1-text:
+    Pode ser necessário clicar em "Permitir" para que possamos acessar sua
+    webcam e microfone. No Firefox, certifique-se de marcar também "Lembrar
+    desta decisão"!
   step-2-click-directions:
     Certifique-se de que as configurações da sua webcam foram salvas clicando em
   step-2-warning:
@@ -24767,9 +24751,7 @@ exp-video-config:
     Sua webcam deve reaparecer SEM que você precise permitir o acesso novamente.
     (Se você vir uma caixa de diálogo, clique em "Lembrar desta decisão" ou
     "Sempre permitir" e tente novamente!)
-  step-3:
-    Certifique-se de que podemos ouvi-lo! Esta caixa será preenchida assim que
-    ouvirmos um som alto o suficiente
+  step-3: Certifique-se de que podemos ouvi-lo!
   step-3-warning:
     Verifique primeiro se o áudio da sua gravação está alto o suficiente. Faça
     algum Barulho!
@@ -24836,7 +24818,7 @@ uploading video: enviando vídeo
 	    return Object.entries(translations).reduce((prev, [locale, translation]) => {
 	        const lcl = new Intl.Locale(locale);
 	        return Object.assign(Object.assign({}, prev), { [lcl.baseName]: {
-	                translation: Yaml.load(translation),
+	                translation: jsYaml.load(translation),
 	            } });
 	    }, {});
 	};
@@ -24899,9 +24881,425 @@ uploading video: enviando vídeo
 	    }
 	};
 
-	var index = { consentVideo };
+	/**
+	 * Class to augment and translate the exit survey JSON based on user set
+	 * parameters.
+	 */
+	class ExitSurveyJson {
+	    /**
+	     * Adjust survey json to meet user's parameters.
+	     *
+	     * @param trial - Trial data including user supplied parameters.
+	     */
+	    constructor(trial) {
+	        this.trial = trial;
+	        this.names = {
+	            birthDate: "birthDate",
+	            databraryShare: "databraryShare",
+	            useOfMedia: "useOfMedia",
+	            withdrawal: "withdrawal",
+	            feedback: "feedback",
+	        };
+	        this.survey = {
+	            pages: [
+	                {
+	                    elements: [
+	                        {
+	                            description: "exp-lookit-exit-survey.why-birthdate",
+	                            inputType: "date",
+	                            isRequired: true,
+	                            maxValueExpression: "today()",
+	                            name: this.names.birthDate,
+	                            title: "exp-lookit-exit-survey.confirm-birthdate",
+	                            type: "text",
+	                        },
+	                        {
+	                            description: "exp-lookit-exit-survey.databrary-info",
+	                            enableIf: "({withdrawal} empty) or ({withdrawal.length} = 0)",
+	                            isRequired: true,
+	                            name: this.names.databraryShare,
+	                            title: "exp-lookit-exit-survey.q-databrary",
+	                            type: "boolean",
+	                            valueFalse: "no",
+	                            valueTrue: "yes",
+	                        },
+	                        {
+	                            choices: [
+	                                {
+	                                    text: "exp-lookit-exit-survey.private-option-part-1",
+	                                    value: "private",
+	                                },
+	                                {
+	                                    text: "exp-lookit-exit-survey.scientific-option",
+	                                    value: "scientific",
+	                                },
+	                                {
+	                                    text: "exp-lookit-exit-survey.publicity-option",
+	                                    value: "public",
+	                                },
+	                            ],
+	                            description: "",
+	                            enableIf: "({withdrawal} empty) or ({withdrawal.length} = 0)",
+	                            isRequired: true,
+	                            name: this.names.useOfMedia,
+	                            title: "exp-lookit-exit-survey.acceptable-use-header",
+	                            type: "radiogroup",
+	                        },
+	                        {
+	                            choices: [
+	                                {
+	                                    text: "exp-lookit-exit-survey.withdrawal-details",
+	                                    value: true,
+	                                },
+	                            ],
+	                            defaultValue: [],
+	                            isRequired: false,
+	                            name: this.names.withdrawal,
+	                            title: "exp-lookit-exit-survey.withdrawal-header",
+	                            type: "checkbox",
+	                        },
+	                        {
+	                            autoGrow: true,
+	                            name: this.names.feedback,
+	                            rows: 3,
+	                            title: "exp-lookit-exit-survey.feedback-label",
+	                            type: "comment",
+	                        },
+	                    ],
+	                    name: "page1",
+	                },
+	            ],
+	            showQuestionNumbers: "off",
+	        };
+	        this.showDatabraryOptions();
+	        this.additionalVideoPrivacyText();
+	        this.privateLevelOnly();
+	        this.translation();
+	    }
+	    /** Alter survey to show Databrary options. */
+	    showDatabraryOptions() {
+	        if (!this.trial.show_databrary_options) {
+	            const survey_elements = this.survey.pages[0].elements;
+	            const databrary_share_element_idx = survey_elements.findIndex((element) => element.name === this.names.databraryShare);
+	            survey_elements.splice(databrary_share_element_idx, 1);
+	        }
+	    }
+	    /** Alter survey to contain additional video privacy text. */
+	    additionalVideoPrivacyText() {
+	        const element = this.survey.pages[0].elements.find((element) => element.name === this.names.useOfMedia);
+	        element &&
+	            Object.assign(element, {
+	                description: this.trial.additional_video_privacy_text,
+	            });
+	    }
+	    /** Alter survey to only show "private" on use of media question. */
+	    privateLevelOnly() {
+	        if (this.trial.private_level_only) {
+	            const media_use_element = this.survey.pages[0].elements.find((element) => element.name === this.names.useOfMedia);
+	            media_use_element &&
+	                Object.assign(media_use_element, {
+	                    defaultValue: "private",
+	                    description: "exp-lookit-exit-survey.private-option-part-1",
+	                    choicesVisibleIf: "false", // this must be a string expression
+	                    isRequired: false,
+	                });
+	        }
+	    }
+	    /** Translate the survey text. */
+	    translation() {
+	        const { contact_info, name } = window.chs.study.attributes;
+	        const view = Object.assign(Object.assign({}, this.trial), { include_example: this.trial.include_withdrawal_example, contact: contact_info, name });
+	        this.survey.pages[0].elements.forEach((element) => {
+	            // Descriptions
+	            element.description &&
+	                Object.assign(element, {
+	                    description: instance.t(element.description, view),
+	                });
+	            // Titles
+	            Object.assign(element, { title: instance.t(element.title, view) });
+	            // Choices
+	            element.choices &&
+	                element.choices.forEach((choice) => {
+	                    Object.assign(choice, { text: instance.t(choice.text, view) });
+	                });
+	        });
+	    }
+	}
+	/**
+	 * Translate survey text to desired locale.
+	 *
+	 * @param trial - Trial data including user supplied parameters.
+	 * @returns Survey json
+	 */
+	const exitSurvey = (trial) => {
+	    setLocale(trial);
+	    return new ExitSurveyJson(trial).survey;
+	};
+
+	var uploadingVideoTemplate = `<div>{{t "uploading video"}}, {{t "please wait"}}...</div>`;
+
+	/**
+	 * Get translated template for uploading video message.
+	 *
+	 * @param trial - JsPsych trial object containing trial params
+	 * @returns Uploading video message HTML
+	 */
+	const uploadingVideo = (trial) => {
+	    setLocale(trial);
+	    return Handlebars.compile(uploadingVideoTemplate)({});
+	};
+
+	var videoConfigTemplate = `<div id="lookit-jspsych-video-config">
+  <div id="lookit-jspsych-video-config-title-row">
+    <h2>{{t "exp-video-config.title"}}</h2>
+    <p>{{t "exp-video-config.not-recording-note"}}</p>
+  </div>
+  <div id="lookit-jspsych-video-config-row-container">
+    <div id="lookit-jspsych-video-config-webcam-column">
+      <div id="{{webcam_container_id}}"></div>
+      <div id="lookit-jspsych-webcam-buttons">
+        <div id="lookit-jspsych-webcam-reload-container">
+          <div>
+            <button
+              type="button"
+              id="{{reload_button_id_cam}}"
+              class="jspsych-btn lookit-jspsych-btn"
+            >
+              {{t "Reload webcam"}}
+            </button>
+          </div>
+        </div>
+        <div id="lookit-jspsych-device-selection-container">
+          <div id="lookit-jspsych-webcam-selection">
+            <select
+              name="lookit-jspsych-webcam"
+              id="{{camera_selection_id}}"
+              class="lookit-jspsych-device-selection"
+            ></select>
+          </div>
+          <div id="lookit-jspsych-mic-selection">
+            <select
+              name="lookit-jspsych-mic"
+              id="{{mic_selection_id}}"
+              class="lookit-jspsych-device-selection"
+            ></select>
+          </div>
+        </div>
+      </div>
+      <div id="lookit-jspsych-browser-note" class="lookit-jspsych-help-text">
+        {{t "exp-video-config.Note"}}:
+        {{t "exp-video-config.support-message"}}
+      </div>
+    </div>
+    <div id="lookit-jspsych-video-config-instructions-column">
+      <div id="lookit-jspsych-video-config-errors">
+        <span
+          id="lookit-jspsych-waiting-for-access"
+          class="error_msg"
+          style="display: none;"
+        >{{t "exp-video-config.no-webcam-detected"}}</span>
+        <span
+          id="lookit-jspsych-checking-mic"
+          class="error_msg"
+          style="display: none;"
+        >{{t "exp-video-config.try-clapping"}}</span>
+        <span
+          id="lookit-jspsych-access-problem"
+          class="error_msg"
+          style="display: none;"
+        >{{t "exp-video-config.camera-access-warning"}}</span>
+        <span
+          id="lookit-jspsych-setup-problem"
+          class="error_msg"
+          style="display: none;"
+        >{{t "exp-video-config.see-troubleshooting"}}</span>
+      </div>
+      <ol id="lookit-jspsych-video-config-instructions">
+        <li id="{{step1_id}}">
+          <strong>{{t "exp-video-config.step-1-title"}}</strong>
+          <span
+            id="{{step1_id}}-span"
+            style="visibility: hidden"
+            class="{{step_complete_class}}"
+          >{{t "exp-video-config.looks-good"}}
+            <img
+              class="lookit-jspsych-checkmark"
+              src="{{checkmarkIcon}}"
+              alt="Green checkmark"
+            /></span>
+          <p id="{{step1_id}}-paragraph">
+            {{t "exp-video-config.step-1-text"}}
+          </p>
+        </li>
+        <li id="{{step2_id}}">
+          <strong>{{t "exp-video-config.step-2-click-directions"}}
+            <button
+              id="{{reload_button_id_text}}"
+              class="jspsych-btn lookit-jspsych-btn"
+            >
+              {{t "exp-video-config.reload-button-label"}}
+            </button>.</strong>
+          <span
+            id="{{step2_id}}-span"
+            style="visibility: hidden"
+            class="{{step_complete_class}}"
+          ><img
+              class="lookit-jspsych-checkmark"
+              src="{{checkmarkIcon}}"
+              alt="Green checkmark"
+            /></span>
+          <p id="{{step2_id}}-paragraph">
+            {{t "exp-video-config.step-2-what-should-happen"}}
+          </p>
+        </li>
+        <li id="{{step3_id}}">
+          <strong>{{t "exp-video-config.step-3"}}:</strong>
+          <span
+            id="{{step3_id}}-span"
+            style="visibility: hidden"
+            class="{{step_complete_class}}"
+          >{{t "exp-video-config.sounds-good"}}
+            <img
+              class="lookit-jspsych-checkmark"
+              src="{{checkmarkIcon}}"
+              alt="Green checkmark"
+            /></span>
+          <p id="{{step3_id}}-paragraph">{{t
+              "exp-video-config.try-clapping"
+            }}</p>
+        </li>
+      </ol>
+    </div>
+  </div>
+  <div id="lookit-jspsych-next-container" class="jspsych-instructions-nav">
+    <button
+      id="{{next_button_id}}"
+      class="jspsych-btn lookit-jspsych-btn"
+      style="margin-left: 5px"
+      disabled
+    >
+      {{t "Next"}}
+    </button>
+  </div>
+  <div id="lookit-jspsych-config-troubleshooting-column-container">
+    <div id="lookit-jspsych-accordion-header-container">
+      <h2> {{t "exp-video-config.setup-tips-header"}} </h2>
+      <hr />
+      <p id="lookit-jspsych-troubleshooting-intro">
+        {{exp-format troubleshooting_intro}}
+      </p>
+    </div>
+    <div id="lookit-jspsych-accordion-container">
+      <button class="lookit-jspsych-accordion">
+        {{t "exp-video-config.supported-setup"}}
+      </button>
+      <div class="lookit-jspsych-accordion-panel" style="display: none">
+        <ol>
+          <li>
+            {{t "exp-video-config.mobile-devices"}}
+          </li>
+          <li>
+            {{t "exp-video-config.browser-support"}}
+          </li>
+        </ol>
+      </div>
+      <button class="lookit-jspsych-accordion">
+        {{t "exp-video-config.chrome-instructions-header"}}
+      </button>
+      <div class="lookit-jspsych-accordion-panel" style="display: none">
+        <ol>
+          <li>
+            {{t "exp-video-config.chrome-directions-prompt"}}
+            <img
+              class="lookit-jspsych-screenshot"
+              src="{{chromeInitialPrompt}}"
+              alt="Chrome permissions prompt"
+            />
+          </li>
+          <li>
+            {{t "exp-video-config.chrome-directions-set-perms"}}
+            <img
+              class="lookit-jspsych-screenshot"
+              src="{{chromePermissions}}"
+              alt="Editing microphone and camera permissions in Chrome, step 1"
+            />
+          </li>
+          <li>
+            {{t "exp-video-config.chrome-select-mic" htmlSafe=true}}
+          </li>
+          <li>
+            {{t "exp-video-config.chrome-select-camera" htmlSafe=true}}
+          </li>
+          <li>
+            {{t "exp-video-config.chrome-further-help" htmlSafe=true}}
+          </li>
+        </ol>
+      </div>
+      <button class="lookit-jspsych-accordion">
+        {{t "exp-video-config.firefox-instructions-header"}}
+      </button>
+      <div class="lookit-jspsych-accordion-panel" style="display: none">
+        <ol>
+          <li>
+            {{t "exp-video-config.firefox-directions-prompt"}}
+            <img
+              class="lookit-jspsych-screenshot"
+              src="{{firefoxInitialPrompt}}"
+              alt="Firefox permissions prompt"
+            />
+          </li>
+          <li>
+            {{t "exp-video-config.firefox-directions-set-perms"}}
+            <img
+              class="lookit-jspsych-screenshot"
+              src="{{firefoxDevicesBlocked}}"
+              alt="Blocked microphone and camera permissions in Firefox"
+            />
+          </li>
+        </ol>
+      </div>
+      <button class="lookit-jspsych-accordion">
+        {{t "exp-video-config.additional-troubleshooting-header"}}
+      </button>
+      <div class="lookit-jspsych-accordion-panel" style="display: none">
+        <p>
+          {{t "exp-video-config.additional-troubleshooting-intro"}}
+        </p>
+        <ol>
+          <li>
+            {{t "exp-video-config.camera-check"}}
+          </li>
+          <li>
+            {{t "exp-video-config.try-another-browser"}}
+          </li>
+          <li>
+            {{t "exp-video-config.chrome-incognito"}}
+          </li>
+          <li>
+            {{t "exp-video-config.additional-troubleshooting-contact"}}:
+            {{session.id}}
+          </li>
+        </ol>
+      </div>
+    </div>
+  </div>
+</div>`;
+
+	/**
+	 * Get translated template for video config.
+	 *
+	 * @param trial - JsPsych trial object containing trial params
+	 * @param html_params - Additional context variables for the template.
+	 * @returns Video config HTML
+	 */
+	const videoConfig = (trial, html_params) => {
+	    setLocale(trial);
+	    return Handlebars.compile(videoConfigTemplate)(Object.assign(Object.assign({}, trial), html_params));
+	};
+
+	var index = { consentVideo, videoConfig, uploadingVideo, exitSurvey };
 
 	return index;
 
 })();
-//# sourceMappingURL=https://unpkg.com/@lookit/templates@1.0.0/dist/index.browser.js.map
+//# sourceMappingURL=https://unpkg.com/@lookit/templates@1.1.0/dist/index.browser.js.map