facebook · darthtrevino · Nov 25, 2019 · Nov 25, 2019 · Nov 25, 2019 · Nov 25, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -254,6 +254,19 @@ jobs:
             RELEASE_CHANNEL: stable
           command: yarn test-build --maxWorkers=2
 
+  test_package_structure:
+    docker: *docker
+    environment: *environment
+    steps:
+      - checkout
+      - attach_workspace: *attach_workspace
+      - *restore_yarn_cache
+      - *run_yarn
+      - run:
+          environment:
+            RELEASE_CHANNEL: stable
+          command: yarn test-package-structure
+
   test_build_experimental:
     docker: *docker
     environment: *environment
@@ -371,6 +384,9 @@ workflows:
       - test_build:
           requires:
             - build
+      - test_package_structure:
+          requires:
+            - build
       - test_build_prod:
           requires:
             - build

diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ scripts/flow/*/.flowconfig
 .grunt
 _SpecRunner.html
 __benchmarks__
-build/
+/build
 remote-repo/
 coverage/
 .module-cache
@@ -32,4 +32,4 @@ packages/react-devtools-extensions/firefox/*.xpi
 packages/react-devtools-extensions/firefox/*.pem
 packages/react-devtools-extensions/shared/build
 packages/react-devtools-inline/dist
-packages/react-devtools-shell/dist
+packages/react-devtools-shell/dist
diff --git a/package.json b/package.json
@@ -76,13 +76,14 @@
     "random-seed": "^0.3.0",
     "react-lifecycles-compat": "^3.0.2",
     "rimraf": "^2.6.1",
-    "rollup": "^0.52.1",
-    "rollup-plugin-babel": "^4.0.1",
-    "rollup-plugin-commonjs": "^8.2.6",
-    "rollup-plugin-node-resolve": "^2.1.1",
-    "rollup-plugin-prettier": "^0.3.0",
-    "rollup-plugin-replace": "^2.0.0",
-    "rollup-plugin-strip-banner": "^0.2.0",
+    "rollup": "^1.27.5",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-prettier": "^0.6.0",
+    "rollup-plugin-replace": "^2.2.0",
+    "rollup-plugin-strip-banner": "^1.0.0",
+    "rollup-plugin-terser": "^5.1.2",
     "semver": "^5.5.0",
     "targz": "^1.0.1",
     "through2": "^2.0.0",
@@ -97,7 +98,7 @@
     "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"
   },
   "scripts": {
-    "build": "node ./scripts/rollup/build.js",
+    "build": "node ./scripts/rollup/build",
     "linc": "node ./scripts/tasks/linc.js",
     "lint": "node ./scripts/tasks/eslint.js",
     "lint-build": "node ./scripts/rollup/validate/index.js",
@@ -112,6 +113,7 @@
     "test-build": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.build.js",
     "test-build-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.build.js",
     "test-build-devtools": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.build-devtools.js",
+    "test-package-structure": "node ./scripts/tasks/package-check.js",
     "debug-test-build-devtools": "cross-env NODE_ENV=development node --inspect-brk node_modules/.bin/jest --config ./scripts/jest/config.build-devtools.js",
     "test-dom-fixture": "cd fixtures/dom && yarn && yarn prestart && yarn test",
     "flow": "node ./scripts/tasks/flow.js",

diff --git a/packages/babel-plugin-react-jsx/package.json b/packages/babel-plugin-react-jsx/package.json
@@ -6,13 +6,14 @@
   "main": "index.js",
   "dependencies": {
     "esutils": "^2.0.0"
-    
+
   },
   "files": [
     "README.md",
     "index.js",
     "build-info.json",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ]
 }
diff --git a/packages/create-subscription/package.json b/packages/create-subscription/package.json
@@ -2,6 +2,8 @@
   "name": "create-subscription",
   "description": "utility for subscribing to external data sources inside React components",
   "version": "16.12.0",
+  "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -12,7 +14,9 @@
     "README.md",
     "build-info.json",
     "index.js",
-    "cjs/"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ],
   "peerDependencies": {
     "react": "^16.3.0"

diff --git a/packages/eslint-plugin-react-hooks/package.json b/packages/eslint-plugin-react-hooks/package.json
@@ -7,12 +7,16 @@
     "url": "https://github.com/facebook/react.git",
     "directory": "packages/eslint-plugin-react-hooks"
   },
+  "main": "index.js",
+  "module": "index.mjs",
   "files": [
     "LICENSE",
     "README.md",
     "build-info.json",
     "index.js",
-    "cjs"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ],
   "keywords": [
     "eslint",

diff --git a/packages/jest-mock-scheduler/package.json b/packages/jest-mock-scheduler/package.json
@@ -4,6 +4,7 @@
   "version": "0.1.0",
   "description": "Jest matchers and utilities for testing the scheduler package.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
@@ -27,6 +28,8 @@
     "README.md",
     "build-info.json",
     "index.js",
-    "cjs/"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ]
 }
diff --git a/packages/jest-react/package.json b/packages/jest-react/package.json
@@ -3,6 +3,7 @@
   "version": "0.10.0",
   "description": "Jest matchers and utilities for testing React components.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -28,6 +29,8 @@
     "README.md",
     "build-info.json",
     "index.js",
-    "cjs/"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ]
 }
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
@@ -3,6 +3,7 @@
   "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
   "version": "16.12.0",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -37,7 +38,9 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "cjs/",
+    "esm/",
     "umd/",
     "Circle.js",
     "Rectangle.js",

diff --git a/packages/react-cache/package.json b/packages/react-cache/package.json
@@ -3,6 +3,8 @@
   "name": "react-cache",
   "description": "A basic cache for React applications",
   "version": "2.0.0-alpha.0",
+  "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
@@ -13,8 +15,10 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
   "peerDependencies": {
     "react": "^16.3.0-alpha.1"

diff --git a/packages/react-debug-tools/package.json b/packages/react-debug-tools/package.json
@@ -14,9 +14,12 @@
     "README.md",
     "build-info.json",
     "index.js",
-    "cjs/"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ],
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",

diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
@@ -3,6 +3,7 @@
   "version": "16.12.0",
   "description": "React package for working with the DOM.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -30,6 +31,7 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "profiling.js",
     "server.js",
     "server.browser.js",
@@ -41,7 +43,8 @@
     "unstable-fizz.node.js",
     "unstable-native-dependencies.js",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
   "browser": {
     "./server.js": "./server.browser.js",

diff --git a/packages/react-flight-dom-webpack/package.json b/packages/react-flight-dom-webpack/package.json
@@ -13,16 +13,19 @@
     "LICENSE",
     "README.md",
     "index.js",
+    "index.mjs",
     "server.js",
     "server.browser.js",
     "server.node.js",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
   "browser": {
     "./server.js": "./server.browser.js"
   },
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",

diff --git a/packages/react-flight/package.json b/packages/react-flight/package.json
@@ -13,7 +13,9 @@
     "LICENSE",
     "README.md",
     "index.js",
-    "cjs/"
+    "index.mjs",
+    "cjs/",
+    "esm/"
   ],
   "main": "index.js",
   "repository": {

diff --git a/packages/react-interactions/package.json b/packages/react-interactions/package.json
@@ -26,9 +26,9 @@
     "events/tap.js",
     "build-info.json",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
-  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",

diff --git a/packages/react-is/package.json b/packages/react-is/package.json
@@ -3,6 +3,7 @@
   "version": "16.12.0",
   "description": "Brand checking of React Elements.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -21,7 +22,9 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ]
 }
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "description": "React package for testing the Fiber, Fizz and Flight reconcilers.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
@@ -26,10 +27,12 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "persistent.js",
     "server.js",
     "flight-client.js",
     "flight-server.js",
-    "cjs/"
+    "cjs/",
+    "esm/"
   ]
 }
diff --git a/packages/react-refresh/package.json b/packages/react-refresh/package.json
@@ -15,9 +15,9 @@
     "runtime.js",
     "build-info.json",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
-  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",

diff --git a/packages/react-server/package.json b/packages/react-server/package.json
@@ -14,7 +14,8 @@
     "README.md",
     "index.js",
     "flight.js",
-    "cjs/"
+    "cjs/",
+    "esm/"
   ],
   "main": "index.js",
   "repository": {

diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
@@ -3,6 +3,7 @@
   "version": "16.12.0",
   "description": "React package for snapshot testing.",
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",
@@ -32,8 +33,10 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "shallow.js",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ]
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -13,10 +13,13 @@
     "README.md",
     "build-info.json",
     "index.js",
+    "index.mjs",
     "cjs/",
-    "umd/"
+    "umd/",
+    "esm/"
   ],
   "main": "index.js",
+  "module": "index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",