From 9747a5e1da1814c1e3cf346f88d7a92f38e93bf4 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 10:29:26 +0900 Subject: [PATCH 01/11] build: move library to /packages/vue2-jest --- {lib => packages/vue2-jest/lib}/constants.js | 0 {lib => packages/vue2-jest/lib}/ensure-require.js | 0 {lib => packages/vue2-jest/lib}/generate-code.js | 0 {lib => packages/vue2-jest/lib}/generate-source-map.js | 0 {lib => packages/vue2-jest/lib}/index.js | 0 {lib => packages/vue2-jest/lib}/module-name-mapper-helper.js | 0 {lib => packages/vue2-jest/lib}/process-custom-blocks.js | 0 {lib => packages/vue2-jest/lib}/process-style.js | 0 {lib => packages/vue2-jest/lib}/process.js | 0 {lib => packages/vue2-jest/lib}/transformers/coffee.js | 0 {lib => packages/vue2-jest/lib}/transformers/typescript.js | 0 {lib => packages/vue2-jest/lib}/utils.js | 0 package.json => packages/vue2-jest/package.json | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename {lib => packages/vue2-jest/lib}/constants.js (100%) rename {lib => packages/vue2-jest/lib}/ensure-require.js (100%) rename {lib => packages/vue2-jest/lib}/generate-code.js (100%) rename {lib => packages/vue2-jest/lib}/generate-source-map.js (100%) rename {lib => packages/vue2-jest/lib}/index.js (100%) rename {lib => packages/vue2-jest/lib}/module-name-mapper-helper.js (100%) rename {lib => packages/vue2-jest/lib}/process-custom-blocks.js (100%) rename {lib => packages/vue2-jest/lib}/process-style.js (100%) rename {lib => packages/vue2-jest/lib}/process.js (100%) rename {lib => packages/vue2-jest/lib}/transformers/coffee.js (100%) rename {lib => packages/vue2-jest/lib}/transformers/typescript.js (100%) rename {lib => packages/vue2-jest/lib}/utils.js (100%) rename package.json => packages/vue2-jest/package.json (100%) diff --git a/lib/constants.js b/packages/vue2-jest/lib/constants.js similarity index 100% rename from lib/constants.js rename to packages/vue2-jest/lib/constants.js diff --git a/lib/ensure-require.js b/packages/vue2-jest/lib/ensure-require.js similarity index 100% rename from lib/ensure-require.js rename to packages/vue2-jest/lib/ensure-require.js diff --git a/lib/generate-code.js b/packages/vue2-jest/lib/generate-code.js similarity index 100% rename from lib/generate-code.js rename to packages/vue2-jest/lib/generate-code.js diff --git a/lib/generate-source-map.js b/packages/vue2-jest/lib/generate-source-map.js similarity index 100% rename from lib/generate-source-map.js rename to packages/vue2-jest/lib/generate-source-map.js diff --git a/lib/index.js b/packages/vue2-jest/lib/index.js similarity index 100% rename from lib/index.js rename to packages/vue2-jest/lib/index.js diff --git a/lib/module-name-mapper-helper.js b/packages/vue2-jest/lib/module-name-mapper-helper.js similarity index 100% rename from lib/module-name-mapper-helper.js rename to packages/vue2-jest/lib/module-name-mapper-helper.js diff --git a/lib/process-custom-blocks.js b/packages/vue2-jest/lib/process-custom-blocks.js similarity index 100% rename from lib/process-custom-blocks.js rename to packages/vue2-jest/lib/process-custom-blocks.js diff --git a/lib/process-style.js b/packages/vue2-jest/lib/process-style.js similarity index 100% rename from lib/process-style.js rename to packages/vue2-jest/lib/process-style.js diff --git a/lib/process.js b/packages/vue2-jest/lib/process.js similarity index 100% rename from lib/process.js rename to packages/vue2-jest/lib/process.js diff --git a/lib/transformers/coffee.js b/packages/vue2-jest/lib/transformers/coffee.js similarity index 100% rename from lib/transformers/coffee.js rename to packages/vue2-jest/lib/transformers/coffee.js diff --git a/lib/transformers/typescript.js b/packages/vue2-jest/lib/transformers/typescript.js similarity index 100% rename from lib/transformers/typescript.js rename to packages/vue2-jest/lib/transformers/typescript.js diff --git a/lib/utils.js b/packages/vue2-jest/lib/utils.js similarity index 100% rename from lib/utils.js rename to packages/vue2-jest/lib/utils.js diff --git a/package.json b/packages/vue2-jest/package.json similarity index 100% rename from package.json rename to packages/vue2-jest/package.json From ad13a55839e618a5055630496617cef3708dc9b1 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 10:32:04 +0900 Subject: [PATCH 02/11] test: move e2e projects --- e2e/{__projects__ => 2.x}/babel-in-package/components/Basic.vue | 0 e2e/{__projects__ => 2.x}/babel-in-package/components/Coffee.vue | 0 .../babel-in-package/components/TypeScript.vue | 0 .../babel-in-package/components/TypeScriptChild.vue | 0 e2e/{__projects__ => 2.x}/babel-in-package/package.json | 0 e2e/{__projects__ => 2.x}/babel-in-package/test.js | 0 e2e/{__projects__ => 2.x}/babel-in-package/tsconfig.json | 0 e2e/{__projects__ => 2.x}/basic/__snapshots__/test.js.snap | 0 e2e/{__projects__ => 2.x}/basic/babel.config.js | 0 e2e/{__projects__ => 2.x}/basic/components/Basic.vue | 0 e2e/{__projects__ => 2.x}/basic/components/BasicSrc.html | 0 e2e/{__projects__ => 2.x}/basic/components/BasicSrc.js | 0 e2e/{__projects__ => 2.x}/basic/components/BasicSrc.vue | 0 e2e/{__projects__ => 2.x}/basic/components/Coffee.vue | 0 e2e/{__projects__ => 2.x}/basic/components/CoffeeScript.vue | 0 e2e/{__projects__ => 2.x}/basic/components/Constructor.vue | 0 e2e/{__projects__ => 2.x}/basic/components/FunctionalSFC.vue | 0 .../basic/components/FunctionalSFCParent.vue | 0 .../basic/components/FunctionalSFCRender.vue | 0 e2e/{__projects__ => 2.x}/basic/components/Jade.vue | 0 e2e/{__projects__ => 2.x}/basic/components/Jsx.vue | 0 e2e/{__projects__ => 2.x}/basic/components/NamedExport.vue | 0 e2e/{__projects__ => 2.x}/basic/components/NoScript.vue | 0 e2e/{__projects__ => 2.x}/basic/components/Pug.vue | 0 e2e/{__projects__ => 2.x}/basic/components/PugBase.pug | 0 e2e/{__projects__ => 2.x}/basic/components/PugRelativeExtends.vue | 0 e2e/{__projects__ => 2.x}/basic/components/RenderFunction.vue | 0 e2e/{__projects__ => 2.x}/basic/components/SourceMapsSrc.vue | 0 e2e/{__projects__ => 2.x}/basic/components/TemplateString.vue | 0 e2e/{__projects__ => 2.x}/basic/components/TypeScript.vue | 0 e2e/{__projects__ => 2.x}/basic/components/TypeScriptChild.vue | 0 e2e/{__projects__ => 2.x}/basic/components/coffee.spec.js | 0 .../basic/components/relative/PugRelativeBase.pug | 0 e2e/{__projects__ => 2.x}/basic/package.json | 0 e2e/{__projects__ => 2.x}/basic/test.js | 0 e2e/{__projects__ => 2.x}/basic/tsconfig.json | 0 .../custom-transformers/babel-transformer.js | 0 e2e/{__projects__ => 2.x}/custom-transformers/components/Scss.vue | 0 e2e/{__projects__ => 2.x}/custom-transformers/package.json | 0 e2e/{__projects__ => 2.x}/custom-transformers/pcss-transformer.js | 0 e2e/{__projects__ => 2.x}/custom-transformers/scss-transformer.js | 0 e2e/{__projects__ => 2.x}/custom-transformers/test.js | 0 e2e/{__projects__ => 2.x}/style/babel.config.js | 0 e2e/{__projects__ => 2.x}/style/components/External.vue | 0 e2e/{__projects__ => 2.x}/style/components/Less.vue | 0 e2e/{__projects__ => 2.x}/style/components/PostCss.vue | 0 e2e/{__projects__ => 2.x}/style/components/Sass.vue | 0 e2e/{__projects__ => 2.x}/style/components/Scss.vue | 0 e2e/{__projects__ => 2.x}/style/components/Stylus.vue | 0 e2e/{__projects__ => 2.x}/style/components/relative/resource.styl | 0 e2e/{__projects__ => 2.x}/style/components/styles/external.css | 0 e2e/{__projects__ => 2.x}/style/components/styles/sass-a.sass | 0 e2e/{__projects__ => 2.x}/style/components/styles/sass-b.sass | 0 e2e/{__projects__ => 2.x}/style/components/styles/scss-a.scss | 0 e2e/{__projects__ => 2.x}/style/components/styles/scss-b.scss | 0 e2e/{__projects__ => 2.x}/style/package.json | 0 e2e/{__projects__ => 2.x}/style/setup.js | 0 e2e/{__projects__ => 2.x}/style/test.js | 0 e2e/{__projects__ => 2.x}/style/variables.less | 0 e2e/{__projects__ => 2.x}/style/variables.scss | 0 60 files changed, 0 insertions(+), 0 deletions(-) rename e2e/{__projects__ => 2.x}/babel-in-package/components/Basic.vue (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/components/Coffee.vue (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/components/TypeScript.vue (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/components/TypeScriptChild.vue (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/package.json (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/test.js (100%) rename e2e/{__projects__ => 2.x}/babel-in-package/tsconfig.json (100%) rename e2e/{__projects__ => 2.x}/basic/__snapshots__/test.js.snap (100%) rename e2e/{__projects__ => 2.x}/basic/babel.config.js (100%) rename e2e/{__projects__ => 2.x}/basic/components/Basic.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/BasicSrc.html (100%) rename e2e/{__projects__ => 2.x}/basic/components/BasicSrc.js (100%) rename e2e/{__projects__ => 2.x}/basic/components/BasicSrc.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/Coffee.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/CoffeeScript.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/Constructor.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/FunctionalSFC.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/FunctionalSFCParent.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/FunctionalSFCRender.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/Jade.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/Jsx.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/NamedExport.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/NoScript.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/Pug.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/PugBase.pug (100%) rename e2e/{__projects__ => 2.x}/basic/components/PugRelativeExtends.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/RenderFunction.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/SourceMapsSrc.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/TemplateString.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/TypeScript.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/TypeScriptChild.vue (100%) rename e2e/{__projects__ => 2.x}/basic/components/coffee.spec.js (100%) rename e2e/{__projects__ => 2.x}/basic/components/relative/PugRelativeBase.pug (100%) rename e2e/{__projects__ => 2.x}/basic/package.json (100%) rename e2e/{__projects__ => 2.x}/basic/test.js (100%) rename e2e/{__projects__ => 2.x}/basic/tsconfig.json (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/babel-transformer.js (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/components/Scss.vue (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/package.json (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/pcss-transformer.js (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/scss-transformer.js (100%) rename e2e/{__projects__ => 2.x}/custom-transformers/test.js (100%) rename e2e/{__projects__ => 2.x}/style/babel.config.js (100%) rename e2e/{__projects__ => 2.x}/style/components/External.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/Less.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/PostCss.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/Sass.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/Scss.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/Stylus.vue (100%) rename e2e/{__projects__ => 2.x}/style/components/relative/resource.styl (100%) rename e2e/{__projects__ => 2.x}/style/components/styles/external.css (100%) rename e2e/{__projects__ => 2.x}/style/components/styles/sass-a.sass (100%) rename e2e/{__projects__ => 2.x}/style/components/styles/sass-b.sass (100%) rename e2e/{__projects__ => 2.x}/style/components/styles/scss-a.scss (100%) rename e2e/{__projects__ => 2.x}/style/components/styles/scss-b.scss (100%) rename e2e/{__projects__ => 2.x}/style/package.json (100%) rename e2e/{__projects__ => 2.x}/style/setup.js (100%) rename e2e/{__projects__ => 2.x}/style/test.js (100%) rename e2e/{__projects__ => 2.x}/style/variables.less (100%) rename e2e/{__projects__ => 2.x}/style/variables.scss (100%) diff --git a/e2e/__projects__/babel-in-package/components/Basic.vue b/e2e/2.x/babel-in-package/components/Basic.vue similarity index 100% rename from e2e/__projects__/babel-in-package/components/Basic.vue rename to e2e/2.x/babel-in-package/components/Basic.vue diff --git a/e2e/__projects__/babel-in-package/components/Coffee.vue b/e2e/2.x/babel-in-package/components/Coffee.vue similarity index 100% rename from e2e/__projects__/babel-in-package/components/Coffee.vue rename to e2e/2.x/babel-in-package/components/Coffee.vue diff --git a/e2e/__projects__/babel-in-package/components/TypeScript.vue b/e2e/2.x/babel-in-package/components/TypeScript.vue similarity index 100% rename from e2e/__projects__/babel-in-package/components/TypeScript.vue rename to e2e/2.x/babel-in-package/components/TypeScript.vue diff --git a/e2e/__projects__/babel-in-package/components/TypeScriptChild.vue b/e2e/2.x/babel-in-package/components/TypeScriptChild.vue similarity index 100% rename from e2e/__projects__/babel-in-package/components/TypeScriptChild.vue rename to e2e/2.x/babel-in-package/components/TypeScriptChild.vue diff --git a/e2e/__projects__/babel-in-package/package.json b/e2e/2.x/babel-in-package/package.json similarity index 100% rename from e2e/__projects__/babel-in-package/package.json rename to e2e/2.x/babel-in-package/package.json diff --git a/e2e/__projects__/babel-in-package/test.js b/e2e/2.x/babel-in-package/test.js similarity index 100% rename from e2e/__projects__/babel-in-package/test.js rename to e2e/2.x/babel-in-package/test.js diff --git a/e2e/__projects__/babel-in-package/tsconfig.json b/e2e/2.x/babel-in-package/tsconfig.json similarity index 100% rename from e2e/__projects__/babel-in-package/tsconfig.json rename to e2e/2.x/babel-in-package/tsconfig.json diff --git a/e2e/__projects__/basic/__snapshots__/test.js.snap b/e2e/2.x/basic/__snapshots__/test.js.snap similarity index 100% rename from e2e/__projects__/basic/__snapshots__/test.js.snap rename to e2e/2.x/basic/__snapshots__/test.js.snap diff --git a/e2e/__projects__/basic/babel.config.js b/e2e/2.x/basic/babel.config.js similarity index 100% rename from e2e/__projects__/basic/babel.config.js rename to e2e/2.x/basic/babel.config.js diff --git a/e2e/__projects__/basic/components/Basic.vue b/e2e/2.x/basic/components/Basic.vue similarity index 100% rename from e2e/__projects__/basic/components/Basic.vue rename to e2e/2.x/basic/components/Basic.vue diff --git a/e2e/__projects__/basic/components/BasicSrc.html b/e2e/2.x/basic/components/BasicSrc.html similarity index 100% rename from e2e/__projects__/basic/components/BasicSrc.html rename to e2e/2.x/basic/components/BasicSrc.html diff --git a/e2e/__projects__/basic/components/BasicSrc.js b/e2e/2.x/basic/components/BasicSrc.js similarity index 100% rename from e2e/__projects__/basic/components/BasicSrc.js rename to e2e/2.x/basic/components/BasicSrc.js diff --git a/e2e/__projects__/basic/components/BasicSrc.vue b/e2e/2.x/basic/components/BasicSrc.vue similarity index 100% rename from e2e/__projects__/basic/components/BasicSrc.vue rename to e2e/2.x/basic/components/BasicSrc.vue diff --git a/e2e/__projects__/basic/components/Coffee.vue b/e2e/2.x/basic/components/Coffee.vue similarity index 100% rename from e2e/__projects__/basic/components/Coffee.vue rename to e2e/2.x/basic/components/Coffee.vue diff --git a/e2e/__projects__/basic/components/CoffeeScript.vue b/e2e/2.x/basic/components/CoffeeScript.vue similarity index 100% rename from e2e/__projects__/basic/components/CoffeeScript.vue rename to e2e/2.x/basic/components/CoffeeScript.vue diff --git a/e2e/__projects__/basic/components/Constructor.vue b/e2e/2.x/basic/components/Constructor.vue similarity index 100% rename from e2e/__projects__/basic/components/Constructor.vue rename to e2e/2.x/basic/components/Constructor.vue diff --git a/e2e/__projects__/basic/components/FunctionalSFC.vue b/e2e/2.x/basic/components/FunctionalSFC.vue similarity index 100% rename from e2e/__projects__/basic/components/FunctionalSFC.vue rename to e2e/2.x/basic/components/FunctionalSFC.vue diff --git a/e2e/__projects__/basic/components/FunctionalSFCParent.vue b/e2e/2.x/basic/components/FunctionalSFCParent.vue similarity index 100% rename from e2e/__projects__/basic/components/FunctionalSFCParent.vue rename to e2e/2.x/basic/components/FunctionalSFCParent.vue diff --git a/e2e/__projects__/basic/components/FunctionalSFCRender.vue b/e2e/2.x/basic/components/FunctionalSFCRender.vue similarity index 100% rename from e2e/__projects__/basic/components/FunctionalSFCRender.vue rename to e2e/2.x/basic/components/FunctionalSFCRender.vue diff --git a/e2e/__projects__/basic/components/Jade.vue b/e2e/2.x/basic/components/Jade.vue similarity index 100% rename from e2e/__projects__/basic/components/Jade.vue rename to e2e/2.x/basic/components/Jade.vue diff --git a/e2e/__projects__/basic/components/Jsx.vue b/e2e/2.x/basic/components/Jsx.vue similarity index 100% rename from e2e/__projects__/basic/components/Jsx.vue rename to e2e/2.x/basic/components/Jsx.vue diff --git a/e2e/__projects__/basic/components/NamedExport.vue b/e2e/2.x/basic/components/NamedExport.vue similarity index 100% rename from e2e/__projects__/basic/components/NamedExport.vue rename to e2e/2.x/basic/components/NamedExport.vue diff --git a/e2e/__projects__/basic/components/NoScript.vue b/e2e/2.x/basic/components/NoScript.vue similarity index 100% rename from e2e/__projects__/basic/components/NoScript.vue rename to e2e/2.x/basic/components/NoScript.vue diff --git a/e2e/__projects__/basic/components/Pug.vue b/e2e/2.x/basic/components/Pug.vue similarity index 100% rename from e2e/__projects__/basic/components/Pug.vue rename to e2e/2.x/basic/components/Pug.vue diff --git a/e2e/__projects__/basic/components/PugBase.pug b/e2e/2.x/basic/components/PugBase.pug similarity index 100% rename from e2e/__projects__/basic/components/PugBase.pug rename to e2e/2.x/basic/components/PugBase.pug diff --git a/e2e/__projects__/basic/components/PugRelativeExtends.vue b/e2e/2.x/basic/components/PugRelativeExtends.vue similarity index 100% rename from e2e/__projects__/basic/components/PugRelativeExtends.vue rename to e2e/2.x/basic/components/PugRelativeExtends.vue diff --git a/e2e/__projects__/basic/components/RenderFunction.vue b/e2e/2.x/basic/components/RenderFunction.vue similarity index 100% rename from e2e/__projects__/basic/components/RenderFunction.vue rename to e2e/2.x/basic/components/RenderFunction.vue diff --git a/e2e/__projects__/basic/components/SourceMapsSrc.vue b/e2e/2.x/basic/components/SourceMapsSrc.vue similarity index 100% rename from e2e/__projects__/basic/components/SourceMapsSrc.vue rename to e2e/2.x/basic/components/SourceMapsSrc.vue diff --git a/e2e/__projects__/basic/components/TemplateString.vue b/e2e/2.x/basic/components/TemplateString.vue similarity index 100% rename from e2e/__projects__/basic/components/TemplateString.vue rename to e2e/2.x/basic/components/TemplateString.vue diff --git a/e2e/__projects__/basic/components/TypeScript.vue b/e2e/2.x/basic/components/TypeScript.vue similarity index 100% rename from e2e/__projects__/basic/components/TypeScript.vue rename to e2e/2.x/basic/components/TypeScript.vue diff --git a/e2e/__projects__/basic/components/TypeScriptChild.vue b/e2e/2.x/basic/components/TypeScriptChild.vue similarity index 100% rename from e2e/__projects__/basic/components/TypeScriptChild.vue rename to e2e/2.x/basic/components/TypeScriptChild.vue diff --git a/e2e/__projects__/basic/components/coffee.spec.js b/e2e/2.x/basic/components/coffee.spec.js similarity index 100% rename from e2e/__projects__/basic/components/coffee.spec.js rename to e2e/2.x/basic/components/coffee.spec.js diff --git a/e2e/__projects__/basic/components/relative/PugRelativeBase.pug b/e2e/2.x/basic/components/relative/PugRelativeBase.pug similarity index 100% rename from e2e/__projects__/basic/components/relative/PugRelativeBase.pug rename to e2e/2.x/basic/components/relative/PugRelativeBase.pug diff --git a/e2e/__projects__/basic/package.json b/e2e/2.x/basic/package.json similarity index 100% rename from e2e/__projects__/basic/package.json rename to e2e/2.x/basic/package.json diff --git a/e2e/__projects__/basic/test.js b/e2e/2.x/basic/test.js similarity index 100% rename from e2e/__projects__/basic/test.js rename to e2e/2.x/basic/test.js diff --git a/e2e/__projects__/basic/tsconfig.json b/e2e/2.x/basic/tsconfig.json similarity index 100% rename from e2e/__projects__/basic/tsconfig.json rename to e2e/2.x/basic/tsconfig.json diff --git a/e2e/__projects__/custom-transformers/babel-transformer.js b/e2e/2.x/custom-transformers/babel-transformer.js similarity index 100% rename from e2e/__projects__/custom-transformers/babel-transformer.js rename to e2e/2.x/custom-transformers/babel-transformer.js diff --git a/e2e/__projects__/custom-transformers/components/Scss.vue b/e2e/2.x/custom-transformers/components/Scss.vue similarity index 100% rename from e2e/__projects__/custom-transformers/components/Scss.vue rename to e2e/2.x/custom-transformers/components/Scss.vue diff --git a/e2e/__projects__/custom-transformers/package.json b/e2e/2.x/custom-transformers/package.json similarity index 100% rename from e2e/__projects__/custom-transformers/package.json rename to e2e/2.x/custom-transformers/package.json diff --git a/e2e/__projects__/custom-transformers/pcss-transformer.js b/e2e/2.x/custom-transformers/pcss-transformer.js similarity index 100% rename from e2e/__projects__/custom-transformers/pcss-transformer.js rename to e2e/2.x/custom-transformers/pcss-transformer.js diff --git a/e2e/__projects__/custom-transformers/scss-transformer.js b/e2e/2.x/custom-transformers/scss-transformer.js similarity index 100% rename from e2e/__projects__/custom-transformers/scss-transformer.js rename to e2e/2.x/custom-transformers/scss-transformer.js diff --git a/e2e/__projects__/custom-transformers/test.js b/e2e/2.x/custom-transformers/test.js similarity index 100% rename from e2e/__projects__/custom-transformers/test.js rename to e2e/2.x/custom-transformers/test.js diff --git a/e2e/__projects__/style/babel.config.js b/e2e/2.x/style/babel.config.js similarity index 100% rename from e2e/__projects__/style/babel.config.js rename to e2e/2.x/style/babel.config.js diff --git a/e2e/__projects__/style/components/External.vue b/e2e/2.x/style/components/External.vue similarity index 100% rename from e2e/__projects__/style/components/External.vue rename to e2e/2.x/style/components/External.vue diff --git a/e2e/__projects__/style/components/Less.vue b/e2e/2.x/style/components/Less.vue similarity index 100% rename from e2e/__projects__/style/components/Less.vue rename to e2e/2.x/style/components/Less.vue diff --git a/e2e/__projects__/style/components/PostCss.vue b/e2e/2.x/style/components/PostCss.vue similarity index 100% rename from e2e/__projects__/style/components/PostCss.vue rename to e2e/2.x/style/components/PostCss.vue diff --git a/e2e/__projects__/style/components/Sass.vue b/e2e/2.x/style/components/Sass.vue similarity index 100% rename from e2e/__projects__/style/components/Sass.vue rename to e2e/2.x/style/components/Sass.vue diff --git a/e2e/__projects__/style/components/Scss.vue b/e2e/2.x/style/components/Scss.vue similarity index 100% rename from e2e/__projects__/style/components/Scss.vue rename to e2e/2.x/style/components/Scss.vue diff --git a/e2e/__projects__/style/components/Stylus.vue b/e2e/2.x/style/components/Stylus.vue similarity index 100% rename from e2e/__projects__/style/components/Stylus.vue rename to e2e/2.x/style/components/Stylus.vue diff --git a/e2e/__projects__/style/components/relative/resource.styl b/e2e/2.x/style/components/relative/resource.styl similarity index 100% rename from e2e/__projects__/style/components/relative/resource.styl rename to e2e/2.x/style/components/relative/resource.styl diff --git a/e2e/__projects__/style/components/styles/external.css b/e2e/2.x/style/components/styles/external.css similarity index 100% rename from e2e/__projects__/style/components/styles/external.css rename to e2e/2.x/style/components/styles/external.css diff --git a/e2e/__projects__/style/components/styles/sass-a.sass b/e2e/2.x/style/components/styles/sass-a.sass similarity index 100% rename from e2e/__projects__/style/components/styles/sass-a.sass rename to e2e/2.x/style/components/styles/sass-a.sass diff --git a/e2e/__projects__/style/components/styles/sass-b.sass b/e2e/2.x/style/components/styles/sass-b.sass similarity index 100% rename from e2e/__projects__/style/components/styles/sass-b.sass rename to e2e/2.x/style/components/styles/sass-b.sass diff --git a/e2e/__projects__/style/components/styles/scss-a.scss b/e2e/2.x/style/components/styles/scss-a.scss similarity index 100% rename from e2e/__projects__/style/components/styles/scss-a.scss rename to e2e/2.x/style/components/styles/scss-a.scss diff --git a/e2e/__projects__/style/components/styles/scss-b.scss b/e2e/2.x/style/components/styles/scss-b.scss similarity index 100% rename from e2e/__projects__/style/components/styles/scss-b.scss rename to e2e/2.x/style/components/styles/scss-b.scss diff --git a/e2e/__projects__/style/package.json b/e2e/2.x/style/package.json similarity index 100% rename from e2e/__projects__/style/package.json rename to e2e/2.x/style/package.json diff --git a/e2e/__projects__/style/setup.js b/e2e/2.x/style/setup.js similarity index 100% rename from e2e/__projects__/style/setup.js rename to e2e/2.x/style/setup.js diff --git a/e2e/__projects__/style/test.js b/e2e/2.x/style/test.js similarity index 100% rename from e2e/__projects__/style/test.js rename to e2e/2.x/style/test.js diff --git a/e2e/__projects__/style/variables.less b/e2e/2.x/style/variables.less similarity index 100% rename from e2e/__projects__/style/variables.less rename to e2e/2.x/style/variables.less diff --git a/e2e/__projects__/style/variables.scss b/e2e/2.x/style/variables.scss similarity index 100% rename from e2e/__projects__/style/variables.scss rename to e2e/2.x/style/variables.scss From 57c1a2f51d729083297c217b0e442235f994c78a Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:07:53 +0900 Subject: [PATCH 03/11] build: add package.json for monorepo --- package.json | 41 ++++++++++++++++++++ yarn.lock | 106 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 136 insertions(+), 11 deletions(-) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 00000000..db4616a6 --- /dev/null +++ b/package.json @@ -0,0 +1,41 @@ +{ + "name": "vue-jest-monorepo", + "private": true, + "workspaces": { + "packages": [ + "packages/*", + "e2e/**" + ] + }, + "scripts": { + "format": "prettier --no-semi --single-quote --write \"**/*.{js,json,md}\"", + "format:check": "prettier --no-semi --single-quote --check \"**/*.{js,json,md}\"", + "lint": "eslint --ignore-path .gitignore \"{,!(node_modules)/**/}*.js\"", + "lint:fix": "yarn lint --fix", + "test": "yarn lint && yarn format:check && yarn workspaces run test" + }, + "devDependencies": { + "eslint": "^5.12.0", + "eslint-config-prettier": "^3.3.0", + "eslint-config-standard": "^12.0.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-node": "^8.0.0", + "eslint-plugin-promise": "^4.0.1", + "eslint-plugin-standard": "^4.0.0", + "eslint-plugin-vue": "^5.1.0", + "husky": "^1.1.4", + "lint-staged": "^8.0.5", + "prettier": "^1.16.1" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "*.{js,json,css,md,vue}": [ + "yarn format", + "git add" + ] + } +} diff --git a/yarn.lock b/yarn.lock index 1b077bb8..da2cef21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1957,6 +1957,11 @@ babel-generator@^6.18.0: source-map "^0.5.7" trim-right "^1.0.1" +babel-helper-vue-jsx-merge-props@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" + integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== + babel-jest@^23.6.0: version "23.6.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1" @@ -2031,10 +2036,22 @@ babel-plugin-jest-hoist@^26.2.0: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + 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" +babel-plugin-transform-vue-jsx@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz#d40492e6692a36b594f7e9a1928f43e969740960" + integrity sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw== + dependencies: + esutils "^2.0.2" + babel-preset-current-node-syntax@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" @@ -2120,6 +2137,11 @@ babylon@^6.18.0: resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== +balanced-match@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" + integrity sha1-tQS9BYabOSWd0MXvw12EMXbczEo= + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2637,7 +2659,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0: +color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2655,11 +2677,27 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-string@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" + integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE= + dependencies: + color-name "^1.0.0" + +color@^0.11.0: + version "0.11.4" + resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" + integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q= + dependencies: + clone "^1.0.2" + color-convert "^1.3.0" + color-string "^0.3.0" + colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" @@ -3052,6 +3090,16 @@ crypto-random-string@^1.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= +css-color-function@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e" + integrity sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4= + dependencies: + balanced-match "0.1.0" + color "^0.11.0" + debug "^3.1.0" + rgb "~0.1.0" + css-parse@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.0.4.tgz#38b0503fbf9da9f54e9c1dbda60e145c77117bdd" @@ -5649,7 +5697,7 @@ jest-worker@^26.3.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^26.0.0: +jest@26.x, jest@^26.0.0: version "26.4.2" resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== @@ -7597,6 +7645,21 @@ posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" +postcss-color-function@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.1.0.tgz#b6f9355e07b12fcc5c34dab957834769b03d8f57" + integrity sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ== + dependencies: + css-color-function "~1.3.3" + postcss "^6.0.23" + postcss-message-helpers "^2.0.0" + postcss-value-parser "^3.3.1" + +postcss-message-helpers@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e" + integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4= + postcss-selector-parser@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" @@ -7605,7 +7668,21 @@ postcss-selector-parser@^6.0.2: indexes-of "^1.0.1" uniq "^1.0.1" -postcss@^7.0.14: +postcss-value-parser@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + +postcss@^6.0.23: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + +postcss@^7.0.13, postcss@^7.0.14: version "7.0.36" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== @@ -8364,6 +8441,11 @@ reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" +rgb@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5" + integrity sha1-vieykej+/+rBvZlylyG/pA/AN7U= + right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" @@ -9082,7 +9164,7 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^5.0.0, supports-color@^5.3.0: +supports-color@^5.0.0, supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -9668,9 +9750,10 @@ vue-eslint-parser@^5.0.0: esquery "^1.0.1" lodash "^4.17.11" -vue-template-compiler@^2.4.2: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" +vue-template-compiler@^2.4.2, vue-template-compiler@^2.5.21: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" + integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -9679,9 +9762,10 @@ vue-template-es2015-compiler@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" -vue@^2.4.2: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" +vue@^2.4.2, vue@^2.5.21: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" + integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== w3c-hr-time@^1.0.2: version "1.0.2" From 7da78035bab906a9e84970661583ab9eedc058f8 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:16:15 +0900 Subject: [PATCH 04/11] chore(deps): remove lint & e2e deps in vue2-jest --- packages/vue2-jest/package.json | 26 +------------------------- yarn.lock | 12 ------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/packages/vue2-jest/package.json b/packages/vue2-jest/package.json index 6b8f27aa..4d45b8a3 100644 --- a/packages/vue2-jest/package.json +++ b/packages/vue2-jest/package.json @@ -18,13 +18,8 @@ "vue jest preprocessor" ], "scripts": { - "format": "prettier --no-semi --single-quote --write \"**/*.{js,json,md}\"", - "format:check": "prettier --no-semi --single-quote --check \"**/*.{js,json,md}\"", - "lint": "eslint --ignore-path .gitignore \"{,!(node_modules)/**/}*.js\"", - "lint:fix": "yarn lint --fix", "release": "semantic-release", - "test": "yarn lint && yarn format:check && yarn test:e2e", - "test:e2e": "node e2e/test-runner" + "test": "echo \"There are no unit tests yet. Run e2e/2.x/ tests instead.\"" }, "author": "Edd Yerburgh", "license": "MIT", @@ -34,28 +29,9 @@ "@vue/test-utils": "^1.1.0", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^23.6.0", - "coffeescript": "^2.3.2", "conventional-changelog": "^1.1.5", - "eslint": "^5.12.0", - "eslint-config-prettier": "^3.3.0", - "eslint-config-standard": "^12.0.0", - "eslint-plugin-import": "^2.14.0", - "eslint-plugin-node": "^8.0.0", - "eslint-plugin-promise": "^4.0.1", - "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-vue": "^5.1.0", - "fs-extra": "^7.0.1", - "hamljs": "^0.6.2", - "husky": "^1.1.4", - "jade": "^1.11.0", "jest": "^26.0.0", - "less": "^3.9.0", - "lint-staged": "^8.0.5", - "prettier": "^1.16.1", - "pug": "^3.0.1", - "sass": "^1.23.7", "semantic-release": "^15.13.2", - "stylus": "^0.54.5", "ts-jest": "^26.3.0", "typescript": "^3.2.2", "vue": "^2.4.2", diff --git a/yarn.lock b/yarn.lock index da2cef21..0f5e4c1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4144,14 +4144,6 @@ from2@^2.1.0, from2@^2.3.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^8.0.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -4456,10 +4448,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -hamljs@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/hamljs/-/hamljs-0.6.2.tgz#7b7116cf6dbe7278e42b3f6ef8725a33e177c8e3" - handlebars@^4.0.2, handlebars@^4.4.0: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" From 719d2356678685234a67a6ce66422125eaed28ef Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:33:11 +0900 Subject: [PATCH 05/11] test: rename e2e projects --- e2e/2.x/babel-in-package/package.json | 3 +-- e2e/2.x/basic/package.json | 3 +-- e2e/2.x/custom-transformers/package.json | 3 +-- e2e/2.x/style/package.json | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/e2e/2.x/babel-in-package/package.json b/e2e/2.x/babel-in-package/package.json index c2e2240a..52c7925f 100644 --- a/e2e/2.x/babel-in-package/package.json +++ b/e2e/2.x/babel-in-package/package.json @@ -1,7 +1,6 @@ { - "name": "babel-in-package", + "name": "vue2-babel-in-package", "version": "1.0.0", - "main": "index.js", "license": "MIT", "private": true, "scripts": { diff --git a/e2e/2.x/basic/package.json b/e2e/2.x/basic/package.json index 04388a01..4331d5a7 100644 --- a/e2e/2.x/basic/package.json +++ b/e2e/2.x/basic/package.json @@ -1,7 +1,6 @@ { - "name": "basic", + "name": "vue2-basic", "version": "1.0.0", - "main": "index.js", "license": "MIT", "private": true, "scripts": { diff --git a/e2e/2.x/custom-transformers/package.json b/e2e/2.x/custom-transformers/package.json index 8ba32ab9..d3d1a2d6 100644 --- a/e2e/2.x/custom-transformers/package.json +++ b/e2e/2.x/custom-transformers/package.json @@ -1,7 +1,6 @@ { - "name": "custom-transformers", + "name": "vue2-custom-transformers", "version": "1.0.0", - "main": "index.js", "license": "MIT", "private": true, "scripts": { diff --git a/e2e/2.x/style/package.json b/e2e/2.x/style/package.json index 1832f511..842c89be 100644 --- a/e2e/2.x/style/package.json +++ b/e2e/2.x/style/package.json @@ -1,7 +1,6 @@ { - "name": "style", + "name": "vue2-style", "version": "1.0.0", - "main": "index.js", "license": "MIT", "private": true, "scripts": { From 2c58e618513564b774fb27121c7a67d4ab106fe0 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:35:01 +0900 Subject: [PATCH 06/11] chore(deps-dev): add vue-jest deps in e2e projects --- e2e/2.x/babel-in-package/package.json | 3 ++- e2e/2.x/basic/package.json | 3 ++- e2e/2.x/custom-transformers/package.json | 3 ++- e2e/2.x/style/package.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/e2e/2.x/babel-in-package/package.json b/e2e/2.x/babel-in-package/package.json index 52c7925f..1551fab5 100644 --- a/e2e/2.x/babel-in-package/package.json +++ b/e2e/2.x/babel-in-package/package.json @@ -18,7 +18,8 @@ "coffeescript": "^2.3.2", "jest": "26.x", "ts-jest": "^26.3.0", - "typescript": "^3.2.2" + "typescript": "^3.2.2", + "vue-jest": "^4.0.1" }, "jest": { "moduleFileExtensions": [ diff --git a/e2e/2.x/basic/package.json b/e2e/2.x/basic/package.json index 4331d5a7..99a526a4 100644 --- a/e2e/2.x/basic/package.json +++ b/e2e/2.x/basic/package.json @@ -23,7 +23,8 @@ "pug": "^3.0.1", "sass": "^1.23.7", "ts-jest": "^26.3.0", - "typescript": "^3.2.2" + "typescript": "^3.2.2", + "vue-jest": "^4.0.1" }, "jest": { "moduleFileExtensions": [ diff --git a/e2e/2.x/custom-transformers/package.json b/e2e/2.x/custom-transformers/package.json index d3d1a2d6..92c99442 100644 --- a/e2e/2.x/custom-transformers/package.json +++ b/e2e/2.x/custom-transformers/package.json @@ -17,7 +17,8 @@ "jest": "26.x", "postcss": "^7.0.13", "postcss-color-function": "^4.0.1", - "sass": "^1.23.7" + "sass": "^1.23.7", + "vue-jest": "^4.0.1" }, "jest": { "moduleFileExtensions": [ diff --git a/e2e/2.x/style/package.json b/e2e/2.x/style/package.json index 842c89be..45ea78e1 100644 --- a/e2e/2.x/style/package.json +++ b/e2e/2.x/style/package.json @@ -18,7 +18,8 @@ "less": "^3.9.0", "postcss": "^7.0.13", "sass": "^1.23.7", - "stylus": "^0.54.5" + "stylus": "^0.54.5", + "vue-jest": "^4.0.1" }, "jest": { "moduleFileExtensions": [ From c814cc92b4851cc1cdc53ea2f84e98b88edb969b Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:36:50 +0900 Subject: [PATCH 07/11] test: fix tmp file path --- e2e/2.x/style/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/2.x/style/setup.js b/e2e/2.x/style/setup.js index 79679d2d..7cc1a603 100644 --- a/e2e/2.x/style/setup.js +++ b/e2e/2.x/style/setup.js @@ -1,6 +1,6 @@ const fs = require('fs') -const testDir = 'node_modules/vue-jest-test' +const testDir = '../../../node_modules/vue-jest-test' if (!fs.existsSync(testDir)) { fs.mkdirSync(testDir) From e86cad2c38c249948e099ee3238d7fb9d18a38c7 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:43:41 +0900 Subject: [PATCH 08/11] build: change package name to vue2-jest --- e2e/2.x/babel-in-package/package.json | 4 ++-- e2e/2.x/basic/package.json | 4 ++-- e2e/2.x/basic/test.js | 2 +- e2e/2.x/custom-transformers/package.json | 4 ++-- e2e/2.x/style/package.json | 4 ++-- packages/vue2-jest/package.json | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/e2e/2.x/babel-in-package/package.json b/e2e/2.x/babel-in-package/package.json index 1551fab5..984b4c98 100644 --- a/e2e/2.x/babel-in-package/package.json +++ b/e2e/2.x/babel-in-package/package.json @@ -19,7 +19,7 @@ "jest": "26.x", "ts-jest": "^26.3.0", "typescript": "^3.2.2", - "vue-jest": "^4.0.1" + "vue2-jest": "~26.0.0" }, "jest": { "moduleFileExtensions": [ @@ -29,7 +29,7 @@ ], "transform": { "^.+\\.js$": "babel-jest", - "^.+\\.vue$": "vue-jest" + "^.+\\.vue$": "vue2-jest" } }, "babel": { diff --git a/e2e/2.x/basic/package.json b/e2e/2.x/basic/package.json index 99a526a4..e94c43e5 100644 --- a/e2e/2.x/basic/package.json +++ b/e2e/2.x/basic/package.json @@ -24,7 +24,7 @@ "sass": "^1.23.7", "ts-jest": "^26.3.0", "typescript": "^3.2.2", - "vue-jest": "^4.0.1" + "vue2-jest": "~26.0.0" }, "jest": { "moduleFileExtensions": [ @@ -34,7 +34,7 @@ ], "transform": { "^.+\\.js$": "babel-jest", - "^.+\\.vue$": "vue-jest" + "^.+\\.vue$": "vue2-jest" }, "moduleNameMapper": { "^~?__styles/(.*)$": "/components/styles/$1" diff --git a/e2e/2.x/basic/test.js b/e2e/2.x/basic/test.js index 51a5bc2b..255bacc9 100644 --- a/e2e/2.x/basic/test.js +++ b/e2e/2.x/basic/test.js @@ -3,7 +3,7 @@ import TypeScript from './components/TypeScript.vue' import TemplateString from './components/TemplateString.vue' import { resolve } from 'path' import { readFileSync } from 'fs' -import jestVue from 'vue-jest' +import jestVue from 'vue2-jest' import RenderFunction from './components/RenderFunction.vue' import Jade from './components/Jade.vue' import FunctionalSFC from './components/FunctionalSFC.vue' diff --git a/e2e/2.x/custom-transformers/package.json b/e2e/2.x/custom-transformers/package.json index 92c99442..ca6d8d79 100644 --- a/e2e/2.x/custom-transformers/package.json +++ b/e2e/2.x/custom-transformers/package.json @@ -18,7 +18,7 @@ "postcss": "^7.0.13", "postcss-color-function": "^4.0.1", "sass": "^1.23.7", - "vue-jest": "^4.0.1" + "vue2-jest": "~26.0.0" }, "jest": { "moduleFileExtensions": [ @@ -28,7 +28,7 @@ ], "transform": { "^.+\\.js$": "./babel-transformer.js", - "^.+\\.vue$": "vue-jest" + "^.+\\.vue$": "vue2-jest" }, "moduleNameMapper": { "^~?__styles/(.*)$": "/components/styles/$1" diff --git a/e2e/2.x/style/package.json b/e2e/2.x/style/package.json index 45ea78e1..069108b2 100644 --- a/e2e/2.x/style/package.json +++ b/e2e/2.x/style/package.json @@ -19,7 +19,7 @@ "postcss": "^7.0.13", "sass": "^1.23.7", "stylus": "^0.54.5", - "vue-jest": "^4.0.1" + "vue2-jest": "~26.0.0" }, "jest": { "moduleFileExtensions": [ @@ -29,7 +29,7 @@ ], "transform": { "^.+\\.js$": "babel-jest", - "^.+\\.vue$": "vue-jest" + "^.+\\.vue$": "vue2-jest" }, "moduleNameMapper": { "^~tmp/(.*)": "/tmp/$1", diff --git a/packages/vue2-jest/package.json b/packages/vue2-jest/package.json index 4d45b8a3..c1dc0927 100644 --- a/packages/vue2-jest/package.json +++ b/packages/vue2-jest/package.json @@ -1,7 +1,7 @@ { - "name": "vue-jest", - "version": "4.0.1", - "description": "Jest Vue transform", + "name": "vue2-jest", + "version": "26.0.0", + "description": "Jest transformer for Vue 2", "main": "lib/index.js", "files": [ "lib" From 2be90a8fb7ce67e3d8643f7d873e3f7e83e44503 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:48:32 +0900 Subject: [PATCH 09/11] test: remove unused test runner --- e2e/test-runner.js | 84 ---------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 e2e/test-runner.js diff --git a/e2e/test-runner.js b/e2e/test-runner.js deleted file mode 100644 index e74069b9..00000000 --- a/e2e/test-runner.js +++ /dev/null @@ -1,84 +0,0 @@ -const { spawnSync } = require('child_process') -const path = require('path') -const fs = require('fs-extra') -const chalk = require('chalk') - -const IGNORE_FILES = ['.DS_Store'] -const cwd = process.cwd() - -// Can be run as `yarn test:e2e --cache` to forego reinstalling node_modules, or -// `yarn test:e2e `, or `yarn test:e2e --cache `. -const args = process.argv.slice(2) - -function success(msg) { - console.info(chalk.green('\n[vue-jest]: ' + msg + '\n')) -} - -function info(msg) { - console.info(chalk.blue('\n[vue-jest]: ' + msg + '\n')) -} - -function runTest(dir) { - const resolvedPath = path.resolve(__dirname, '__projects__', dir) - - const run = command => { - const [cmd, ...args] = command.split(' ') - const { status } = spawnSync(cmd, args, { - cwd: resolvedPath, - env: { PATH: process.env.PATH }, - stdio: 'inherit', - shell: true - }) - if (status !== 0) { - process.exit(status) - } - } - - const log = msg => info(`(${dir}) ${msg}`) - - if (!args.filter(arg => arg === '--cache').length) { - log('Removing node_modules') - fs.removeSync(`${resolvedPath}/node_modules`) - - log('Removing yarn.lock') - fs.removeSync(`${resolvedPath}/yarn.lock`) - - log('Installing node_modules') - run('yarn install --silent') - } - - // For tests that need vue-jest to successfully `require.resolve()` a file in - // the project directory's node_modules, we can't symlink vue-jest from a - // parent directory (as node module resolution walks up the file tree, - // starting from the realpath of the caller), we must copy it. - if ( - !fs.existsSync(`${resolvedPath}/node_modules/vue-jest`) || - !fs.lstatSync(`${resolvedPath}/node_modules/vue-jest`).isSymbolicLink() - ) { - log('Copying vue-jest into node_modules') - fs.mkdirSync(`${resolvedPath}/node_modules/vue-jest`, { recursive: true }) - run(`cp ${cwd}/package.json node_modules/vue-jest/`) - run(`cp -r ${cwd}/lib node_modules/vue-jest/`) - } - - log('Running tests') - run('yarn test') - - success(`(${dir}) Complete`) -} - -async function testRunner() { - const directories = fs - .readdirSync(path.resolve(__dirname, '__projects__')) - .filter(d => !IGNORE_FILES.includes(d)) - - const matches = args.filter(d => directories.includes(d)) - - if (matches.length) { - matches.forEach(runTest) - } else { - directories.forEach(runTest) - } -} - -testRunner() From a7402b00d425a21eae61e087083c6a1b2a694030 Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:50:37 +0900 Subject: [PATCH 10/11] build: add engines option to use monorepo --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index db4616a6..a85c196a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "vue-jest-monorepo", "private": true, + "engines": { + "node": ">=10", + "yarn": "^1.21.1" + }, "workspaces": { "packages": [ "packages/*", From 73eaf6de85cfad1f43c0bbee398e258dc479278a Mon Sep 17 00:00:00 2001 From: Nogic <24802730+nogic1008@users.noreply.github.com> Date: Wed, 16 Jun 2021 12:13:23 +0900 Subject: [PATCH 11/11] build: downgrade yarn version for Circle CI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a85c196a..db023e05 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "engines": { "node": ">=10", - "yarn": "^1.21.1" + "yarn": "^1.17.3" }, "workspaces": { "packages": [