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.0",
+  "version": "2.8.0",
   "description": "Template for creating Distill articles.",
   "main": "dist/template.v2.js",
   "bin": {
@@ -16,7 +16,7 @@
     "serve": "http-server",
     "test": "mocha",
     "lint": "eslint",
-    "build": "rollup -c rollup.config.js",
+    "build": "rollup -c rollup.config.prod.js",
     "prepare": "npm run build"
   },
   "repository": {
@@ -24,40 +24,38 @@
     "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",
-    "marked": "^0.8.0",
+    "marked": "^0.8.2",
     "mocha": "^5.2.0",
-    "prismjs": "^1.19.0",
+    "prismjs": "^1.20.0",
-    "rollup": "^0.50.1",
+    "rollup": "^2.7.3",
-    "rollup-plugin-babili": "^3.1.1",
+    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-buble": "^0.15.0",
-    "rollup-plugin-commonjs": "^7.0.0",
     "rollup-plugin-copy": "^0.2.3",
     "rollup-plugin-grapher": "^0.2.0",
     "rollup-plugin-gzip": "^1.4.0",
     "rollup-plugin-node-resolve": "^2.0.0",
-    "rollup-plugin-serve": "^0.4.2",
+    "rollup-plugin-serve": "^1.0.1",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-uglify": "^1.0.1",
-    "rollup-watch": "^2.5.0",
+    "rollup-watch": "^4.3.1",
     "should": "^13.2.3",
-    "source-map-support": "^0.5.16",
+    "source-map-support": "^0.5.19"
-    "webpack": "^2.2.1"
   },
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^1.3.3",
     "assert": "^1.5.0",
     "commander": "^2.20.3",
-    "d3-array": "^1.2.4",
+    "d3-array": "^2.4.0",
     "d3-drag": "^1.2.5",
-    "d3-scale": "^1.0.7",
+    "d3-scale": "^3.2.1",
     "d3-selection": "^1.4.1",
     "d3-time-format": "^2.2.3",
     "escape-html": "^1.0.3",

rollup.config.common.js

@@ -0,0 +1,72 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import resolve from "rollup-plugin-node-resolve";
+import string from "rollup-plugin-string";
+import commonjs from "rollup-plugin-commonjs";
+import babel from '@rollup/plugin-babel';
+
+// uncomment to show dependencies [1/2]
+// import rollupGrapher from 'rollup-plugin-grapher'
+
+const defaultConfig = {
+  plugins: [
+    resolve({
+      jsnext: true,
+      browser: true
+    }),
+    commonjs(),
+    string({
+      include: ["**/*.txt", "**/*.svg", "**/*.html", "**/*.css", "**/*.base64"]
+    })
+  ]
+};
+
+const componentsConfig = {
+  input: "src/components.js",
+  output: [{ format: "umd", name: "dl", file: "dist/template.v2.js", sourcemap: true }],
+  plugins: [
+    babel({
+      "babelHelpers": "bundled",
+      "targets": "defaults"
+    })
+  ]
+};
+
+const transformsConfig = {
+  input: "src/transforms.js",
+  output: [
+    {
+      format: "umd",
+      name: "dl",
+      file: "dist/transforms.v2.js",
+      globals: { fs: "fs" },
+      sourcemap: true,
+    }
+  ],
+  external: ["fs"],
+  plugins: [
+    babel({
+      "babelHelpers": "bundled",
+      "targets": {
+        "node": "current"
+      }
+    })
+  ]
+};
+
+Object.assign(componentsConfig, defaultConfig);
+Object.assign(transformsConfig, defaultConfig);
+
+export default [componentsConfig, transformsConfig];

rollup.config.dev.js

@@ -12,72 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import resolve from "rollup-plugin-node-resolve";
+import configs from "./rollup.config.common";
-import string from "rollup-plugin-string";
-import commonjs from "rollup-plugin-commonjs";
-import buble from "rollup-plugin-buble";
 import serve from "rollup-plugin-serve";
 
-// uncomment to show dependencies [1/2]
+const [componentsConfig, transformsConfig] = configs;
-// import rollupGrapher from 'rollup-plugin-grapher'
 
-const componentsConfig = {
+componentsConfig.plugins.push(
-  input: "src/components.js",
+  serve({
-  output: [{ format: "umd", name: "dl", file: "dist/template.v2.js" }]
+    open: true,
-};
+    openPage: "/index.html",
-
+    contentBase: ["dist", "examples"],
-const transformsConfig = {
+    headers: {
-  input: "src/transforms.js",
+      "Access-Control-Allow-Origin": "*"
-  output: [
+    },
-    {
+    port: 8088
-      format: "umd",
-      name: "dl",
-      file: "dist/transforms.v2.js",
-      globals: { fs: "fs" }
-    }
-  ],
-  external: ["fs"]
-};
-
-const defaultConfig = {
-  sourcemap: true,
-  plugins: [
-    resolve({
-      jsnext: true,
-      browser: true
-    }),
-    commonjs(),
-    string({
-      include: ["**/*.txt", "**/*.svg", "**/*.html", "**/*.css", "**/*.base64"]
-    }),
-    serve({
-      open: true,
-      openPage: "/examples/index.html",
-      contentBase: ["dist", "examples"],
-      headers: {
-        "Access-Control-Allow-Origin": "*"
-      },
-      port: 8088
-    })
-  ]
-};
-
-Object.assign(componentsConfig, defaultConfig);
-Object.assign(transformsConfig, defaultConfig);
-
-// transpile transforms so the node render script works…
-transformsConfig.plugins.push(
-  buble({
-    target: { node: 6 }
   })
 );
 
-// uncomment to show dependencies [2/2]
-// transformsConfig.plugins.push(
-//   rollupGrapher({
-//     dest: '/dev/null',
-//     verbose: true
-//   })
-// );
-
 export default [componentsConfig, transformsConfig];

rollup.config.prod.js

@@ -12,24 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import configs from "./rollup.config.dev";
+import configs from "./rollup.config.common";
-import babili from "rollup-plugin-babili";
 
-function isNotServePlugin(plugin) {
+export default configs;
-  return plugin.name !== "serve";
-}
-
-for (const config of configs) {
-  config.plugins = config.plugins.filter(isNotServePlugin);
-}
-
-const [componentsConfig, transformsConfig] = configs;
-
-componentsConfig.plugins.push(
-  babili({
-    comments: false, // means: *remove* comments
-    sourceMap: true
-  })
-);
-
-export default [componentsConfig, transformsConfig];

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) {