From 432720b8c85409515ae4a404251382a4ce322c82 Mon Sep 17 00:00:00 2001 From: Clark Du Date: Fri, 17 Aug 2018 21:25:23 +0100 Subject: [PATCH] fix: appveyor test failure (#3754) * fix: appveyor test failure * ci: bring back yarn cache * ci: turn off matrix * refactor: use babel instead of esm in jest * refactor: use es modules in fixtures --- .babelrc | 3 ++- appveyor.yml | 8 ++++--- jest.config.js | 1 + package.json | 1 + test/e2e/basic.browser.test.js | 2 +- test/e2e/basic.vue-config.test.js | 2 +- test/e2e/children.patch.browser.test.js | 2 +- test/fixtures/basic/basic.test.js | 2 +- test/fixtures/children/children.test.js | 2 +- .../config-explicit/config-explicit.test.js | 2 +- .../custom-app-template/basic.test.js | 2 +- test/fixtures/custom-dirs/custom-dirs.test.js | 2 +- test/fixtures/custom-dirs/package.json | 5 ---- .../dynamic-routes/dynamic-routes.test.js | 2 +- test/fixtures/empty/empty.test.js | 2 +- test/fixtures/error/error.test.js | 2 +- test/fixtures/extract-css/extract-css.test.js | 2 +- test/fixtures/module/module.test.js | 2 +- test/fixtures/module/package.json | 5 ---- test/fixtures/spa/spa.test.js | 2 +- test/fixtures/ssr/ssr.test.js | 2 +- test/fixtures/with-config/package.json | 5 ---- test/fixtures/with-config/with-config.test.js | 4 ++-- test/unit/basic.dev.test.js | 2 +- test/unit/basic.fail.generate.test.js | 2 +- test/unit/basic.generate.test.js | 2 +- test/unit/basic.ssr.csp.test.js | 2 +- test/unit/basic.ssr.test.js | 2 +- test/unit/children.test.js | 2 +- test/unit/custom-app-template.test.js | 2 +- test/unit/custom-dirs.test.js | 2 +- test/unit/dist-options.test.js | 2 +- test/unit/error.test.js | 2 +- test/unit/express.test.js | 2 +- test/unit/fallback.generate.test.js | 2 +- test/unit/module.test.js | 2 +- test/unit/nuxt.test.js | 2 +- test/unit/spa.test.js | 2 +- test/unit/ssr.test.js | 2 +- test/unit/with-config.test.js | 2 +- test/utils/build.js | 2 +- test/utils/index.js | 7 ++---- yarn.lock | 24 ++++++++++++++++--- 43 files changed, 67 insertions(+), 62 deletions(-) delete mode 100644 test/fixtures/custom-dirs/package.json delete mode 100644 test/fixtures/module/package.json delete mode 100644 test/fixtures/with-config/package.json diff --git a/.babelrc b/.babelrc index 24a90b51af..9bd5fcb025 100644 --- a/.babelrc +++ b/.babelrc @@ -7,7 +7,8 @@ "node": "current" } }] - ] + ], + "plugins": ["dynamic-import-node"] } } } diff --git a/appveyor.yml b/appveyor.yml index f9f054ca6d..1778bbab8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,13 @@ # Test against the latest version of this Node.js version environment: - matrix: - - nodejs_version: "Current" + nodejs_version: "Current" +# environment: +# matrix: +# - nodejs_version: "Current" cache: - 'node_modules -> yarn.lock' - # - '%LOCALAPPDATA%\\Yarn -> yarn.lock' + - '%LOCALAPPDATA%\\Yarn -> yarn.lock' image: Visual Studio 2017 diff --git a/jest.config.js b/jest.config.js index c5a2969445..35bd5bbd2b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -7,6 +7,7 @@ module.exports = { ], setupTestFrameworkScriptFile: './test/utils/setup', testPathIgnorePatterns: ['test/fixtures/.*/.*?/'], + transformIgnorePatterns: ['/node_modules/'], moduleFileExtensions: ['js', 'mjs', 'json'], expand: true, forceExit: true diff --git a/package.json b/package.json index 7d4f823ba1..b089958988 100644 --- a/package.json +++ b/package.json @@ -141,6 +141,7 @@ "babel-core": "^7.0.0-0", "babel-eslint": "^9.0.0-beta", "babel-jest": "^23.4.2", + "babel-plugin-dynamic-import-node": "^2.0.0", "codecov": "^3.0.4", "cross-env": "^5.2.0", "eslint": "^4.19.1", diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js index 5581c9cfa6..70c73eed73 100644 --- a/test/e2e/basic.browser.test.js +++ b/test/e2e/basic.browser.test.js @@ -10,7 +10,7 @@ let page = null describe('basic browser', () => { beforeAll(async () => { - const config = loadFixture('basic') + const config = await loadFixture('basic') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/e2e/basic.vue-config.test.js b/test/e2e/basic.vue-config.test.js index f6569ec1dd..90e563f08e 100644 --- a/test/e2e/basic.vue-config.test.js +++ b/test/e2e/basic.vue-config.test.js @@ -9,7 +9,7 @@ let nuxt = null let page = null const startServer = async (type = 'basic') => { - const config = loadFixture(type) + const config = await loadFixture(type) nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js index 0f52b75655..be108b4b4a 100644 --- a/test/e2e/children.patch.browser.test.js +++ b/test/e2e/children.patch.browser.test.js @@ -11,7 +11,7 @@ const dates = {} describe('children patch (browser)', () => { beforeAll(async () => { - const options = loadFixture('children') + const options = await loadFixture('children') nuxt = new Nuxt(options) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/fixtures/basic/basic.test.js b/test/fixtures/basic/basic.test.js index 773d6d69c2..2066876239 100644 --- a/test/fixtures/basic/basic.test.js +++ b/test/fixtures/basic/basic.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('basic') diff --git a/test/fixtures/children/children.test.js b/test/fixtures/children/children.test.js index 56fe88b6a8..bdb6719e99 100644 --- a/test/fixtures/children/children.test.js +++ b/test/fixtures/children/children.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('children') diff --git a/test/fixtures/config-explicit/config-explicit.test.js b/test/fixtures/config-explicit/config-explicit.test.js index c9a45e4f14..1a41c3f0b7 100644 --- a/test/fixtures/config-explicit/config-explicit.test.js +++ b/test/fixtures/config-explicit/config-explicit.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('config-explicit') diff --git a/test/fixtures/custom-app-template/basic.test.js b/test/fixtures/custom-app-template/basic.test.js index 673f5844c8..3430e0bd14 100644 --- a/test/fixtures/custom-app-template/basic.test.js +++ b/test/fixtures/custom-app-template/basic.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('custom-app-template') diff --git a/test/fixtures/custom-dirs/custom-dirs.test.js b/test/fixtures/custom-dirs/custom-dirs.test.js index a248780c01..93c44814d5 100644 --- a/test/fixtures/custom-dirs/custom-dirs.test.js +++ b/test/fixtures/custom-dirs/custom-dirs.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('custom-dirs') diff --git a/test/fixtures/custom-dirs/package.json b/test/fixtures/custom-dirs/package.json deleted file mode 100644 index d3db7bec4d..0000000000 --- a/test/fixtures/custom-dirs/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "custom-dirs", - "version": "1.0.0", - "dependencies": {} -} diff --git a/test/fixtures/dynamic-routes/dynamic-routes.test.js b/test/fixtures/dynamic-routes/dynamic-routes.test.js index b7297465d0..060f61a301 100644 --- a/test/fixtures/dynamic-routes/dynamic-routes.test.js +++ b/test/fixtures/dynamic-routes/dynamic-routes.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('dynamic-routes') diff --git a/test/fixtures/empty/empty.test.js b/test/fixtures/empty/empty.test.js index a3c0b3cafd..4deec265c3 100644 --- a/test/fixtures/empty/empty.test.js +++ b/test/fixtures/empty/empty.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('empty') diff --git a/test/fixtures/error/error.test.js b/test/fixtures/error/error.test.js index 78984c2a54..aca6dd9140 100644 --- a/test/fixtures/error/error.test.js +++ b/test/fixtures/error/error.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('error') diff --git a/test/fixtures/extract-css/extract-css.test.js b/test/fixtures/extract-css/extract-css.test.js index 9870c2fc66..73a5ab054d 100644 --- a/test/fixtures/extract-css/extract-css.test.js +++ b/test/fixtures/extract-css/extract-css.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('extract-css') diff --git a/test/fixtures/module/module.test.js b/test/fixtures/module/module.test.js index 22e40a6d50..36d977ac2e 100644 --- a/test/fixtures/module/module.test.js +++ b/test/fixtures/module/module.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('module') diff --git a/test/fixtures/module/package.json b/test/fixtures/module/package.json deleted file mode 100644 index a9924b8220..0000000000 --- a/test/fixtures/module/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "module", - "version": "1.0.0", - "dependencies": {} -} diff --git a/test/fixtures/spa/spa.test.js b/test/fixtures/spa/spa.test.js index fdbe650bd0..0f8ffd738d 100644 --- a/test/fixtures/spa/spa.test.js +++ b/test/fixtures/spa/spa.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('spa') diff --git a/test/fixtures/ssr/ssr.test.js b/test/fixtures/ssr/ssr.test.js index 30cb76c773..4b3cea7036 100644 --- a/test/fixtures/ssr/ssr.test.js +++ b/test/fixtures/ssr/ssr.test.js @@ -1,3 +1,3 @@ -const { buildFixture } = require('../../utils/build') +import { buildFixture } from '../../utils/build' buildFixture('ssr') diff --git a/test/fixtures/with-config/package.json b/test/fixtures/with-config/package.json deleted file mode 100644 index 60cfd8e3ad..0000000000 --- a/test/fixtures/with-config/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "with-config", - "version": "1.0.0", - "dependencies": {} -} diff --git a/test/fixtures/with-config/with-config.test.js b/test/fixtures/with-config/with-config.test.js index 6d6ebce414..b9b0ebe953 100644 --- a/test/fixtures/with-config/with-config.test.js +++ b/test/fixtures/with-config/with-config.test.js @@ -1,5 +1,5 @@ -const consola = require('consola') -const { buildFixture } = require('../../utils/build') +import consola from 'consola' +import { buildFixture } from '../../utils/build' describe('with-config', () => { buildFixture('with-config', () => { diff --git a/test/unit/basic.dev.test.js b/test/unit/basic.dev.test.js index 339e973433..82a64f21d9 100644 --- a/test/unit/basic.dev.test.js +++ b/test/unit/basic.dev.test.js @@ -8,7 +8,7 @@ let transpile = null describe('basic dev', () => { beforeAll(async () => { - const config = loadFixture('basic', { + const config = await loadFixture('basic', { dev: true, debug: true, buildDir: '.nuxt-dev', diff --git a/test/unit/basic.fail.generate.test.js b/test/unit/basic.fail.generate.test.js index 878ec01337..e109bf5d98 100644 --- a/test/unit/basic.fail.generate.test.js +++ b/test/unit/basic.fail.generate.test.js @@ -2,7 +2,7 @@ import { loadFixture, Nuxt, Generator } from '../utils' describe('basic fail generate', () => { test('Fail with routes() which throw an error', async () => { - const options = loadFixture('basic', { + const options = await loadFixture('basic', { generate: { routes() { throw new Error('Not today!') diff --git a/test/unit/basic.generate.test.js b/test/unit/basic.generate.test.js index a80b4c3c51..5c149f0b75 100644 --- a/test/unit/basic.generate.test.js +++ b/test/unit/basic.generate.test.js @@ -16,7 +16,7 @@ let generator = null describe('basic generate', () => { beforeAll(async () => { - const config = loadFixture('basic', { generate: { dir: '.nuxt-generate' } }) + const config = await loadFixture('basic', { generate: { dir: '.nuxt-generate' } }) const nuxt = new Nuxt(config) const builder = new Builder(nuxt) builder.build = jest.fn() diff --git a/test/unit/basic.ssr.csp.test.js b/test/unit/basic.ssr.csp.test.js index 6aed051ea9..b1427a555f 100644 --- a/test/unit/basic.ssr.csp.test.js +++ b/test/unit/basic.ssr.csp.test.js @@ -4,7 +4,7 @@ let port const url = route => 'http://localhost:' + port + route const startCspServer = async (csp, isProduction = true) => { - const options = loadFixture('basic', { + const options = await loadFixture('basic', { debug: !isProduction, render: { csp } }) diff --git a/test/unit/basic.ssr.test.js b/test/unit/basic.ssr.test.js index 47da9e7045..46518276c8 100644 --- a/test/unit/basic.ssr.test.js +++ b/test/unit/basic.ssr.test.js @@ -8,7 +8,7 @@ let nuxt = null describe('basic ssr', () => { beforeAll(async () => { - const options = loadFixture('basic') + const options = await loadFixture('basic') nuxt = new Nuxt(options) port = await getPort() await nuxt.listen(port, '0.0.0.0') diff --git a/test/unit/children.test.js b/test/unit/children.test.js index e634765713..166b4ef518 100644 --- a/test/unit/children.test.js +++ b/test/unit/children.test.js @@ -7,7 +7,7 @@ let nuxt = null describe('children', () => { beforeAll(async () => { - const options = loadFixture('children') + const options = await loadFixture('children') nuxt = new Nuxt(options) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/custom-app-template.test.js b/test/unit/custom-app-template.test.js index 4c384e143f..cd6dfe458d 100644 --- a/test/unit/custom-app-template.test.js +++ b/test/unit/custom-app-template.test.js @@ -5,7 +5,7 @@ let nuxt = null describe('custom-app-template', () => { beforeAll(async () => { - const options = loadFixture('custom-app-template') + const options = await loadFixture('custom-app-template') nuxt = new Nuxt(options) port = await getPort() await nuxt.listen(port, '0.0.0.0') diff --git a/test/unit/custom-dirs.test.js b/test/unit/custom-dirs.test.js index e391547b21..8861e6ff5e 100644 --- a/test/unit/custom-dirs.test.js +++ b/test/unit/custom-dirs.test.js @@ -7,7 +7,7 @@ let nuxt = null describe('custom-dirs', () => { beforeAll(async () => { - const config = loadFixture('custom-dirs') + const config = await loadFixture('custom-dirs') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/dist-options.test.js b/test/unit/dist-options.test.js index 305c31191b..e81e172a69 100644 --- a/test/unit/dist-options.test.js +++ b/test/unit/dist-options.test.js @@ -7,7 +7,7 @@ let nuxt = null describe('dist options', () => { beforeAll(async () => { - const options = loadFixture('basic') + const options = await loadFixture('basic') nuxt = new Nuxt(Object.assign(options, {dev: false})) port = await getPort() await nuxt.listen(port, '0.0.0.0') diff --git a/test/unit/error.test.js b/test/unit/error.test.js index 1d325bd6f5..6305c77615 100644 --- a/test/unit/error.test.js +++ b/test/unit/error.test.js @@ -10,7 +10,7 @@ let nuxt = null describe('error', () => { beforeAll(async () => { - const config = loadFixture('error') + const config = await loadFixture('error') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/express.test.js b/test/unit/express.test.js index 4810140c2d..856b34d573 100644 --- a/test/unit/express.test.js +++ b/test/unit/express.test.js @@ -11,7 +11,7 @@ let server describe('express', () => { // Init nuxt.js and create express server beforeAll(async () => { - const config = loadFixture('basic') + const config = await loadFixture('basic') nuxt = new Nuxt(config) port = await getPort() diff --git a/test/unit/fallback.generate.test.js b/test/unit/fallback.generate.test.js index 1b77ebb5eb..0799c62292 100644 --- a/test/unit/fallback.generate.test.js +++ b/test/unit/fallback.generate.test.js @@ -15,7 +15,7 @@ let generator = null describe('fallback generate', () => { beforeAll(async () => { - const config = loadFixture('basic', {generate: {dir: '.nuxt-generate-fallback'}}) + const config = await loadFixture('basic', {generate: {dir: '.nuxt-generate-fallback'}}) nuxt = new Nuxt(config) generator = new Generator(nuxt) diff --git a/test/unit/module.test.js b/test/unit/module.test.js index 7f4722916c..d579ad58b9 100644 --- a/test/unit/module.test.js +++ b/test/unit/module.test.js @@ -10,7 +10,7 @@ let nuxt = null describe('module', () => { beforeAll(async () => { - const config = loadFixture('module') + const config = await loadFixture('module') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/nuxt.test.js b/test/unit/nuxt.test.js index badb30dbf3..fbaebc7c65 100644 --- a/test/unit/nuxt.test.js +++ b/test/unit/nuxt.test.js @@ -7,7 +7,7 @@ describe('nuxt', () => { }) test('Nuxt.js Instance', async () => { - const config = loadFixture('empty') + const config = await loadFixture('empty') const nuxt = new Nuxt(config) expect(typeof nuxt).toBe('object') diff --git a/test/unit/spa.test.js b/test/unit/spa.test.js index 71c0fce7fe..0773db02b8 100644 --- a/test/unit/spa.test.js +++ b/test/unit/spa.test.js @@ -13,7 +13,7 @@ const renderRoute = async (_url) => { describe('spa', () => { beforeAll(async () => { - const config = loadFixture('spa') + const config = await loadFixture('spa') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/ssr.test.js b/test/unit/ssr.test.js index 30470d8564..8050beba2d 100644 --- a/test/unit/ssr.test.js +++ b/test/unit/ssr.test.js @@ -63,7 +63,7 @@ const stressTest = async (_url, concurrency = 2, steps = 4) => { describe('ssr', () => { beforeAll(async () => { - const config = loadFixture('ssr') + const config = await loadFixture('ssr') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/unit/with-config.test.js b/test/unit/with-config.test.js index 9568fce82c..0292d8d823 100644 --- a/test/unit/with-config.test.js +++ b/test/unit/with-config.test.js @@ -7,7 +7,7 @@ let nuxt = null describe('with-config', () => { beforeAll(async () => { - const config = loadFixture('with-config') + const config = await loadFixture('with-config') nuxt = new Nuxt(config) port = await getPort() await nuxt.listen(port, 'localhost') diff --git a/test/utils/build.js b/test/utils/build.js index d03ddc7279..a95c4954fd 100644 --- a/test/utils/build.js +++ b/test/utils/build.js @@ -2,7 +2,7 @@ import { loadFixture, Nuxt, Builder } from './index' export const buildFixture = function (fixture, callback) { test(`Build ${fixture}`, async () => { - const config = loadFixture(fixture) + const config = await loadFixture(fixture) const nuxt = new Nuxt(config) const buildDone = jest.fn() nuxt.hook('build:done', buildDone) diff --git a/test/utils/index.js b/test/utils/index.js index 709e8f2e1a..6ecd7fd120 100644 --- a/test/utils/index.js +++ b/test/utils/index.js @@ -4,7 +4,6 @@ import fs from 'fs' import _getPort from 'get-port' import { defaultsDeep } from 'lodash' import _rp from 'request-promise-native' -import esm from 'esm' import pkg from '../../package.json' import Dist from '../../lib/nuxt' @@ -18,13 +17,11 @@ export const Options = Dist.Options export const Builder = Dist.Builder export const Generator = Dist.Generator -const requireModule = esm(module, {}) - -export const loadFixture = function loadFixture(fixture, overrides) { +export const loadFixture = async function (fixture, overrides) { const rootDir = path.resolve(__dirname, '..', 'fixtures', fixture) const configFile = path.resolve(rootDir, 'nuxt.config.js') - const config = fs.existsSync(configFile) ? requireModule(configFile).default : {} + const config = fs.existsSync(configFile) ? (await import(`../fixtures/${fixture}/nuxt.config`)).default : {} config.rootDir = rootDir config.dev = false diff --git a/yarn.lock b/yarn.lock index f27eab2cf3..fcd3ae20de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1328,6 +1328,13 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-dynamic-import-node@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.0.0.tgz#d6fc3f6c5e3bdc34e49c15faca7ce069755c0a57" + dependencies: + babel-plugin-syntax-dynamic-import "^6.18.0" + object.assign "^4.1.0" + babel-plugin-istanbul@^4.1.6: version "4.1.6" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" @@ -1341,6 +1348,10 @@ babel-plugin-jest-hoist@^23.2.0: version "23.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167" +babel-plugin-syntax-dynamic-import@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" + babel-plugin-syntax-object-rest-spread@^6.13.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" @@ -4084,6 +4095,10 @@ is-callable@^1.1.1, is-callable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" +is-callable@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" + is-ci@^1.0.10, is-ci@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" @@ -7935,11 +7950,14 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-resources-loader@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.1.0.tgz#492f4f6ab0052c207148fd808acbdd83e79a9231" +style-resources-loader@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.2.1.tgz#7679d5dc2f27046b2fc2b83c1d5b6c1b8a9b820c" dependencies: glob "^7.1.2" + is-callable "^1.1.4" + is-plain-object "^2.0.4" + is-promise "^2.1.0" loader-utils "^1.1.0" stylehacks@^4.0.0: