Merge branch 'feature/allow_dyn_import_in_jest_#1075' into develop

LinusBorg · LinusBorg · commit a37bcbb8d045 · 2017-11-16T22:59:59.000+01:00
diff --git a/template/.babelrc b/template/.babelrc
@@ -9,7 +9,8 @@
   "env": {
     "test": {
       "presets": ["env", "stage-2"]{{#if_eq runner "karma"}},
-      "plugins": ["istanbul"]{{/if_eq}}
+      "plugins": ["istanbul"]{{/if_eq}}{{#if_eq runner "jest"}},
+      "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"]{{/if_eq}}
     }
   }{{/if_or}}
 }
diff --git a/template/package.json b/template/package.json
@@ -67,6 +67,8 @@
     "webpack-bundle-analyzer": "^2.9.0",
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "jest": "^21.2.0",
     "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`"env": {`
`10`	`10`	`"test": {`
`11`	`11`	`"presets": ["env", "stage-2"]{{#if_eq runner "karma"}},`
`12`		`- "plugins": ["istanbul"]{{/if_eq}}`
	`12`	`+ "plugins": ["istanbul"]{{/if_eq}}{{#if_eq runner "jest"}},`
	`13`	`+ "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"]{{/if_eq}}`
`13`	`14`	`}`
`14`	`15`	`}{{/if_or}}`
`15`	`16`	`}`