From 34b6ff15c45d3da4b2f98e3e15510d0f00d8ed72 Mon Sep 17 00:00:00 2001 From: Ben Monro Date: Fri, 3 May 2019 16:24:31 -0700 Subject: [PATCH] fix: now using jest-transform-svelte --- jest.config.js | 12 ++++++------ package-lock.json | 40 ++++++++++++++++++++++++++++++++-------- package.json | 4 ++-- tests/compile.js | 22 ---------------------- tests/transform.js | 13 ------------- 5 files changed, 40 insertions(+), 51 deletions(-) delete mode 100644 tests/compile.js delete mode 100644 tests/transform.js diff --git a/jest.config.js b/jest.config.js index 4f9743f..3e4e831 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,16 +1,16 @@ -const { jest: jestConfig } = require('kcd-scripts/config'); +const {jest: jestConfig} = require('kcd-scripts/config') const config = Object.assign(jestConfig, { roots: ['tests'], testMatch: ['/**/*.spec.js'], transform: { ...jestConfig.transform, - '\\.svelte$': './tests/transform' + '^.+\\.svelte$': 'jest-transform-svelte', }, transformIgnorePatterns: [ ...jestConfig.transformIgnorePatterns, - '/node_modules/(?!svelte).+\\.js$' + '/node_modules/(?!svelte).+\\.js$', ], - moduleFileExtensions: [...jestConfig.moduleFileExtensions, 'svelte'] -}); -module.exports = config; + moduleFileExtensions: [...jestConfig.moduleFileExtensions, 'svelte'], +}) +module.exports = config diff --git a/package-lock.json b/package-lock.json index 0fcf791..27d70ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "svelte-app", - "version": "1.0.0", + "name": "svlt-testing-library", + "version": "0.0.0-semantically-released", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6742,6 +6742,36 @@ "semver": "^5.5.0" } }, + "jest-transform-svelte": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jest-transform-svelte/-/jest-transform-svelte-1.0.0.tgz", + "integrity": "sha512-fWyxfbYJVR+FfHzq9vtP2hb99mOoW2nplGBlq/gIXa0tE+xMvvYE55QXy4v5N5B415EBiITYvJDWPV40lglFOw==", + "dev": true, + "requires": { + "deasync": "^0.1.14", + "rollup": "^0.68.0", + "rollup-plugin-svelte": "^5.0.0", + "svelte": "^2.16.0" + }, + "dependencies": { + "rollup": { + "version": "0.68.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.68.2.tgz", + "integrity": "sha512-WgjNCXYv7ZbtStIap1+tz4pd2zwz0XYN//OILwEY6dINIFLVizK1iWdu+ZtUURL/OKnp8Lv2w8FBds8YihzX7Q==", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "@types/node": "*" + } + }, + "svelte": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-2.16.1.tgz", + "integrity": "sha512-TpXdfukSkmWkMnH6PPVm7FRW8SSFcTyqBiP+6VN8rtZJ7Lp1Xbf/e3oz73eQBxF0UPZw1aAn1b91lX2XTeD3zg==", + "dev": true + } + } + }, "jest-util": { "version": "24.7.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.7.1.tgz", @@ -10347,12 +10377,6 @@ "integrity": "sha512-b5TyzV7Dx1ijN4QPNarhKq5rX98QHDmi18nF0G8KV3d5KX3Jj98Yu4+tzM97ktnXcfoVJmvONvPaX1ZI0mr8Dw==", "dev": true }, - "svelte-jest": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/svelte-jest/-/svelte-jest-0.2.0.tgz", - "integrity": "sha512-sNzFFCqUM6etASaSPpBC3qS/bFv75hPiBnwaK74EQRgkADn29oN/iizxolh9xqdkXkrUQEw6HWal5wtGJd4k5Q==", - "dev": true - }, "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", diff --git a/package.json b/package.json index 10dcc24..0d04204 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "esm": "^3.2.22", "jest": "^24.7.1", "jest-dom": "^3.1.2", + "jest-transform-svelte": "^1.0.0", "kcd-scripts": "^1.2.1", "npm-run-all": "^4.1.5", "rollup": "^1.10.1", @@ -17,8 +18,7 @@ "rollup-plugin-svelte": "^5.0.3", "rollup-plugin-terser": "^4.0.4", "sirv-cli": "^0.4.0", - "svelte": "^3.0.0", - "svelte-jest": "^0.2.0" + "svelte": "^3.0.0" }, "peerDependencies": { "svelte": "3.x" diff --git a/tests/compile.js b/tests/compile.js deleted file mode 100644 index e25f94e..0000000 --- a/tests/compile.js +++ /dev/null @@ -1,22 +0,0 @@ -const rollup = require('rollup') -const esm = require('esm') - -const config = esm(module)('../rollup.config') - -function generateOptions(filePath, name) { - return { - input: {input: filePath, plugins: config.default.plugins}, - output: { - file: `./dist/test/${name}.js`, - format: 'cjs', - }, - } -} - -function compile(filePath, name) { - const {input, output} = generateOptions(filePath, name) - - return rollup.rollup(input).then(bundle => bundle.generate(output)) -} - -module.exports = {compile} diff --git a/tests/transform.js b/tests/transform.js deleted file mode 100644 index 92bfe10..0000000 --- a/tests/transform.js +++ /dev/null @@ -1,13 +0,0 @@ -const deasync = require('deasync') -const {compile} = require('./compile') - -module.exports.process = (_s, filePath, _c, _o) => { - let code, map - compile(filePath, 'App', {}).then(comp => { - code = comp.output[0].code - map = comp.output[0].map - }) - deasync.loopWhile(() => !code && !map) - - return {code, map} -}