From daee745e5e506bf16745f6bfb257c6ab59b95a31 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Wed, 7 Feb 2018 17:55:28 +0100 Subject: [PATCH 1/2] Update to ember-cli 2.17.2 --- .npmignore | 2 +- package.json | 4 ++-- tests/dummy/config/environment.js | 2 ++ tests/helpers/start-app.js | 1 + tests/test-helper.js | 3 ++- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.npmignore b/.npmignore index e07b0783..135c7b1f 100644 --- a/.npmignore +++ b/.npmignore @@ -7,8 +7,8 @@ .bowerrc .editorconfig .ember-cli -.gitignore .eslintrc.js +.gitignore .watchmanconfig .travis.yml bower.json diff --git a/package.json b/package.json index 11b72b03..0818b7d9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.5.0", "ember-ajax": "^3.0.0", - "ember-cli": "~2.17.0", + "ember-cli": "~2.17.2", "ember-cli-dependency-checker": "^2.0.0", "ember-cli-eslint": "^4.2.1", "ember-cli-github-pages": "^0.1.2", @@ -50,7 +50,7 @@ "ember-cli-inuitcss": "^1.0.1", "ember-cli-qunit": "^4.1.1", "ember-cli-release": "^1.0.0-beta.2", - "ember-cli-sass": "^7.1.1", + "ember-cli-sass": "7.1.1", "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^2.0.0", diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index e6a08fbb..172f32e9 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -46,9 +46,11 @@ module.exports = function(environment) { ENV.APP.LOG_VIEW_LOOKUPS = false; ENV.APP.rootElement = '#ember-testing'; + ENV.APP.autoboot = false; } if (environment === 'production') { + // here you can enable a production-specific feature ENV.rootURL = '/ember-local-storage' ENV.locationType = 'hash'; } diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 681aa01a..99d35dcf 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -5,6 +5,7 @@ import { run } from '@ember/runloop'; export default function startApp(attrs) { let attributes = merge({}, config.APP); + attributes.autoboot = true; attributes = merge(attributes, attrs); // use defaults, but you can override; return run(() => { diff --git a/tests/test-helper.js b/tests/test-helper.js index edc8122d..0382a848 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,7 +1,8 @@ import Application from '../app'; +import config from '../config/environment'; import { setApplication } from '@ember/test-helpers'; import { start } from 'ember-qunit'; -setApplication(Application.create({ autoboot: false })); +setApplication(Application.create(config.APP)); start(); diff --git a/yarn.lock b/yarn.lock index 0e3d1410..0845a255 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2405,7 +2405,7 @@ ember-cli-sass@6.1.3: ember-cli-version-checker "^1.0.2" merge "^1.2.0" -ember-cli-sass@^7.1.1: +ember-cli-sass@7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.1.tgz#6ae75b0756e5dbc0db61ec27843929500a38343d" dependencies: @@ -2473,9 +2473,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.17.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.0.tgz#4f8b1890724e54e780242ff4d05b498e367e3461" +ember-cli@~2.17.2: + version "2.17.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.2.tgz#101483d48dd295d297203160afcf3c44bcd47b75" dependencies: amd-name-resolver "1.0.0" babel-plugin-transform-es2015-modules-amd "^6.24.0" From ad2a5c4a142d126bf29642be288482aacc0a7c20 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Wed, 7 Feb 2018 19:09:02 +0100 Subject: [PATCH 2/2] Update to ember-cli 2.18.2 --- .eslintrc.js | 51 ++++++++- .travis.yml | 1 + config/environment.js | 1 - ember-cli-build.js | 1 - index.js | 3 +- package.json | 9 +- testem.js | 6 +- tests/dummy/config/environment.js | 1 - tests/dummy/config/targets.js | 1 - yarn.lock | 167 +++++++++++++++++++++++------- 10 files changed, 189 insertions(+), 52 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2873e2fc..5c8d6c2b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -4,10 +4,57 @@ module.exports = { ecmaVersion: 2017, sourceType: 'module' }, - extends: 'eslint:recommended', + plugins: [ + 'ember' + ], + extends: [ + 'eslint:recommended', + 'plugin:ember/recommended' + ], env: { browser: true }, rules: { - } + 'ember/new-module-imports': 0, + 'ember/require-super-in-init': 0, + 'ember/closure-actions': 0 + }, + overrides: [ + // node files + { + files: [ + 'index.js', + 'testem.js', + 'ember-cli-build.js', + 'config/**/*.js', + 'tests/dummy/config/**/*.js' + ], + excludedFiles: [ + 'app/**', + 'addon/**', + 'tests/dummy/app/**' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + env: { + browser: false, + node: true + }, + plugins: ['node'], + rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { + // add your custom rules and overrides for node files here + }) + }, + + // test files + { + files: ['tests/**/*.js'], + excludedFiles: ['tests/dummy/**/*.js'], + env: { + embertest: true + } + } + ] }; diff --git a/.travis.yml b/.travis.yml index 2787ed75..103f6648 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ install: - bower install script: + - yarn lint:js # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup diff --git a/config/environment.js b/config/environment.js index 012a412f..0dfaed47 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/ember-cli-build.js b/ember-cli-build.js index 316e3370..618622e7 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); diff --git a/index.js b/index.js index 1a0c1d56..326727f9 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; const stew = require('broccoli-stew'); @@ -19,7 +18,7 @@ module.exports = { } else if (this.ui) { this.ui.writeLine(warning); } else { - console.log(warning); + console.log(warning); // eslint-disable-line no-console } }, diff --git a/package.json b/package.json index 0818b7d9..2b04b40a 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "repository": "https://github.com/funkensturm/ember-local-storage.git", "scripts": { "build": "ember build", + "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests", "start": "ember serve", "test": "ember try:each" }, @@ -40,7 +41,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.5.0", "ember-ajax": "^3.0.0", - "ember-cli": "~2.17.2", + "ember-cli": "~2.18.2", "ember-cli-dependency-checker": "^2.0.0", "ember-cli-eslint": "^4.2.1", "ember-cli-github-pages": "^0.1.2", @@ -54,13 +55,15 @@ "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^2.0.0", - "ember-data": "^2.17.0", + "ember-data": "~2.18.0", "ember-disable-prototype-extensions": "^1.1.2", "ember-export-application-global": "^2.0.0", "ember-load-initializers": "^1.0.0", "ember-one-way-controls": "^3.0.1", "ember-resolver": "^4.1.0", - "ember-source": "~2.17.0", + "ember-source": "~2.18.0", + "eslint-plugin-ember": "^5.0.0", + "eslint-plugin-node": "^5.2.1", "loader.js": "^4.4.0" }, "engines": { diff --git a/testem.js b/testem.js index 63d1edf5..d1755a4e 100644 --- a/testem.js +++ b/testem.js @@ -1,4 +1,3 @@ -/* eslint-env node */ module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, @@ -12,11 +11,14 @@ module.exports = { Chrome: { mode: 'ci', args: [ + // --no-sandbox is needed when running Chrome inside a container + process.env.TRAVIS ? '--no-sandbox' : null, + '--disable-gpu', '--headless', '--remote-debugging-port=0', '--window-size=1440,900' - ] + ].filter(Boolean) } } }; diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 172f32e9..0b73689f 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; module.exports = function(environment) { diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js index df7664c2..082e68b5 100644 --- a/tests/dummy/config/targets.js +++ b/tests/dummy/config/targets.js @@ -1,4 +1,3 @@ -/* eslint-env node */ module.exports = { browsers: [ 'ie 9', diff --git a/yarn.lock b/yarn.lock index 0845a255..9fdd2a59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,26 +2319,26 @@ ember-cli-is-package-missing@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390" -ember-cli-legacy-blueprints@^0.1.2: - version "0.1.5" - resolved "https://registry.yarnpkg.com/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.1.5.tgz#93c15ca242ec5107d62a8af7ec30f6ac538f3ad9" +ember-cli-legacy-blueprints@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.2.1.tgz#480f37cb83f1eda2d46bbc7d07c59ea2e8ce9b84" dependencies: - chalk "^1.1.1" + chalk "^2.3.0" ember-cli-get-component-path-option "^1.0.0" ember-cli-get-dependency-depth "^1.0.0" ember-cli-is-package-missing "^1.0.0" - ember-cli-lodash-subset "^1.0.7" + ember-cli-lodash-subset "^2.0.1" ember-cli-normalize-entity-name "^1.0.0" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.0.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 "^2.1.0" ember-router-generator "^1.0.0" exists-sync "0.0.3" - fs-extra "^0.24.0" + fs-extra "^4.0.0" inflection "^1.7.1" - rsvp "^3.0.17" + rsvp "^4.7.0" silent-error "^1.0.0" ember-cli-lodash-subset@^1.0.7: @@ -2460,7 +2460,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.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -2473,9 +2473,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.17.2: - version "2.17.2" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.2.tgz#101483d48dd295d297203160afcf3c44bcd47b75" +ember-cli@~2.18.2: + version "2.18.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.18.2.tgz#bb15313a15139a85248a86d203643f918ba40f57" dependencies: amd-name-resolver "1.0.0" babel-plugin-transform-es2015-modules-amd "^6.24.0" @@ -2506,7 +2506,7 @@ ember-cli@~2.17.2: diff "^3.2.0" ember-cli-broccoli-sane-watcher "^2.0.4" ember-cli-is-package-missing "^1.0.0" - ember-cli-legacy-blueprints "^0.1.2" + ember-cli-legacy-blueprints "^0.2.0" ember-cli-lodash-subset "^2.0.1" ember-cli-normalize-entity-name "^1.0.0" ember-cli-preprocess-registry "^3.1.0" @@ -2542,19 +2542,19 @@ ember-cli@~2.17.2: morgan "^1.8.1" node-modules-path "^1.0.0" nopt "^3.0.6" - npm-package-arg "^4.1.1" + npm-package-arg "^6.0.0" portfinder "^1.0.7" promise-map-series "^0.2.1" quick-temp "^0.1.8" resolve "^1.3.0" rsvp "^4.7.0" - sane "^1.6.0" + sane "^2.2.0" semver "^5.1.1" silent-error "^1.0.0" sort-package-json "^1.4.0" symlink-or-copy "^1.1.8" temp "0.8.3" - testem "^1.18.0" + testem "^2.0.0" tiny-lr "^1.0.3" tree-sync "^1.2.1" uuid "^3.0.0" @@ -2562,9 +2562,9 @@ ember-cli@~2.17.2: walk-sync "^0.3.0" yam "0.0.22" -ember-data@^2.17.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.17.0.tgz#d952cf98d7461abf41ed6d248cf2a5836c623276" +ember-data@~2.18.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.18.0.tgz#8e374e540ea7c3b101983eb51cd0beedaa4d230d" dependencies: amd-name-resolver "0.0.7" babel-plugin-ember-modules-api-polyfill "^1.4.2" @@ -2585,7 +2585,7 @@ ember-data@^2.17.0: ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.0.0" ember-cli-test-info "^1.0.0" - ember-cli-version-checker "^1.1.4" + ember-cli-version-checker "^2.1.0" ember-inflector "^2.0.0" ember-runtime-enumerable-includes-polyfill "^2.0.0" exists-sync "0.0.3" @@ -2657,7 +2657,7 @@ ember-resolver@^4.1.0: ember-cli-version-checker "^2.0.0" resolve "^1.3.3" -ember-rfc176-data@^0.2.0: +ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" @@ -2678,11 +2678,11 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-source@~2.17.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.17.0.tgz#b78871dd49bd8d642b80176df4faf7fd7d059dac" +ember-source@~2.18.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.18.0.tgz#f61cf2701d8aa94a6adee6d47b1d5a73a4cef5f6" dependencies: - broccoli-funnel "^1.2.0" + broccoli-funnel "^2.0.1" broccoli-merge-trees "^2.0.0" ember-cli-get-component-path-option "^1.0.0" ember-cli-is-package-missing "^1.0.0" @@ -2693,7 +2693,6 @@ ember-source@~2.17.0: ember-cli-valid-component-name "^1.0.0" ember-cli-version-checker "^2.1.0" ember-router-generator "^1.2.3" - fs-extra "^4.0.1" inflection "^1.12.0" jquery "^3.2.1" resolve "^1.3.3" @@ -2845,6 +2844,23 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^ version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +eslint-plugin-ember@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.0.3.tgz#9f5e2048ab3ddc1548d4d17bf318cf1bb5cf37f1" + dependencies: + ember-rfc176-data "^0.2.7" + require-folder-tree "^1.4.5" + snake-case "^2.1.0" + +eslint-plugin-node@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz#80df3253c4d7901045ec87fa660a284e32bdca29" + dependencies: + ignore "^3.3.6" + minimatch "^3.0.4" + resolve "^1.3.3" + semver "5.3.0" + eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -2979,6 +2995,18 @@ execa@^0.8.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + exists-stat@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/exists-stat/-/exists-stat-1.0.0.tgz#0660e3525a2e89d9e446129440c272edfa24b529" @@ -3312,7 +3340,7 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^4.0.0, fs-extra@^4.0.1: +fs-extra@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" dependencies: @@ -3354,7 +3382,7 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.0.0: +fsevents@^1.0.0, fsevents@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: @@ -3741,7 +3769,7 @@ homedir-polyfill@^1.0.0: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@^2.4.2: +hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@^2.4.2, hosted-git-info@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" @@ -3793,7 +3821,7 @@ iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -ignore@^3.3.3: +ignore@^3.3.3, ignore@^3.3.6: version "3.3.7" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" @@ -4526,6 +4554,10 @@ lodash.bind@~2.3.0: lodash._renative "~2.3.0" lodash._slice "~2.3.0" +lodash.castarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -4745,6 +4777,10 @@ lodash.without@~3.2.1: lodash._basedifference "^3.0.0" lodash.restparam "^3.0.0" +lodash@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.8.0.tgz#376eb98bdcd9382a9365c33c4cb8250de1325b91" + lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -4776,6 +4812,10 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + lru-cache@2: version "2.7.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" @@ -5050,6 +5090,12 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + dependencies: + lower-case "^1.1.1" + node-fetch@^1.3.3: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -5227,6 +5273,15 @@ npm-install-checks@~2.0.1: semver "^5.1.0" validate-npm-package-name "^3.0.0" +npm-package-arg@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.0.0.tgz#8cce04b49d3f9faec3f56b0fe5f4391aeb9d2fac" + dependencies: + hosted-git-info "^2.5.0" + osenv "^0.1.4" + semver "^5.4.1" + validate-npm-package-name "^3.0.0" + npm-package-arg@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.1.1.tgz#86d9dca985b4c5e5d59772dfd5de6919998a495a" @@ -6134,6 +6189,12 @@ require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" +require-folder-tree@^1.4.5: + version "1.4.5" + resolved "https://registry.yarnpkg.com/require-folder-tree/-/require-folder-tree-1.4.5.tgz#dfe553cbab98cc88e1c56a3f2f358f06ef85bcb0" + dependencies: + lodash "3.8.0" + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -6262,7 +6323,7 @@ safe-json-parse@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" -sane@^1.1.1, sane@^1.6.0: +sane@^1.1.1: version "1.7.0" resolved "https://registry.yarnpkg.com/sane/-/sane-1.7.0.tgz#b3579bccb45c94cf20355cc81124990dfd346e30" dependencies: @@ -6274,6 +6335,20 @@ sane@^1.1.1, sane@^1.6.0: walker "~1.0.5" watch "~0.10.0" +sane@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-2.3.0.tgz#3f3df584abf69e63d4bb74f0f8c42468e4d7d46b" + dependencies: + anymatch "^1.3.0" + exec-sh "^0.2.0" + fb-watchman "^2.0.0" + minimatch "^3.0.2" + minimist "^1.1.1" + walker "~1.0.5" + watch "~0.18.0" + optionalDependencies: + fsevents "^1.1.1" + sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" @@ -6294,6 +6369,10 @@ scss-tokenizer@^0.2.3: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" +semver@5.3.0, semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + semver@^4.3.1: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" @@ -6302,10 +6381,6 @@ semver@~5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - send@0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" @@ -6406,6 +6481,12 @@ slide@^1.1.3, slide@^1.1.5, slide@~1.1.3, slide@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" +snake-case@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" + dependencies: + no-case "^2.2.0" + sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" @@ -6763,22 +6844,23 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@^1.18.0: - version "1.18.4" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" +testem@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/testem/-/testem-2.0.0.tgz#b05c96200c7ac98bae998d71c94c0c5345907d13" dependencies: backbone "^1.1.2" bluebird "^3.4.6" charm "^1.0.0" commander "^2.6.0" consolidate "^0.14.0" - cross-spawn "^5.1.0" + execa "^0.9.0" express "^4.10.7" fireworm "^0.7.0" glob "^7.0.4" http-proxy "^1.13.1" js-yaml "^3.2.5" lodash.assignin "^4.1.0" + lodash.castarray "^4.4.0" lodash.clonedeep "^4.4.1" lodash.find "^4.5.1" lodash.uniqby "^4.7.0" @@ -7089,6 +7171,13 @@ watch@~0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc" +watch@~0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986" + dependencies: + exec-sh "^0.2.0" + minimist "^1.2.0" + wcwidth@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"