From 10bb6c7bfecd37c4a197ebf0e5bd137abfb77295 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 19 Sep 2019 06:27:08 -0400 Subject: [PATCH] [TEST] First encapsulation test --- .../.eslintrc.js | 78 +++++-- .../.template-lintrc.js | 2 +- .../app/app.js | 2 +- .../app/router.js | 5 +- .../config/targets.js | 8 +- .../ember-cli-build.js | 2 + .../package.json | 7 +- .../tests/integration/requests-test.js | 61 +++++ packages/store/package.json | 1 + yarn.lock | 210 +----------------- 10 files changed, 138 insertions(+), 238 deletions(-) create mode 100644 packages/-serializer-encapsulation-test-app/tests/integration/requests-test.js diff --git a/packages/-serializer-encapsulation-test-app/.eslintrc.js b/packages/-serializer-encapsulation-test-app/.eslintrc.js index bab8ff52254..b9046b74ef4 100644 --- a/packages/-serializer-encapsulation-test-app/.eslintrc.js +++ b/packages/-serializer-encapsulation-test-app/.eslintrc.js @@ -1,49 +1,79 @@ module.exports = { + parser: 'babel-eslint', root: true, parserOptions: { - ecmaVersion: 2018, - sourceType: 'module' - }, - plugins: [ - 'ember' - ], - extends: [ - 'eslint:recommended', - 'plugin:ember/recommended' - ], - env: { - browser: true + ecmaVersion: 2017, + sourceType: 'module', }, + plugins: ['prettier', 'qunit', 'mocha'], + extends: ['eslint:recommended', 'prettier'], rules: { + 'mocha/no-exclusive-tests': 'error', + 'prettier/prettier': 'error', + + 'no-unused-vars': [ + 'error', + { + args: 'none', + }, + ], + + 'no-cond-assign': ['error', 'except-parens'], + eqeqeq: 'error', + 'no-eval': 'error', + 'new-cap': [ + 'error', + { + capIsNew: false, + }, + ], + 'no-caller': 'error', + 'no-irregular-whitespace': 'error', + 'no-undef': 'error', + 'no-eq-null': 'error', + 'no-console': 'error', // no longer recommended in eslint v6, this restores it + + // probably want to fix these new rules later in separate PR + // Tracked in issue https://github.com/emberjs/data/issues/6405 + 'no-prototype-builtins': 'off', + 'require-atomic-updates': 'off', + }, + globals: { + heimdall: true, + Map: false, + WeakMap: true, + Set: true, + }, + env: { + browser: true, + node: false, }, overrides: [ // node files { files: [ + '.mocharc.js', '.eslintrc.js', + '.prettierrc.js', '.template-lintrc.js', 'ember-cli-build.js', 'testem.js', 'blueprints/*/index.js', 'config/**/*.js', 'lib/*/index.js', - 'server/**/*.js' + 'server/**/*.js', ], parserOptions: { - sourceType: 'script' + sourceType: 'script', + ecmaVersion: 2015, }, env: { browser: false, - node: true + node: true, + es6: true, }, plugins: ['node'], - rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { - // add your custom rules and overrides for node files here - - // this can be removed once the following is fixed - // https://github.com/mysticatea/eslint-plugin-node/issues/77 - 'node/no-unpublished-require': 'off' - }) - } - ] + extends: 'plugin:node/recommended', + }, + ], }; diff --git a/packages/-serializer-encapsulation-test-app/.template-lintrc.js b/packages/-serializer-encapsulation-test-app/.template-lintrc.js index b45e96ffddc..f35f61c7b3a 100644 --- a/packages/-serializer-encapsulation-test-app/.template-lintrc.js +++ b/packages/-serializer-encapsulation-test-app/.template-lintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: 'recommended' + extends: 'recommended', }; diff --git a/packages/-serializer-encapsulation-test-app/app/app.js b/packages/-serializer-encapsulation-test-app/app/app.js index b3b2bd677e0..f08aaaf0304 100644 --- a/packages/-serializer-encapsulation-test-app/app/app.js +++ b/packages/-serializer-encapsulation-test-app/app/app.js @@ -6,7 +6,7 @@ import config from './config/environment'; const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, - Resolver + Resolver, }); loadInitializers(App, config.modulePrefix); diff --git a/packages/-serializer-encapsulation-test-app/app/router.js b/packages/-serializer-encapsulation-test-app/app/router.js index d0bb00952fd..8f6f4598916 100644 --- a/packages/-serializer-encapsulation-test-app/app/router.js +++ b/packages/-serializer-encapsulation-test-app/app/router.js @@ -3,10 +3,9 @@ import config from './config/environment'; const Router = EmberRouter.extend({ location: config.locationType, - rootURL: config.rootURL + rootURL: config.rootURL, }); -Router.map(function() { -}); +Router.map(function() {}); export default Router; diff --git a/packages/-serializer-encapsulation-test-app/config/targets.js b/packages/-serializer-encapsulation-test-app/config/targets.js index 8ffae36361e..f14319316df 100644 --- a/packages/-serializer-encapsulation-test-app/config/targets.js +++ b/packages/-serializer-encapsulation-test-app/config/targets.js @@ -1,10 +1,6 @@ 'use strict'; -const browsers = [ - 'last 1 Chrome versions', - 'last 1 Firefox versions', - 'last 1 Safari versions' -]; +const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; const isCI = !!process.env.CI; const isProduction = process.env.EMBER_ENV === 'production'; @@ -14,5 +10,5 @@ if (isCI || isProduction) { } module.exports = { - browsers + browsers, }; diff --git a/packages/-serializer-encapsulation-test-app/ember-cli-build.js b/packages/-serializer-encapsulation-test-app/ember-cli-build.js index d690a2531e5..d322180cb04 100644 --- a/packages/-serializer-encapsulation-test-app/ember-cli-build.js +++ b/packages/-serializer-encapsulation-test-app/ember-cli-build.js @@ -1,3 +1,5 @@ +/* eslint node/no-unpublished-require: 'off' */ + 'use strict'; const EmberApp = require('ember-cli/lib/broccoli/ember-app'); diff --git a/packages/-serializer-encapsulation-test-app/package.json b/packages/-serializer-encapsulation-test-app/package.json index 1fefe30ddc4..82b55659c98 100644 --- a/packages/-serializer-encapsulation-test-app/package.json +++ b/packages/-serializer-encapsulation-test-app/package.json @@ -20,16 +20,16 @@ "dependencies": { "@ember-data/adapter": "3.14.0-alpha.3", "@ember-data/model": "3.14.0-alpha.3", - "@ember-data/store": "3.14.0-alpha.3" + "@ember-data/store": "3.14.0-alpha.3", + "ember-inflector": "^3.0.1" }, "devDependencies": { "@ember/optional-features": "^0.7.0", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~3.11.0", + "ember-cli": "~3.12.0", "ember-cli-app-version": "^3.2.0", "ember-cli-babel": "^7.7.3", "ember-cli-dependency-checker": "^3.1.0", - "ember-cli-eslint": "^5.1.0", "ember-cli-htmlbars": "^3.0.1", "ember-cli-htmlbars-inline-precompile": "^2.1.0", "ember-cli-inject-live-reload": "^1.8.2", @@ -40,6 +40,7 @@ "ember-qunit": "^4.4.1", "ember-resolver": "^5.0.1", "ember-source": "~3.11.1", + "eslint": "^6.3.0", "eslint-plugin-ember": "^7.0.0", "eslint-plugin-node": "^9.0.1", "loader.js": "^4.7.0", diff --git a/packages/-serializer-encapsulation-test-app/tests/integration/requests-test.js b/packages/-serializer-encapsulation-test-app/tests/integration/requests-test.js new file mode 100644 index 00000000000..44734fe7ea7 --- /dev/null +++ b/packages/-serializer-encapsulation-test-app/tests/integration/requests-test.js @@ -0,0 +1,61 @@ +import Model, { attr } from '@ember-data/model'; +import Store from '@ember-data/store'; +import JSONAPIAdapter from '@ember-data/adapter/json-api'; +import EmberObject from '@ember/object'; +import { setupTest } from 'ember-qunit'; +import { module, test } from 'qunit'; +import { resolve } from 'rsvp'; + +module('integration/requests - running requests with minimum serializer', function(hooks) { + setupTest(hooks); + + hooks.beforeEach(function(assert) { + this.owner.register('service:store', Store); + this.owner.register( + 'model:person', + class Person extends Model { + @attr name; + } + ); + }); + + test('findAll calls normalizeResponse', async function(assert) { + let normalizeResponseCalled = 0; + + class TestMinimumSerializer extends EmberObject { + normalizeResponse(store, schema, rawPayload, id, requestType) { + normalizeResponseCalled++; + assert.equal(requestType, 'findAll', 'expected method name is correct'); + assert.deepEqual(rawPayload, { data: [] }); + return { + data: [ + { + type: 'person', + id: 'urn:person:1', + attributes: { + name: 'Chris', + }, + }, + ], + }; + } + } + this.owner.register('serializer:application', TestMinimumSerializer); + + class TestAdapter extends JSONAPIAdapter { + defaultSerializer = 'application'; + + ajax(url, type) { + return resolve({ data: [] }); + } + } + this.owner.register('adapter:application', TestAdapter); + + const store = this.owner.lookup('service:store'); + + let response = await store.findAll('person'); + + assert.equal(normalizeResponseCalled, 1, 'normalizeResponse is called once'); + assert.deepEqual(response.mapBy('id'), ['urn:person:1'], 'response is expected response'); + }); +}); diff --git a/packages/store/package.json b/packages/store/package.json index e1b9de93afa..502f4bbb230 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -20,6 +20,7 @@ "test:all": "ember try:each" }, "dependencies": { + "@ember/ordered-set": "^2.0.3", "@ember-data/-build-infra": "3.14.0-alpha.3", "@ember-data/adapter": "3.14.0-alpha.3", "@ember-data/canary-features": "3.14.0-alpha.3", diff --git a/yarn.lock b/yarn.lock index 7972677159a..1c807dd3436 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1944,16 +1944,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-jsx@^5.0.0, acorn-jsx@^5.0.2: +acorn-jsx@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== -acorn@^6.0.7: - version "6.3.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" - integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== - acorn@^6.2.0: version "6.2.1" resolved "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51" @@ -1998,7 +1993,7 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1: +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: version "6.10.2" resolved "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== @@ -3240,7 +3235,7 @@ broccoli-clean-css@^1.1.0: inline-source-map-comment "^1.0.5" json-stable-stringify "^1.0.0" -broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.3: +broccoli-concat@^3.7.1, broccoli-concat@^3.7.3: version "3.7.4" resolved "https://registry.npmjs.org/broccoli-concat/-/broccoli-concat-3.7.4.tgz#7371e846eb7a97cb44ccff10f68582bcadcafacd" integrity sha512-9gRv1tyCQuq2+48DT9DQyxRNLOuwDtHybDeYuWA3g26HFqZd0PGAOeXcLXHpKRhxzrEbU6Gm28dZ/KolMr04cQ== @@ -3378,19 +3373,6 @@ broccoli-kitchen-sink-helpers@^0.3.1: glob "^5.0.10" mkdirp "^0.5.1" -broccoli-lint-eslint@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/broccoli-lint-eslint/-/broccoli-lint-eslint-5.0.0.tgz#05365879d597dd78496a1c718db0e5ea5d4a2bde" - integrity sha512-V7M6U4th21bf1X4u3KoZa0xkcPq9JCSyKxB/nCWCBFMI3rkrB8nlyDLd8DKIUTqL+ojlFOGV5lohPZwndw0sZw== - dependencies: - aot-test-generators "^0.1.0" - broccoli-concat "^3.2.2" - broccoli-persistent-filter "^2.1.0" - eslint "^5.6.0" - json-stable-stringify "^1.0.1" - lodash.defaultsdeep "^4.6.0" - md5-hex "^2.0.0" - broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1: version "1.2.4" resolved "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" @@ -4990,16 +4972,6 @@ ember-cli-dependency-checker@^3.1.0, ember-cli-dependency-checker@^3.2.0: resolve "^1.5.0" semver "^5.3.0" -ember-cli-eslint@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/ember-cli-eslint/-/ember-cli-eslint-5.1.0.tgz#acdb9b072911e04b07c313b610f514db4086d21a" - integrity sha512-o6787b0tgkRNp+KJo5BiQxtkLuz/yyYqVWF31LPrh+ZCC8jETrfyjsuk8VPDxKLGq7qEiQNJUgOEW87HTad7Vg== - dependencies: - broccoli-lint-eslint "^5.0.0" - ember-cli-version-checker "^3.0.0" - rsvp "^4.6.1" - walk-sync "^1.0.0" - ember-cli-get-component-path-option@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771" @@ -5269,7 +5241,7 @@ ember-cli-yuidoc@^0.8.8: rsvp "3.0.14" yuidocjs "^0.10.0" -ember-cli@^3.12.0: +ember-cli@^3.12.0, ember-cli@~3.12.0: version "3.12.0" resolved "https://registry.npmjs.org/ember-cli/-/ember-cli-3.12.0.tgz#e6d27e4c57fc44eb7963fe4611b3b0cfb9d9558d" integrity sha512-hON3/thKAIcwzHX9SWIvf+UR2sQTWyXzyECYw20NDvUSydZMVtggK4GQncu7LSiUs+5zIxT8ZPzanpUZMINuCg== @@ -5367,104 +5339,6 @@ ember-cli@^3.12.0: watch-detector "^0.1.0" yam "^1.0.0" -ember-cli@~3.11.0: - version "3.11.0" - resolved "https://registry.npmjs.org/ember-cli/-/ember-cli-3.11.0.tgz#05c055fde0803b2f4034a3b5a68daaed408e632d" - integrity sha512-YU+nGUZ3l3MbqW5BiFX9c9k3szgm41EPRGjFFLEXerOXuyFByRWYPBZDtBOGmtdWmZpiqv53JXYRweMANHWLvA== - dependencies: - "@babel/core" "^7.4.3" - "@babel/plugin-transform-modules-amd" "^7.2.0" - amd-name-resolver "^1.3.1" - babel-plugin-module-resolver "^3.2.0" - bower-config "^1.4.1" - bower-endpoint-parser "0.2.2" - broccoli "^3.1.1" - broccoli-amd-funnel "^2.0.1" - broccoli-babel-transpiler "^7.2.0" - broccoli-builder "^0.18.14" - broccoli-concat "^3.7.3" - broccoli-config-loader "^1.0.1" - broccoli-config-replace "^1.1.2" - broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" - broccoli-funnel-reducer "^1.0.0" - broccoli-merge-trees "^3.0.2" - broccoli-middleware "^2.0.1" - broccoli-module-normalizer "^1.3.0" - broccoli-module-unification-reexporter "^1.0.0" - broccoli-slow-trees "^3.0.1" - broccoli-source "^1.1.0" - broccoli-stew "^2.1.0" - calculate-cache-key-for-tree "^2.0.0" - capture-exit "^2.0.0" - chalk "^2.4.2" - ci-info "^2.0.0" - clean-base-url "^1.0.0" - compression "^1.7.4" - configstore "^4.0.0" - console-ui "^3.0.2" - core-object "^3.1.5" - dag-map "^2.0.2" - diff "^4.0.1" - ember-cli-broccoli-sane-watcher "^3.0.0" - ember-cli-is-package-missing "^1.0.0" - ember-cli-lodash-subset "^2.0.1" - ember-cli-normalize-entity-name "^1.0.0" - ember-cli-preprocess-registry "^3.3.0" - ember-cli-string-utils "^1.1.0" - ember-source-channel-url "^1.1.0" - ensure-posix-path "^1.0.2" - execa "^1.0.0" - exit "^0.1.2" - express "^4.16.4" - filesize "^4.1.2" - find-up "^3.0.0" - find-yarn-workspace-root "^1.2.1" - fs-extra "^7.0.1" - fs-tree-diff "^2.0.1" - get-caller-file "^2.0.5" - git-repo-info "^2.1.0" - glob "^7.1.4" - heimdalljs "^0.2.6" - heimdalljs-fs-monitor "^0.2.2" - heimdalljs-graph "^0.3.5" - heimdalljs-logger "^0.1.10" - http-proxy "^1.17.0" - inflection "^1.12.0" - is-git-url "^1.0.0" - isbinaryfile "^3.0.3" - js-yaml "^3.13.1" - json-stable-stringify "^1.0.1" - leek "0.0.24" - lodash.template "^4.4.0" - markdown-it "^8.4.2" - markdown-it-terminal "0.1.0" - minimatch "^3.0.4" - morgan "^1.9.1" - nopt "^3.0.6" - npm-package-arg "^6.1.0" - p-defer "^2.1.0" - portfinder "^1.0.20" - promise-map-series "^0.2.3" - promise.prototype.finally "^3.1.0" - quick-temp "^0.1.8" - resolve "^1.10.1" - resolve-package-path "^1.2.7" - rsvp "^4.8.4" - sane "^4.1.0" - semver "^6.0.0" - silent-error "^1.1.1" - sort-package-json "^1.22.1" - symlink-or-copy "^1.2.0" - temp "0.9.0" - testem "^2.14.0" - tiny-lr "^1.1.1" - tree-sync "^1.4.0" - uuid "^3.3.2" - walk-sync "^1.1.3" - watch-detector "^0.1.0" - yam "^1.0.0" - ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.0.tgz#feee16c5e9ef1b1f1e53903b241740ad4b01097e" @@ -5901,14 +5775,6 @@ eslint-plugin-qunit@^4.0.0: resolved "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-4.0.0.tgz#5945ba3434bfe8879bea195192e906701051cf01" integrity sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ== -eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" @@ -5917,7 +5783,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1, eslint-utils@^1.4.2: +eslint-utils@^1.4.2: version "1.4.2" resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== @@ -5929,49 +5795,7 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@^5.6.0: - version "5.16.0" - resolved "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" - integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== - dependencies: - "@babel/code-frame" "^7.0.0" - ajv "^6.9.1" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^4.0.1" - doctrine "^3.0.0" - eslint-scope "^4.0.3" - eslint-utils "^1.3.1" - eslint-visitor-keys "^1.0.0" - espree "^5.0.1" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob "^7.1.2" - globals "^11.7.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - inquirer "^6.2.2" - js-yaml "^3.13.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.11" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.2" - path-is-inside "^1.0.2" - progress "^2.0.0" - regexpp "^2.0.1" - semver "^5.5.1" - strip-ansi "^4.0.0" - strip-json-comments "^2.0.1" - table "^5.2.3" - text-table "^0.2.0" - -eslint@^6.4.0: +eslint@^6.3.0, eslint@^6.4.0: version "6.4.0" resolved "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz#5aa9227c3fbe921982b2eda94ba0d7fae858611a" integrity sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA== @@ -6019,15 +5843,6 @@ esm@^3.2.25, esm@^3.2.4: resolved "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== -espree@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" - integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== - dependencies: - acorn "^6.0.7" - acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" - espree@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" @@ -7557,7 +7372,7 @@ inquirer@^3.3.0: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^6, inquirer@^6.2.0, inquirer@^6.2.2, inquirer@^6.4.1: +inquirer@^6, inquirer@^6.2.0, inquirer@^6.4.1: version "6.5.2" resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== @@ -7961,7 +7776,7 @@ js-tokens@^3.0.2: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7: +js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7: version "3.13.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -9642,11 +9457,6 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-is-inside@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= - path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -10567,7 +10377,7 @@ rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0 resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== -rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5: +rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5: version "4.8.5" resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== @@ -11243,7 +11053,7 @@ strip-indent@^2.0.0: resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=