Merge pull request #106 from mlbileschi/mbileschi/allow-plaintext-brackets-bib

Remove brackets in bibtex entries that are used for plaintext rendering

package.json

@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.6.2",
+  "version": "2.8.0",
   "description": "Template for creating Distill articles.",
   "main": "dist/template.v2.js",
   "bin": {
@@ -24,11 +24,12 @@
     "type": "git"
   },
   "devDependencies": {
+    "@babel/core": "^7.9.0",
+    "@rollup/plugin-babel": "^5.0.0",
     "bibtex-parse-js": "^0.0.23",
     "chai": "^3.5.0",
     "eslint": "^4.19.1",
     "eslint-config-google": "^0.9.1",
-    "http-server": "^0.11.1",
     "js-yaml": "^3.13.1",
     "jsdom": "11.3.0",
     "jsdom-global": "3.0.2",
@@ -36,8 +37,6 @@
     "mocha": "^5.2.0",
     "prismjs": "^1.20.0",
     "rollup": "^2.7.3",
-    "rollup-plugin-babili": "^3.1.1",
-    "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^0.2.3",
     "rollup-plugin-grapher": "^0.2.0",
@@ -48,8 +47,7 @@
     "rollup-plugin-uglify": "^1.0.1",
     "rollup-watch": "^4.3.1",
     "should": "^13.2.3",
-    "source-map-support": "^0.5.19",
-    "webpack": "^2.2.1"
+    "source-map-support": "^0.5.19"
   },
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^1.3.3",

rollup.config.common.js

@@ -15,14 +15,12 @@
 import resolve from "rollup-plugin-node-resolve";
 import string from "rollup-plugin-string";
 import commonjs from "rollup-plugin-commonjs";
-import buble from "rollup-plugin-buble";
-import babili from "rollup-plugin-babili";
+import babel from '@rollup/plugin-babel';
 
 // uncomment to show dependencies [1/2]
 // import rollupGrapher from 'rollup-plugin-grapher'
 
 const defaultConfig = {
-  sourcemap: true,
   plugins: [
     resolve({
       jsnext: true,
@@ -37,7 +35,13 @@ const defaultConfig = {
 
 const componentsConfig = {
   input: "src/components.js",
-  output: [{ format: "umd", name: "dl", file: "dist/template.v2.js" }]
+  output: [{ format: "umd", name: "dl", file: "dist/template.v2.js", sourcemap: true }],
+  plugins: [
+    babel({
+      "babelHelpers": "bundled",
+      "targets": "defaults"
+    })
+  ]
 };
 
 const transformsConfig = {
@@ -47,35 +51,22 @@ const transformsConfig = {
       format: "umd",
       name: "dl",
       file: "dist/transforms.v2.js",
-      globals: { fs: "fs" }
+      globals: { fs: "fs" },
+      sourcemap: true,
     }
   ],
-  external: ["fs"]
+  external: ["fs"],
+  plugins: [
+    babel({
+      "babelHelpers": "bundled",
+      "targets": {
+        "node": "current"
+      }
+    })
+  ]
 };
 
 Object.assign(componentsConfig, defaultConfig);
 Object.assign(transformsConfig, defaultConfig);
 
-// transpile transforms so the node render script works…
-transformsConfig.plugins.push(
-  buble({
-    target: { node: 6 }
-  })
-);
-
-componentsConfig.plugins.push(
-  babili({
-    comments: false, // means: *remove* comments
-    sourceMap: true
-  })
-);
-
-// uncomment to show dependencies [2/2]
-// transformsConfig.plugins.push(
-//   rollupGrapher({
-//     dest: '/dev/null',
-//     verbose: true
-//   })
-// );
-
 export default [componentsConfig, transformsConfig];

rollup.config.dev.js

@@ -13,16 +13,11 @@
 // limitations under the License.
 
 import configs from "./rollup.config.common";
-import babili from "rollup-plugin-babili";
 import serve from "rollup-plugin-serve";
 
 const [componentsConfig, transformsConfig] = configs;
 
 componentsConfig.plugins.push(
-  babili({
-    comments: false, // means: *remove* comments
-    sourceMap: true
-  }),
   serve({
     open: true,
     openPage: "/index.html",

src/helpers/bibtex.js

@@ -18,7 +18,8 @@ function normalizeTag(string) {
   return string
     .replace(/[\t\n ]+/g, ' ')
     .replace(/{\\["^`.'acu~Hvs]( )?([a-zA-Z])}/g, (full, x, char) => char)
-    .replace(/{\\([a-zA-Z])}/g, (full, char) => char);
+    .replace(/{\\([a-zA-Z])}/g, (full, char) => char)
+    .replace(/[{}]/gi,'');  // Replace curly braces forcing plaintext in latex.
 }
 
 export function parseBibtex(bibtex) {