From fa33d354a47f0b99064f285417d9456d195743b7 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 26 Apr 2018 12:39:34 -0700 Subject: [PATCH] Upgrade ember-cli to 2.14 --- .gitignore | 6 ++ app/app.js | 4 +- config/environment.js | 28 +++---- ember-cli-build.js | 90 ++++++++++----------- package.json | 6 +- yarn.lock | 179 ++++++++++++++---------------------------- 6 files changed, 126 insertions(+), 187 deletions(-) diff --git a/.gitignore b/.gitignore index 8f01e812..02e4107c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,10 @@ /coverage/* /libpeerconnection.log npm-debug.log* +yarn-error.log testem.log + +# ember-try +.node_modules.ember-try/ +bower.json.ember-try +package.json.ember-try diff --git a/app/app.js b/app/app.js index f796e79d..c15f9359 100644 --- a/app/app.js +++ b/app/app.js @@ -3,9 +3,7 @@ import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -let App; - -App = Ember.Application.extend({ +const App = Ember.Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver diff --git a/config/environment.js b/config/environment.js index a11166c1..d2d01002 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,25 +1,25 @@ module.exports = function(environment) { - var deployTarget = process.env.DEPLOY_TARGET; - var rootURL = process.env.TWIDDLE_ROOT_URL || '/'; - var host = process.env.GH_API_HOST || 'https://api.github.com'; - var toriiGHEBaseURL = process.env.TORII_GHE_OAUTH || null; - var toriiProvider = process.env.TORII_PROVIDER || 'github-oauth2'; - var githubOauthURL = process.env.GATEKEEPER_URL || 'http://localhost:9999/authenticate/'; - var assetsHost = process.env.TWIDDLE_ASSET_HOST || '/'; - var githubApiKey = process.env.GH_API_KEY || '2b84ab967ef8266ca0dc' + let deployTarget = process.env.DEPLOY_TARGET; + let rootURL = process.env.TWIDDLE_ROOT_URL || '/'; + let host = process.env.GH_API_HOST || 'https://api.github.com'; + let toriiGHEBaseURL = process.env.TORII_GHE_OAUTH || null; + let toriiProvider = process.env.TORII_PROVIDER || 'github-oauth2'; + let githubOauthURL = process.env.GATEKEEPER_URL || 'http://localhost:9999/authenticate/'; + let assetsHost = process.env.TWIDDLE_ASSET_HOST || '/'; + let githubApiKey = process.env.GH_API_KEY || '2b84ab967ef8266ca0dc' - var ENV = { + let ENV = { modulePrefix: 'ember-twiddle', - environment: environment, + environment, rootURL: rootURL, locationType: 'auto', - host: host, + host, githubOauthUrl: githubOauthURL, - githubApiKey: githubApiKey, + githubApiKey, addonUrl: 'https://emw2ujz4u1.execute-api.us-east-1.amazonaws.com/canary/addon', - assetsHost: assetsHost, + assetsHost, maxNumFilesInitiallyExpanded: 12, - toriiProvider: toriiProvider, + toriiProvider, EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build diff --git a/ember-cli-build.js b/ember-cli-build.js index cf87cced..29883e16 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -2,20 +2,20 @@ module.exports = function(defaults) { process.env.FASTBOOT_DISABLED = true; - var EmberApp = require('ember-cli/lib/broccoli/ember-app'); - var funnel = require('broccoli-funnel'); - var concat = require('broccoli-concat'); - var mergeTrees = require('broccoli-merge-trees'); - var babelTranspiler = require('broccoli-babel-transpiler'); - var browserify = require('browserify'); - var path = require('path'); - var fs = require('fs'); - - var env = EmberApp.env(); - var deployTarget = process.env.DEPLOY_TARGET; - var isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1; - var isFastboot = process.env.EMBER_CLI_FASTBOOT; - var prepend = null; + const EmberApp = require('ember-cli/lib/broccoli/ember-app'); + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const mergeTrees = require('broccoli-merge-trees'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const browserify = require('browserify'); + const path = require('path'); + const fs = require('fs'); + + const env = EmberApp.env(); + const deployTarget = process.env.DEPLOY_TARGET; + const isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1; + const isFastboot = process.env.EMBER_CLI_FASTBOOT; + let prepend = null; if (isProductionLikeBuild) { if (deployTarget === 'production') { @@ -26,9 +26,9 @@ module.exports = function(defaults) { } } - var blueprintsCode = getEmberCLIBlueprints(); + const blueprintsCode = getEmberCLIBlueprints(); - var app = new EmberApp(defaults, { + let app = new EmberApp(defaults, { SRI: { runsIn: "production" }, @@ -83,7 +83,7 @@ module.exports = function(defaults) { }); if (isFastboot) { - var b = browserify(); + let b = browserify(); b.add(require.resolve('babel-core/browser-polyfill')); b.bundle(function(err, buf) { fs.writeFileSync('vendor/polyfill.js', buf); @@ -102,12 +102,12 @@ module.exports = function(defaults) { app.import('vendor/bootstrap-dropdown-submenu-fix.css'); app.import('vendor/hint.css'); - var loaderTree = funnel(path.dirname(require.resolve('loader.js')), { + let loaderTree = funnel(path.dirname(require.resolve('loader.js')), { files: ['loader.js'], destDir: '/assets' }); - var testLoaderTree = funnel("node_modules/ember-cli-test-loader/addon-test-support", { + let testLoaderTree = funnel("node_modules/ember-cli-test-loader/addon-test-support", { files: ['index.js'], getDestinationPath: function() { return "assets/test-loader.js"; @@ -115,33 +115,33 @@ module.exports = function(defaults) { }); testLoaderTree = babelTranspiler(testLoaderTree, babelOpts()); - var emberDataShims = funnel('vendor', { + let emberDataShims = funnel('vendor', { files: ['ember-data-shims.js'] }); - var bowerTree = funnel('bower_components'); - var shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { + let bowerTree = funnel('bower_components'); + let shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { destDir: 'ember-cli-shims' }); - var baseResolverTree = funnel('node_modules/ember-resolver/addon', { + let baseResolverTree = funnel('node_modules/ember-resolver/addon', { destDir: 'ember-resolver' }); - var transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); + let transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); - var baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { + let baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { destDir: 'ember-load-initializers' }); - var transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); + let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); - var finalQUnitTree = buildAddonTree('ember-qunit'); - var finalTestHelpersTree = buildAddonTree('ember-test-helpers'); + let finalQUnitTree = buildAddonTree('ember-qunit'); + let finalTestHelpersTree = buildAddonTree('ember-test-helpers'); - var mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); + let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); - var twiddleVendorTree = concat(mergedDepsTree, { + let twiddleVendorTree = concat(mergedDepsTree, { inputFiles: [ 'ember-cli-shims/app-shims.js', 'ember-load-initializers/**/*.js', @@ -155,16 +155,16 @@ module.exports = function(defaults) { }; function buildAddonTree(addonName) { - var funnel = require('broccoli-funnel'); - var concat = require('broccoli-concat'); - var babelTranspiler = require('broccoli-babel-transpiler'); - var path = require('path'); + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const path = require('path'); - var baseTree = funnel(path.dirname(require.resolve(addonName)), { + let baseTree = funnel(path.dirname(require.resolve(addonName)), { include: ['**/*.js'] }); - var transpiledTree = babelTranspiler(baseTree, babelOpts()); + let transpiledTree = babelTranspiler(baseTree, babelOpts()); return concat(transpiledTree, { inputFiles: ['**/*.js'], @@ -189,11 +189,11 @@ function babelOpts() { // app/lib/blueprints so we don't have to maintain our // own blueprints function getEmberCLIBlueprints() { - var fs = require('fs'); - var path = require('path'); - var fileMap = {}; + const fs = require('fs'); + const path = require('path'); + let fileMap = {}; - var blueprintFiles = { + let blueprintFiles = { "cliBlueprintFiles": { "path": "node_modules/ember-cli", "files": { @@ -224,11 +224,11 @@ function getEmberCLIBlueprints() { } }; - for (var list in blueprintFiles) { - var blueprintPath = blueprintFiles[list].path; - var files = blueprintFiles[list].files; - for (var blueprintName in files) { - var filePath = blueprintPath + '/blueprints/' + files[blueprintName]; + for (let list in blueprintFiles) { + let blueprintPath = blueprintFiles[list].path; + let files = blueprintFiles[list].files; + for (let blueprintName in files) { + let filePath = blueprintPath + '/blueprints/' + files[blueprintName]; fileMap[blueprintName] = fs.readFileSync(filePath).toString(); } } diff --git a/package.json b/package.json index cc63546d..e96ab9a4 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", "ember-autoresize": "~0.6.1", - "ember-cli": "2.13.3", + "ember-cli": "2.14.2", "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", @@ -43,7 +43,7 @@ "ember-cli-eslint": "^4.2.3", "ember-cli-fastboot": "^1.0.0", "ember-cli-file-creator": "~0.4.0", - "ember-cli-htmlbars": "^1.3.4", + "ember-cli-htmlbars": "^2.0.1", "ember-cli-htmlbars-inline-precompile": "~0.4.4", "ember-cli-inject-live-reload": "^1.7.0", "ember-cli-jstree": "^1.0.9", @@ -72,7 +72,7 @@ "ember-resolver": "^4.0.0", "ember-responsive": "^2.0.8", "ember-route-action-helper": "^2.0.6", - "ember-source": "~2.13.3", + "ember-source": "~2.14.1", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", "ivy-codemirror": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index e38c54f1..4e3232b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,10 +11,6 @@ "@glimmer/wire-format" "^0.22.3" simple-html-tokenizer "^0.3.0" -"@glimmer/di@^0.1.8": - version "0.1.11" - resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280" - "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" @@ -231,11 +227,11 @@ ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" -ansi-styles@^2.1.0, ansi-styles@^2.2.1: +ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.1: +ansi-styles@^3.0.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -311,7 +307,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.7, argparse@~1.0.2: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" dependencies: @@ -1423,7 +1419,7 @@ broccoli-brocfile-loader@^0.18.0: dependencies: findup-sync "^0.4.2" -broccoli-builder@^0.18.3: +broccoli-builder@^0.18.8: version "0.18.11" resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.11.tgz#a42393c7b10bb0380df255a616307945f5e26efb" dependencies: @@ -1620,7 +1616,7 @@ broccoli-lint-eslint@^4.2.1: lodash.defaultsdeep "^4.6.0" md5-hex "^2.0.0" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.4: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" dependencies: @@ -1647,7 +1643,7 @@ broccoli-merge-trees@^3.0.0: broccoli-plugin "^1.3.0" merge-trees "^2.0.0" -broccoli-middleware@^1.0.0-beta.8: +broccoli-middleware@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436" dependencies: @@ -2076,13 +2072,6 @@ capture-exit@^1.1.0: dependencies: rsvp "^3.3.3" -cardinal@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291" - dependencies: - ansicolors "~0.2.1" - redeyed "~0.5.0" - cardinal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9" @@ -3243,7 +3232,7 @@ ember-cli-htmlbars-inline-precompile@~0.4.4: hash-for-dep "^1.0.2" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.3.4: +ember-cli-htmlbars@^1.0.3: version "1.3.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353" dependencies: @@ -3500,7 +3489,7 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0, ember-cli-version-checker@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -3513,9 +3502,9 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.13.3: - version "2.13.3" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.3.tgz#1918500e6280a68be017aca9b69937f6782a24b8" +ember-cli@2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.14.2.tgz#f2c8c75d486ce6cc6b7ffbc22ebef8b32bb242b7" dependencies: amd-name-resolver "0.0.6" babel-plugin-transform-es2015-modules-amd "^6.24.0" @@ -3523,14 +3512,14 @@ ember-cli@2.13.3: bower-endpoint-parser "0.2.2" broccoli-babel-transpiler "^6.0.0" broccoli-brocfile-loader "^0.18.0" - broccoli-builder "^0.18.3" + broccoli-builder "^0.18.8" broccoli-concat "^3.2.2" broccoli-config-loader "^1.0.0" broccoli-config-replace "^1.1.2" broccoli-funnel "^1.0.6" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^2.0.0" - broccoli-middleware "^1.0.0-beta.8" + broccoli-middleware "^1.0.0" broccoli-source "^1.1.0" broccoli-stew "^1.2.0" calculate-cache-key-for-tree "^1.0.0" @@ -3560,7 +3549,7 @@ ember-cli@2.13.3: express "^4.12.3" filesize "^3.1.3" find-up "^2.1.0" - fs-extra "2.0.0" + fs-extra "^3.0.0" fs-tree-diff "^0.5.2" get-caller-file "^1.0.0" git-repo-info "^1.4.1" @@ -3578,7 +3567,7 @@ ember-cli@2.13.3: leek "0.0.24" lodash.template "^4.2.5" markdown-it "^8.3.0" - markdown-it-terminal "0.0.4" + markdown-it-terminal "0.1.0" minimatch "^3.0.0" morgan "^1.8.1" node-modules-path "^1.0.0" @@ -3813,31 +3802,30 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-source@~2.13.3: - version "2.13.4" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.13.4.tgz#97022069febfb5651ddc26a83f1987370cc404c8" +ember-source@~2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.14.1.tgz#4abf0b4c916f2da8bf317349df4750905df7e628" dependencies: "@glimmer/compiler" "^0.22.3" - "@glimmer/di" "^0.1.8" "@glimmer/node" "^0.22.3" "@glimmer/reference" "^0.22.3" "@glimmer/runtime" "^0.22.3" "@glimmer/util" "^0.22.3" - broccoli-funnel "^1.0.6" - broccoli-merge-trees "^1.1.4" + broccoli-funnel "^1.2.0" + broccoli-merge-trees "^2.0.0" ember-cli-get-component-path-option "^1.0.0" ember-cli-normalize-entity-name "^1.0.0" ember-cli-path-utils "^1.0.0" - ember-cli-string-utils "^1.0.0" + ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" ember-cli-valid-component-name "^1.0.0" - ember-cli-version-checker "^1.1.7" + ember-cli-version-checker "^1.3.1" handlebars "^4.0.6" - jquery "^3.1.1" - resolve "^1.1.7" - rsvp "^3.4.0" + jquery "^3.2.1" + resolve "^1.3.3" + rsvp "^3.5.0" simple-dom "^0.3.0" - simple-html-tokenizer "^0.3.0" + simple-html-tokenizer "^0.4.1" ember-string-ishtmlsafe-polyfill@^1.1.0: version "1.1.0" @@ -4107,10 +4095,6 @@ espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" -esprima-fb@~12001.1.0-dev-harmony-fb: - version "12001.1.0-dev-harmony-fb" - resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915" - esprima-fb@~15001.1001.0-dev-harmony-fb: version "15001.1001.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659" @@ -4625,13 +4609,6 @@ fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" -fs-extra@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - fs-extra@^0.24.0: version "0.24.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952" @@ -4676,6 +4653,14 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" +fs-extra@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + fs-extra@^4.0.0, fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -5792,7 +5777,7 @@ jquery-deferred@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355" -jquery@^3.1.1: +jquery@^3.2.1: version "3.3.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" @@ -5889,6 +5874,12 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5995,12 +5986,6 @@ linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -linkify-it@~1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a" - dependencies: - uc.micro "^1.0.1" - livereload-js@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a" @@ -6350,14 +6335,6 @@ lodash.isobject@~2.3.0: dependencies: lodash._objecttypes "~2.3.0" -lodash.isplainobject@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5" - dependencies: - lodash._basefor "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.keysin "^3.0.0" - lodash.istypedarray@^3.0.0: version "3.0.6" resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" @@ -6378,34 +6355,11 @@ lodash.keys@~2.3.0: lodash._shimkeys "~2.3.0" lodash.isobject "~2.3.0" -lodash.keysin@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f" - dependencies: - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" -lodash.merge@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994" - dependencies: - lodash._arraycopy "^3.0.0" - lodash._arrayeach "^3.0.0" - lodash._createassigner "^3.0.0" - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.isplainobject "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - lodash.keysin "^3.0.0" - lodash.toplainobject "^3.0.0" - -lodash.merge@^4.3.0, lodash.merge@^4.4.0: +lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" @@ -6485,13 +6439,6 @@ lodash.toarray@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" -lodash.toplainobject@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keysin "^3.0.0" - lodash.union@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-3.1.0.tgz#a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff" @@ -6605,27 +6552,17 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown-it-terminal@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.4.tgz#3f2ce624ba2ca964a78b8b388d605ee330de9ced" +markdown-it-terminal@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9" dependencies: - ansi-styles "^2.1.0" - cardinal "^0.5.0" + ansi-styles "^3.0.0" + cardinal "^1.0.0" cli-table "^0.3.1" - lodash.merge "^3.3.2" - markdown-it "^4.4.0" + lodash.merge "^4.6.0" + markdown-it "^8.3.1" -markdown-it@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414" - dependencies: - argparse "~1.0.2" - entities "~1.1.1" - linkify-it "~1.2.0" - mdurl "~1.0.0" - uc.micro "^1.0.0" - -markdown-it@^8.3.0: +markdown-it@^8.3.0, markdown-it@^8.3.1: version "8.4.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44" dependencies: @@ -6678,7 +6615,7 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -mdurl@^1.0.1, mdurl@~1.0.0: +mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -8108,12 +8045,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -redeyed@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1" - dependencies: - esprima-fb "~12001.1.0-dev-harmony-fb" - redeyed@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a" @@ -8472,7 +8403,7 @@ route-recognizer@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.4.0, rsvp@^3.5.0: +rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -8733,6 +8664,10 @@ simple-html-tokenizer@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" +simple-html-tokenizer@^0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.3.tgz#9b00b766e30058b4bb377c0d4f97566a13ab1be1" + simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" @@ -9473,7 +9408,7 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5: +uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"