update test and typescript add in rollup and webpack

gregberge · Jul 23, 2018 · 934fef7 · 934fef7
1 parent 34a9724
commit 934fef7
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 5 deletions.
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
@@ -120,7 +120,7 @@ async function run() {
     }
   }
 
-  if(config.typescript) config.ext = "ts"
+  if (config.typescript && !config.ext) config.ext = 'ts'
 
   const command = program.outDir ? dirCommand : fileCommand
   await command(program, filenames, config)

diff --git a/packages/rollup/src/index.js b/packages/rollup/src/index.js
@@ -28,9 +28,13 @@ function svgrPlugin(options = {}) {
         body: [],
       }
 
-      const jsCode = await convert(load, options, {
-        rollup: { previousExport },
-      })
+      const jsCode = await convert(
+        load,
+        { ...options, typescript: false },
+        {
+          rollup: { previousExport },
+        },
+      )
 
       const pBabelTransform = async code =>
         new Promise((resolve, reject) => {

diff --git a/packages/webpack/src/__snapshots__/index.test.js.snap b/packages/webpack/src/__snapshots__/index.test.js.snap
@@ -51,3 +51,28 @@ var SvgComponent = function SvgComponent() {
 
 export default SvgComponent;"
 `;
+
+exports[`webpack loader should convert file with typescript 1`] = `
+"import React from 'react';
+
+var _ref =
+/*#__PURE__*/
+React.createElement(\\"svg\\", {
+  width: 88,
+  height: 88
+}, React.createElement(\\"g\\", {
+  stroke: \\"#063855\\",
+  strokeWidth: 2,
+  fill: \\"none\\",
+  fillRule: \\"evenodd\\",
+  strokeLinecap: \\"square\\"
+}, React.createElement(\\"path\\", {
+  d: \\"M51 37L37 51M51 51L37 37\\"
+})));
+
+var SvgComponent = function SvgComponent() {
+  return _ref;
+};
+
+export default SvgComponent;"
+`;
diff --git a/packages/webpack/src/index.js b/packages/webpack/src/index.js
@@ -42,7 +42,13 @@ function svgrLoader(source) {
     })
 
   readSvg()
-    .then(svg => convert(svg, options, { webpack: { previousExport } }))
+    .then(svg =>
+      convert(
+        svg,
+        { ...options, typescript: false },
+        { webpack: { previousExport } },
+      ),
+    )
     .then(jsCode => (babel ? pBabelTransform(jsCode) : jsCode))
     .then(result => callback(null, result))
     .catch(err => callback(err))

diff --git a/packages/webpack/src/index.test.js b/packages/webpack/src/index.test.js
@@ -82,4 +82,27 @@ describe('webpack loader', () => {
     },
     15000,
   )
+
+  it(
+    'should convert file with typescript',
+    async () => {
+      const source = await compile([
+        {
+          test: /\.svg$/, 
+          use: [
+            {
+              loader: path.resolve(__dirname, './index.js'),
+              options: {
+                expandProps: false,
+                typescript: true,
+              },
+            },
+          ],
+        },
+      ])
+
+      expect(source).toMatchSnapshot()
+    },
+    15000,
+  )
 })