simplify a bit further

highlightjs · Jul 2, 2021 · be3f395 · be3f395
1 parent 101e0b4
commit be3f395
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/tools/build_browser.js b/tools/build_browser.js
@@ -201,7 +201,7 @@ async function buildCore(name, languages, options) {
   const header = buildHeader();
   let relativePath = "";
   const input = {
-    ...(options.format === "es" ? config.rollup.node.input : config.rollup.browser_iife.input),
+    ...config.rollup.core.input,
     input: `src/stub.js`
   };
   input.plugins = [

diff --git a/tools/build_config.js b/tools/build_config.js
@@ -9,13 +9,13 @@ module.exports = {
     level: 2
   },
   rollup: {
-    node: {
-      output: { format: "cjs", strict: false, exports: "auto" },
+    core: {
       input: {
         plugins: [
           cjsPlugin(),
           jsonPlugin(),
           nodeResolve(),
+          // TODO: remove with version 12
           {
             transform: (x) => {
               if (/var module/.exec(x)) {
@@ -27,6 +27,9 @@ module.exports = {
         ]
       }
     },
+    node: {
+      output: { format: "cjs", strict: false, exports: "auto" }
+    },
     browser_iife: {
       input: {
         plugins: [
@@ -41,15 +44,6 @@ module.exports = {
         footer: "if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }",
         interop: false
       }
-    },
-    browser: {
-      input: {
-        plugins: []
-      },
-      output: {
-        format: "es",
-        interop: false
-      }
     }
   },
   terser: {

diff --git a/tools/build_node.js b/tools/build_node.js
@@ -45,7 +45,7 @@ async function buildNodeLanguage(language, options) {
   const ES_STUB = `${EMIT}
     import lang from './%%%%.js';
     export default lang;`;
-  const input = { ...config.rollup.node.input, input: language.path };
+  const input = { ...config.rollup.core.input, input: language.path };
   const output = { ...config.rollup.node.output, file: `${process.env.BUILD_DIR}/lib/languages/${language.name}.js` };
   await rollupWrite(input, output);
   await fs.writeFile(`${process.env.BUILD_DIR}/lib/languages/${language.name}.js.js`,
@@ -63,7 +63,7 @@ async function buildNodeLanguage(language, options) {
 const EXCLUDE = ["join"];
 
 async function buildESMUtils() {
-  const input = { ...config.rollup.node.input, input: `src/lib/regex.js` };
+  const input = { ...config.rollup.core.input, input: `src/lib/regex.js` };
   input.plugins = [...input.plugins, {
     transform: (code) => {
       EXCLUDE.forEach((fn) => {
@@ -80,7 +80,7 @@ async function buildESMUtils() {
 }
 
 async function buildNodeHighlightJS(options) {
-  const input = { ...config.rollup.node.input, input: `src/highlight.js` };
+  const input = { ...config.rollup.core.input, input: `src/highlight.js` };
   const output = { ...config.rollup.node.output, file: `${process.env.BUILD_DIR}/lib/core.js` };
   await rollupWrite(input, output);
   if (options.esm) {