Improve Rollup setup

package.json

@@ -75,10 +75,9 @@
     "yaml-unist-parser": "1.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.2.0",
     "@babel/core": "7.2.0",
-    "@babel/preset-env": "7.2.0",
-    "babel-loader": "8.0.4",
+    "@babel/preset-env": "7.4.5",
+    "babel-loader": "8.0.6",
     "benchmark": "2.1.4",
     "builtin-modules": "2.0.0",
     "codecov": "codecov/codecov-node#e427d900309adb50746a39a50aa7d80071a5ddd0",

scripts/build/bundler.js

@@ -15,6 +15,7 @@ const babel = require("rollup-plugin-babel");
 const nativeShims = require("./rollup-plugins/native-shims");
 const executable = require("./rollup-plugins/executable");
 const evaluate = require("./rollup-plugins/evaluate");
+const externals = require("./rollup-plugins/externals");
 
 const EXTERNALS = [
   "assert",
@@ -122,13 +123,14 @@ function getRollupConfig(bundle) {
         bundle.commonjs
       )
     ),
+    externals(bundle.externals),
     bundle.target === "universal" && nodeGlobals(),
     babelConfig && babel(babelConfig),
     bundle.type === "plugin" && terser()
   ].filter(Boolean);
 
   if (bundle.target === "node") {
-    config.external = EXTERNALS.concat(bundle.external);
+    config.external = EXTERNALS;
   }
 
   return config;

scripts/build/config.js

@@ -12,6 +12,7 @@ const PROJECT_ROOT = path.resolve(__dirname, "../..");
  * @property {'core' | 'plugin'} type - it's a plugin bundle or core part of prettier
  * @property {'rollup' | 'webpack'} [bundler='rollup'] - define which bundler to use
  * @property {CommonJSConfig} [commonjs={}] - options for `rollup-plugin-commonjs`
+ * @property {string[]} externals - array of paths that should not be included in the final bundle
  * @property {Object.<string, string>} replace - map of strings to replace when processing the bundle
  * @property {string[]} babelPlugins - babel plugins
 
@@ -108,6 +109,7 @@ const coreBundles = [
     input: "index.js",
     type: "core",
     target: "node",
+    externals: [path.resolve("src/common/third-party.js")],
     replace: {
       // from @iarna/toml/parse-string
       "eval(\"require('util').inspect\")": "require('util').inspect"
@@ -130,7 +132,8 @@ const coreBundles = [
     input: "bin/prettier.js",
     type: "core",
     output: "bin-prettier.js",
-    target: "node"
+    target: "node",
+    externals: [path.resolve("src/common/third-party.js")]
   },
   {
     input: "src/common/third-party.js",

scripts/build/rollup-plugins/externals.js

@@ -0,0 +1,20 @@
+"use strict";
+
+const path = require("path");
+
+module.exports = function(modules = []) {
+  const requires = modules.reduce((obj, mod) => {
+    obj[mod] = path.basename(mod).replace(/\.js$/, "");
+    return obj;
+  }, {});
+
+  return {
+    name: "externals",
+
+    load(importee) {
+      if (requires[importee]) {
+        return `export default eval("require")("./${requires[importee]}");`;
+      }
+    }
+  };
+};

src/cli/util.js

@@ -17,7 +17,7 @@ const constant = require("./constant");
 const coreOptions = require("../main/core-options");
 const optionsModule = require("../main/options");
 const optionsNormalizer = require("../main/options-normalizer");
-const thirdParty = eval("require")("../common/third-party");
+const thirdParty = require("../common/third-party");
 const arrayify = require("../utils/arrayify");
 const isTTY = require("../utils/is-tty");
 

src/common/load-plugins.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const globby = require("globby");
 const path = require("path");
 const resolve = require("resolve");
-const thirdParty = eval("require")("./third-party");
+const thirdParty = require("./third-party");
 const internalPlugins = require("./internal-plugins");
 const partition = require("../utils/partition");
 

src/common/third-party.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.cosmiconfig = require("cosmiconfig");
-exports.findParentDir = require("find-parent-dir").sync;
-exports.getStream = require("get-stream");
-exports.isCI = () => require("is-ci");
+module.exports = {
+  cosmiconfig: require("cosmiconfig"),
+  findParentDir: require("find-parent-dir").sync,
+  getStream: require("get-stream"),
+  isCI: () => require("is-ci")
+};

src/config/resolve-config.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const thirdParty = eval("require")("../common/third-party");
+const thirdParty = require("../common/third-party");
 const minimatch = require("minimatch");
 const resolve = require("resolve");
 const path = require("path");

src/doc/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.builders = require("./doc-builders");
-exports.printer = require("./doc-printer");
-exports.utils = require("./doc-utils");
-exports.debug = require("./doc-debug");
+module.exports = {
+  builders: require("./doc-builders"),
+  printer: require("./doc-printer"),
+  utils: require("./doc-utils"),
+  debug: require("./doc-debug")
+};

src/utils/is-tty.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const thirdParty = eval("require")("../common/third-party");
+const thirdParty = require("../common/third-party");
 
 // Some CI pipelines incorrectly report process.stdout.isTTY status,
 // which causes unwanted lines in the output. An additional check for isCI() helps.