From a6eb6e75b0bea09ddcb127689cde77b4e75f86f2 Mon Sep 17 00:00:00 2001
From: Cam Sloan <cameron@sloan.ca>
Date: Mon, 9 Nov 2020 09:10:42 -0500
Subject: [PATCH 1/4] Update examples to reference preact/compat instead of
 preact (#750)

aliasing react=preact doesn't work because the main preact package actually doesn't contain any default exports. So the more likely example would be to reference preact/compat.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b8161c2..03cdeb5c 100644
--- a/README.md
+++ b/README.md
@@ -248,7 +248,7 @@ Options
 Examples
 	$ microbundle build --globals react=React,jquery=$
 	$ microbundle build --define API_KEY=1234
-	$ microbundle build --alias react=preact
+	$ microbundle build --alias react=preact/compat
 	$ microbundle watch --no-sourcemap # don't generate sourcemaps
 	$ microbundle build --tsconfig tsconfig.build.json
 ```

From 360511bcfdd7fa70e275e14c1e20861336748d06 Mon Sep 17 00:00:00 2001
From: Jason Miller <developit@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:20:29 -0500
Subject: [PATCH 2/4] Update the readme to recommend package exports (#749)

* Update the readme to recommend package exports

* Update README.md

* Update README.md

* Update README.md
---
 README.md | 66 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 03cdeb5c..d1bc5855 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@
   "name": "foo",                   // your package name
   "source": "src/foo.js",          // your source code
   "main": "dist/foo.js",           // where to generate the CommonJS/Node bundle
+  "exports": "dist/foo.modern.js", // path to the modern output (see below)
   "module": "dist/foo.module.js",  // where to generate the ESM bundle
   "unpkg": "dist/foo.umd.js",      // where to generate the UMD bundle (also aliased as "umd:main")
   "scripts": {
@@ -58,14 +59,14 @@ Microbundle produces <code title="ECMAScript Modules (import / export)">esm</cod
 
 ## 🤖 Modern Mode <a name="modern"></a>
 
-In addition to the above formats, Microbundle also outputs a `modern` bundle specially designed to work in _all modern browsers_. This bundle preserves most modern JS features when compiling your code, but ensures the result runs in 90% of web browsers without needing to be transpiled. Specifically, it uses [preset-modules](https://github.com/babel/preset-modules) to target the set of browsers that support `<script type="module">` - that allows syntax like async/await, tagged templates, arrow functions, destructured and rest parameters, etc. The result is generally smaller and faster to execute than the `esm` bundle:
+In addition to the above formats, Microbundle also outputs a `modern` bundle specially designed to work in _all modern browsers_. This bundle preserves most modern JS features when compiling your code, but ensures the result runs in 95% of web browsers without needing to be transpiled. Specifically, it uses [preset-modules](https://github.com/babel/preset-modules) to target the set of browsers that support `<script type="module">` - that allows syntax like async/await, tagged templates, arrow functions, destructured and rest parameters, etc. The result is generally smaller and faster to execute than the `esm` bundle:
 
 ```js
 // Our source, "src/make-dom.js":
 export default async function makeDom(tag, props, children) {
-	let el = document.createElement(tag);
-	el.append(...(await children));
-	return Object.assign(el, props);
+  let el = document.createElement(tag);
+  el.append(...await children);
+  return Object.assign(el, props);
 }
 ```
 
@@ -73,16 +74,16 @@ Compiling the above using Microbundle produces the following `modern` and `esm`
 
 <table>
 <thead><tr>
-  <th align="left"><code>make-dom.modern.js</code> <sup>(123b)</sup></th>
-  <th align="left"><code>make-dom.module.js</code> <sup>(166b)</sup></th>
+  <th align="left"><code>make-dom.modern.js</code> <sup>(117b)</sup></th>
+  <th align="left"><code>make-dom.module.js</code> <sup>(194b)</sup></th>
 </tr></thead>
 <tbody><tr valign="top"><td>
 
 ```js
 export default async function(e, t, a) {
-	let n = document.createElement(e);
-	n.append(...(await a));
-	return Object.assign(n, t);
+  let n = document.createElement(e);
+  n.append(...await a);
+  return Object.assign(n, t);
 }
 ```
 
@@ -90,35 +91,48 @@ export default async function(e, t, a) {
 
 ```js
 export default function(e, t, r) {
-	try {
-		var n = document.createElement(e);
-		return Promise.resolve(r).then(function(e) {
-			n.append.apply(n, e);
-			return Object.assign(n, t);
-		});
-	} catch (e) {
-		return Promise.reject(e);
-	}
+  try {
+    var n = document.createElement(e);
+    return Promise.resolve(r).then(function(e) {
+      return n.append.apply(n, e),
+        Object.assign(n, t);
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
 }
 ```
 
 </td></tbody></table>
 
-This is enabled by default - all you have to do is add the field to your `package.json`.
-
-<details><summary>💁‍♂️ <em>How to point to modern code in a package.json is <a href="https://twitter.com/_developit/status/1263174528974364675">being discussed</a>. You might use the "module" field.</em></summary>
+**This is enabled by default.** All you have to do is add an `"exports"` field to your `package.json`:
 
-```js
+```jsonc
 {
-  "main": "dist/foo.umd.js",              // legacy UMD bundle (for Node & CDN use)
-  "module": "dist/foo.modern.module.js",  // modern ES2017 bundle
+  "main": "./dist/foo.umd.js",       // legacy UMD output (for Node & CDN use)
+  "module": "./dist/foo.module.js",  // legacy ES Modules output (for bundlers)
+  "exports": "./dist/foo.modern.js", // modern ES2017 output
   "scripts": {
-    "build": "microbundle src/foo.js -f modern,umd"
+    "build": "microbundle src/foo.js"
   }
 }
 ```
 
-</details>
+The `"exports"` field can also be an object for packages with multiple entry modules:
+
+```jsonc
+{
+  "name": "foo",
+  "exports": {
+    ".": "./dist/foo.modern.js",       // import "foo" (the default)
+    "./lite": "./dist/lite.modern.js", // import "foo/lite"
+    "./full": "./dist/full.modern.js"  // import "foo"
+  },
+  "scripts": {
+    "build": "microbundle src/*.js"    // build foo.js, lite.js and full.js
+  }
+}
+```
 
 ## 📦 Usage & Configuration <a name="usage"></a>
 

From 8142704399efe6b4f34219c711a3932431781b36 Mon Sep 17 00:00:00 2001
From: Gino Zhang <whitetrefoil@gmail.com>
Date: Thu, 17 Dec 2020 23:27:18 +0800
Subject: [PATCH 3/4] Use user's typescript first, fallback to bundled (#741)

* use process.cwd()'s typescript

* use process.argv[1]'s instead of process.cwd()'s typescript

* Handle situation that argv1 is empty

* changeset

* Require "typescript" from cwd i.o. argv1
---
 .changeset/silver-guests-brake.md | 5 +++++
 package-lock.json                 | 9 ++++++++-
 package.json                      | 1 +
 src/index.js                      | 6 +++++-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/silver-guests-brake.md

diff --git a/.changeset/silver-guests-brake.md b/.changeset/silver-guests-brake.md
new file mode 100644
index 00000000..9c36939e
--- /dev/null
+++ b/.changeset/silver-guests-brake.md
@@ -0,0 +1,5 @@
+---
+'microbundle': minor
+---
+
+Use user's typescript first, fallback to bundled
diff --git a/package-lock.json b/package-lock.json
index 29ff7d3c..e193485a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "microbundle",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -9228,6 +9228,13 @@
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+        }
       }
     },
     "import-from": {
diff --git a/package.json b/package.json
index 5d4abf3b..1030c659 100644
--- a/package.json
+++ b/package.json
@@ -104,6 +104,7 @@
 		"lodash.merge": "^4.6.2",
 		"module-details-from-path": "^1.0.3",
 		"pretty-bytes": "^5.3.0",
+		"resolve-from": "^4.0.0",
 		"rollup": "^1.32.1",
 		"rollup-plugin-bundle-size": "^1.0.1",
 		"rollup-plugin-es3": "^1.1.0",
diff --git a/src/index.js b/src/index.js
index 765bd0eb..599e2a06 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,6 +9,7 @@ import autoprefixer from 'autoprefixer';
 import cssnano from 'cssnano';
 import { rollup, watch } from 'rollup';
 import builtinModules from 'builtin-modules';
+import resolveFrom from 'resolve-from';
 import commonjs from '@rollup/plugin-commonjs';
 import babel from '@rollup/plugin-babel';
 import customBabel from './lib/babel-custom';
@@ -486,7 +487,10 @@ function createConfig(options, entry, format, writeMeta) {
 					},
 					useTypescript &&
 						typescript({
-							typescript: require('typescript'),
+							typescript: require(resolveFrom.silent(
+								options.cwd,
+								'typescript',
+							) || 'typescript'),
 							cacheRoot: `./node_modules/.cache/.rts2_cache_${format}`,
 							useTsconfigDeclarationDir: true,
 							tsconfigDefaults: {

From 8b60fc86cbc493e23230a58cd0c99e2e0c675974 Mon Sep 17 00:00:00 2001
From: Cody Olsen <stipsan@gmail.com>
Date: Thu, 17 Dec 2020 17:00:53 +0100
Subject: [PATCH 4/4] fix(CSS): sourcemap support for PostCSS files (#754)

* fix(CSS): sourcemap support

* Create hip-spies-happen.md
---
 .changeset/hip-spies-happen.md        | 5 +++++
 src/index.js                          | 1 +
 test/__snapshots__/index.test.js.snap | 8 ++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/hip-spies-happen.md

diff --git a/.changeset/hip-spies-happen.md b/.changeset/hip-spies-happen.md
new file mode 100644
index 00000000..af802a4b
--- /dev/null
+++ b/.changeset/hip-spies-happen.md
@@ -0,0 +1,5 @@
+---
+'microbundle': patch
+---
+
+Enable sourcemaps for CSS
diff --git a/src/index.js b/src/index.js
index 599e2a06..a94cf4d9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -457,6 +457,7 @@ function createConfig(options, entry, format, writeMeta) {
 						// only write out CSS for the first bundle (avoids pointless extra files):
 						inject: false,
 						extract: !!writeMeta,
+						sourceMap: options.sourcemap,
 					}),
 					moduleAliases.length > 0 &&
 						alias({
diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
index f7c747f6..07570370 100644
--- a/test/__snapshots__/index.test.js.snap
+++ b/test/__snapshots__/index.test.js.snap
@@ -433,6 +433,7 @@ Directory tree:
 basic-css
   dist
     basic-css.css
+    basic-css.css.map
     basic-css.esm.js
     basic-css.esm.js.map
     basic-css.js
@@ -454,9 +455,12 @@ Build \\"basicCss\\" to dist:
 134 B: basic-css.umd.js.br"
 `;
 
-exports[`fixtures build basic-css with microbundle 2`] = `7`;
+exports[`fixtures build basic-css with microbundle 2`] = `8`;
 
-exports[`fixtures build basic-css with microbundle 3`] = `"._rHGVB{display:flex;color:red;background:#00f}"`;
+exports[`fixtures build basic-css with microbundle 3`] = `
+"._rHGVB{display:flex;color:red;background:#00f}
+/*# sourceMappingURL=basic-css.css.map */"
+`;
 
 exports[`fixtures build basic-css with microbundle 4`] = `
 "export default function(){var e=document.createElement(\\"div\\");return e.className=\\"testing\\",e}