From 22e3784da6936a59fe1ca7459127c99945193f50 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:13:41 +0900 Subject: [PATCH 1/4] build: bump jest version in peerDependencies ^25.x -> ^25.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9786c49..b947d7b7 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "peerDependencies": { "@babel/core": "7.x", - "jest": "^25.x", + "jest": "^25.5.0", "vue": "^2.x", "vue-template-compiler": "^2.x" }, From 8b220c4fa7964b4dd1769d16990f0710d4fe929c Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:15:14 +0900 Subject: [PATCH 2/4] fix: remove inline source map --- lib/process.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/process.js b/lib/process.js index f2f41626..aab66799 100644 --- a/lib/process.js +++ b/lib/process.js @@ -134,10 +134,6 @@ module.exports = function(src, filename, config) { templateLine ) - if (map) { - output.code += '\n' + convertSourceMap.fromJSON(map.toString()).toComment() - } - return { code: output.code, map From b84956f6de07563ecc99a44ca6e950f7d60b66d9 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:33:35 +0900 Subject: [PATCH 3/4] build: remove unused package --- lib/process.js | 1 - package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/process.js b/lib/process.js index aab66799..ad8f1246 100644 --- a/lib/process.js +++ b/lib/process.js @@ -13,7 +13,6 @@ const getCustomTransformer = require('./utils').getCustomTransformer const loadSrc = require('./utils').loadSrc const babelTransformer = require('babel-jest') const compilerUtils = require('@vue/component-compiler-utils') -const convertSourceMap = require('convert-source-map') const generateCode = require('./generate-code') function resolveTransformer(lang = 'js', vueJestConfig) { diff --git a/package.json b/package.json index b947d7b7..de9386df 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "@babel/plugin-transform-modules-commonjs": "^7.2.0", "@vue/component-compiler-utils": "^3.1.0", "chalk": "^2.1.0", - "convert-source-map": "^1.6.0", "extract-from-css": "^0.4.4", "source-map": "0.5.6", "ts-jest": "25.5.x" From 1788d5969a2e4337058492d75dfd7fe64db9d7b3 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:54:03 +0900 Subject: [PATCH 4/4] test: update snapshot --- .../basic/__snapshots__/test.js.snap | 145 +++++++----------- e2e/__projects__/basic/test.js | 8 +- 2 files changed, 56 insertions(+), 97 deletions(-) diff --git a/e2e/__projects__/basic/__snapshots__/test.js.snap b/e2e/__projects__/basic/__snapshots__/test.js.snap index d64adfc5..646dd425 100644 --- a/e2e/__projects__/basic/__snapshots__/test.js.snap +++ b/e2e/__projects__/basic/__snapshots__/test.js.snap @@ -1,35 +1,37 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`generates source maps for .vue files 1`] = ` -"\\"use strict\\"; +Object { + "mappings": ";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAHA;AAKA;AAPA;AASA;AACA;AACA;AACA;AAFA;AAIA;AACA;AACA;AACA;AACA;AAHA;AAjBA;;;;AAvBA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA", + "names": Array [], + "sources": Array [ + "Basic.vue", + ], + "sourcesContent": Array [ + " -Object.defineProperty(exports, \\"__esModule\\", { - value: true -}); -exports[\\"default\\"] = void 0; -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -var _default = { + + + + + +", + ], + "version": 3, } -this['$style'] = Object.assign( -this['$style'], {\\"testB\\":\\"testB\\"}); - } - __options__.beforeCreate = beforeCreate ? [].concat(beforeCreate, styleFn) : [styleFn] -})() - -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkJhc2ljLnZ1ZSJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7QUFHQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUhBO0FBS0E7QUFQQTtBQVNBO0FBQ0E7QUFDQTtBQUNBO0FBRkE7QUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBSEE7QUFqQkE7Ozs7QUF2QkE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwiaGVsbG9cIj5cbiAgICA8aDEgOmNsYXNzPVwiaGVhZGluZ0NsYXNzZXNcIj57eyBtc2cgfX08L2gxPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG5cbjxzdHlsZSBtb2R1bGU9XCJjc3NcIj5cbi50ZXN0QSB7XG4gIGJhY2tncm91bmQtY29sb3I6IHJlZDtcbn1cbjwvc3R5bGU+XG48c3R5bGUgbW9kdWxlPlxuLnRlc3RCIHtcbiAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTtcbn1cbjwvc3R5bGU+XG48c3R5bGU+XG4udGVzdEMge1xuICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlO1xufVxuPC9zdHlsZT5cblxuPHNjcmlwdD5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgbmFtZTogJ2Jhc2ljJyxcbiAgY29tcHV0ZWQ6IHtcbiAgICBoZWFkaW5nQ2xhc3NlczogZnVuY3Rpb24gaGVhZGluZ0NsYXNzZXMoKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICByZWQ6IHRoaXMuaXNDcmF6eSxcbiAgICAgICAgYmx1ZTogIXRoaXMuaXNDcmF6eSxcbiAgICAgICAgc2hhZG93OiB0aGlzLmlzQ3JhenlcbiAgICAgIH1cbiAgICB9XG4gIH0sXG4gIGRhdGE6IGZ1bmN0aW9uIGRhdGEoKSB7XG4gICAgcmV0dXJuIHtcbiAgICAgIG1zZzogJ1dlbGNvbWUgdG8gWW91ciBWdWUuanMgQXBwJyxcbiAgICAgIGlzQ3Jhenk6IGZhbHNlXG4gICAgfVxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgdG9nZ2xlQ2xhc3M6IGZ1bmN0aW9uIHRvZ2dsZUNsYXNzKCkge1xuICAgICAgdGhpcy5pc0NyYXp5ID0gIXRoaXMuaXNDcmF6eVxuICAgIH1cbiAgfVxufVxuPC9zY3JpcHQ+XG4iXX0=" `; exports[`generates source maps using src attributes 1`] = ` -"\\"use strict\\"; - -Object.defineProperty(exports, \\"__esModule\\", { - value: true -}); -exports[\\"default\\"] = void 0; -var _default = { +Object { + "mappings": ";;;;;;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAHA;AAKA;AAPA;AASA;AACA;AACA;AACA;AAFA;AAIA;AACA;AACA;AACA;AACA;AAHA;AAjBA", + "names": Array [], + "sources": Array [ + "SourceMapsSrc.vue", + ], + "sourcesContent": Array [ + "export default { name: 'basic', computed: { headingClasses: function headingClasses() { @@ -103,38 +77,23 @@ var _default = { red: this.isCrazy, blue: !this.isCrazy, shadow: this.isCrazy - }; + } } }, data: function data() { return { msg: 'Welcome to Your Vue.js App', isCrazy: false - }; + } }, methods: { toggleClass: function toggleClass() { - this.isCrazy = !this.isCrazy; + this.isCrazy = !this.isCrazy } } -}; -exports[\\"default\\"] = _default; -; -var __options__ = typeof exports.default === 'function' ? exports.default.options : exports.default -var render = function() { - var _vm = this - var _h = _vm.$createElement - /* istanbul ignore next */ -var _c = _vm._self._c || _h - return _c(\\"div\\", { staticClass: \\"hello\\" }, [ - _c(\\"h1\\", { class: _vm.headingClasses }, [_vm._v(_vm._s(_vm.msg))]) - ]) } -var staticRenderFns = [] -render._withStripped = true - -__options__.render = render -__options__.staticRenderFns = staticRenderFns - -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNvdXJjZU1hcHNTcmMudnVlIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUhBO0FBS0E7QUFQQTtBQVNBO0FBQ0E7QUFDQTtBQUNBO0FBRkE7QUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBSEE7QUFqQkEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZGVmYXVsdCB7XG4gIG5hbWU6ICdiYXNpYycsXG4gIGNvbXB1dGVkOiB7XG4gICAgaGVhZGluZ0NsYXNzZXM6IGZ1bmN0aW9uIGhlYWRpbmdDbGFzc2VzKCkge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgcmVkOiB0aGlzLmlzQ3JhenksXG4gICAgICAgIGJsdWU6ICF0aGlzLmlzQ3JhenksXG4gICAgICAgIHNoYWRvdzogdGhpcy5pc0NyYXp5XG4gICAgICB9XG4gICAgfVxuICB9LFxuICBkYXRhOiBmdW5jdGlvbiBkYXRhKCkge1xuICAgIHJldHVybiB7XG4gICAgICBtc2c6ICdXZWxjb21lIHRvIFlvdXIgVnVlLmpzIEFwcCcsXG4gICAgICBpc0NyYXp5OiBmYWxzZVxuICAgIH1cbiAgfSxcbiAgbWV0aG9kczoge1xuICAgIHRvZ2dsZUNsYXNzOiBmdW5jdGlvbiB0b2dnbGVDbGFzcygpIHtcbiAgICAgIHRoaXMuaXNDcmF6eSA9ICF0aGlzLmlzQ3JhenlcbiAgICB9XG4gIH1cbn1cbiJdfQ==" +", + ], + "version": 3, +} `; diff --git a/e2e/__projects__/basic/test.js b/e2e/__projects__/basic/test.js index 086f1afd..9e1743ec 100644 --- a/e2e/__projects__/basic/test.js +++ b/e2e/__projects__/basic/test.js @@ -38,22 +38,22 @@ test('generates source maps for .vue files', () => { const filePath = resolve(__dirname, './components/Basic.vue') const fileString = readFileSync(filePath, { encoding: 'utf8' }) - const { code } = jestVue.process(fileString, filePath, { + const { map } = jestVue.process(fileString, filePath, { moduleFileExtensions: ['js', 'vue'] }) - expect(code).toMatchSnapshot() + expect(map).toMatchSnapshot() }) test('generates source maps using src attributes', () => { const filePath = resolve(__dirname, './components/SourceMapsSrc.vue') const fileString = readFileSync(filePath, { encoding: 'utf8' }) - const { code } = jestVue.process(fileString, filePath, { + const { map } = jestVue.process(fileString, filePath, { moduleFileExtensions: ['js', 'vue'] }) - expect(code).toMatchSnapshot() + expect(map).toMatchSnapshot() }) test('processes .vue file using jsx', () => {