Merge branch 'master' into fix/sucrase-aliased-imports

# By Tiger Oakes (2) and others
# Via GitHub
* master:
  feat(wasm): Switch to TypeScript & named exports (rollup#363)
  feat(node-resolve): Add default export (rollup#361)
  fix (sucrase): resolve directory imports (rollup#390)
  docs(typescript): update readme examples (rollup#391)

# Conflicts:
#	packages/sucrase/test/snapshots/test.js.md
#	packages/sucrase/test/snapshots/test.js.snap
#	packages/sucrase/test/test.js
#	pnpm-lock.yaml

Author: larrybotha

packages/node-resolve/src/index.js

@@ -29,7 +29,7 @@ const defaults = {
 };
 export const DEFAULTS = deepFreeze(deepMerge({}, defaults));
 
-export const nodeResolve = (opts = {}) => {
+export function nodeResolve(opts = {}) {
   const options = Object.assign({}, defaults, opts);
   const { customResolveOptions, extensions, jail } = options;
   const warnings = [];
@@ -258,4 +258,6 @@ export const nodeResolve = (opts = {}) => {
       return idToPackageInfo.get(id);
     }
   };
-};
+}
+
+export default nodeResolve;

packages/node-resolve/types/index.d.ts

@@ -8,7 +8,7 @@ export const DEFAULTS: {
   resolveOnly: [];
 };
 
-export interface Options {
+export interface RollupNodeResolveOptions {
   /**
    * If `true`, instructs the plugin to use the `"browser"` property in `package.json`
    * files to specify alternative files to load for bundling. This is useful when
@@ -88,4 +88,5 @@ export interface Options {
 /**
  * Locate modules using the Node resolution algorithm, for using third party modules in node_modules
  */
-export const nodeResolve: (options?: Options) => Plugin;
+export function nodeResolve(options?: RollupNodeResolveOptions): Plugin;
+export default nodeResolve;

packages/sucrase/src/index.js

@@ -14,9 +14,13 @@ module.exports = function sucrase(opts = {}) {
     resolveId(importee, importer) {
       if (importer && /^[./]/.test(importee)) {
         const resolved = path.resolve(importer ? path.dirname(importer) : process.cwd(), importee);
+        // resolve in the same order that TypeScript resolves modules
+        const resolvedFilename = [`${resolved}.ts`, `${resolved}/index.ts`].find((filename) =>
+          fs.existsSync(filename)
+        );
 
-        if (!fs.existsSync(resolved) && fs.existsSync(`${resolved}.ts`)) {
-          return `${resolved}.ts`;
+        if (resolvedFilename) {
+          return resolvedFilename;
         }
       }
     },

packages/sucrase/test/fixtures/typescript-resolve-directory/example-a/index.ts

@@ -0,0 +1 @@
+export default (a: number, b: number): number => a * b;

packages/sucrase/test/fixtures/typescript-resolve-directory/example-b.ts

@@ -0,0 +1 @@
+export default (c: number, d: number): number => c * d;

packages/sucrase/test/fixtures/typescript-resolve-directory/example-b/index.ts

@@ -0,0 +1 @@
+export default 'Should not be imported';

packages/sucrase/test/fixtures/typescript-resolve-directory/main.js

@@ -0,0 +1,5 @@
+import dirImport from './example-a';
+import fileImport from './example-b';
+
+t.snapshot(dirImport.toString());
+t.snapshot(fileImport.toString());

packages/sucrase/test/snapshots/test.js.md

@@ -10,26 +10,30 @@ Generated by [AVA](https://ava.li).
 
     '() => React.createElement(\'div\', { id: "foo", __self: undefined, __source: {fileName: _jsxFileName, lineNumber: 1}}, "hello world" )'
 
-## converts flow
+## converts jsx with custom jsxPragma
 
 > Snapshot 1
 
-    '(a, b) => a * b'
+    '() => FakeReactCreateElement(\'div\', { id: "foo", __self: undefined, __source: {fileName: _jsxFileName, lineNumber: 1}}, "hello world" )'
 
 ## converts typescript
 
 > Snapshot 1
 
     '(a, b) => a * b'
 
-## converts jsx with custom jsxPragma
+## converts typescript with aliases
 
 > Snapshot 1
 
-    '() => FakeReactCreateElement(\'div\', { id: "foo", __self: undefined, __source: {fileName: _jsxFileName, lineNumber: 1}}, "hello world" )'
+    '(a, b) => a * b'
 
-## converts typescript with aliases
+## resolves typescript directory imports
 
 > Snapshot 1
 
     '(a, b) => a * b'
+
+> Snapshot 2
+
+    '(c, d) => c * d'

packages/sucrase/test/snapshots/test.js.snap

@@ -72,5 +72,20 @@ test('converts typescript with aliases', async (t) => {
     ]
   });
   t.plan(1);
+
+  return testBundle(t, bundle);
+});
+
+test('resolves typescript directory imports', async (t) => {
+  const bundle = await rollup({
+    input: 'fixtures/typescript-resolve-directory/main.js',
+    plugins: [
+      sucrase({
+        transforms: ['typescript']
+      })
+    ]
+  });
+  t.plan(2);
+
   return testBundle(t, bundle);
 });