Skip to content

Commit

Permalink
Refactor. Simplify build & dependnecies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tnajdek
tnajdek committed Aug 31, 2021
1 parent 30b09e4 commit e2803f6
Show file tree
Hide file tree
Showing 7 changed files with 1,511 additions and 1,332 deletions.
4 changes: 0 additions & 4 deletions babel.config.cjs
View file
Expand Up @@ -7,10 +7,6 @@ const presets = [
];

const plugins = [
["@babel/plugin-proposal-decorators", { "legacy": true }],
["@babel/plugin-proposal-class-properties", { "loose" : true }],
["@babel/plugin-proposal-private-methods", { "loose": true }],
["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
["@babel/plugin-transform-runtime", {
"absoluteRuntime": false,
"corejs": 3,
Expand Down
2,392 changes: 1,317 additions & 1,075 deletions package-lock.json
View file

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions package.json
View file
Expand Up @@ -63,18 +63,6 @@
"devDependencies": {
"@babel/core": "^7.15.0",
"@babel/eslint-parser": "^7.15.0",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-decorators": "^7.14.5",
"@babel/plugin-proposal-export-namespace-from": "^7.14.5",
"@babel/plugin-proposal-function-sent": "^7.14.5",
"@babel/plugin-proposal-json-strings": "^7.14.5",
"@babel/plugin-proposal-numeric-separator": "^7.14.5",
"@babel/plugin-proposal-object-rest-spread": "^7.14.7",
"@babel/plugin-proposal-throw-expressions": "^7.14.5",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-async-to-generator": "^7.14.5",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@babel/preset-react": "^7.14.5",
Expand Down
54 changes: 26 additions & 28 deletions src/js/bib-component.jsx
View file
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React, { memo } from 'react';
import ReactDOM from 'react-dom';
import { IntlProvider } from 'react-intl';

Expand Down Expand Up @@ -29,34 +29,32 @@ ErrorBoundary.propTypes = {
children: PropTypes.node
}

class ZoteroBibComponent extends React.Component {
render() {
return (
<ErrorBoundary>
<IntlProvider
locale={ process.env.NODE_ENV === 'production' ? 'en-US' : undefined /* in development we always display values of defaultMessage */ }
messages={ messages }
>
<Container {...this.props } />
</IntlProvider>
</ErrorBoundary>
);
}

static init(domEl, config={}) {
'hydrateItemsCount' in domEl.dataset ?
ReactDOM.hydrate(
<ZoteroBibComponent
hydrateItemsCount={ parseInt(domEl.dataset.hydrateItemsCount) }
title={ domEl.querySelector('.bibliography-title')?.textContent }
config={ config }
/>, domEl) :
ReactDOM.render(<ZoteroBibComponent config={ config } />, domEl);
}
const ZoteroBibComponent = memo(props => (
<ErrorBoundary>
<IntlProvider
locale={ process.env.NODE_ENV === 'production' ? 'en-US' : undefined /* in development we always display values of defaultMessage */ }
messages={ messages }
>
<Container {...props } />
</IntlProvider>
</ErrorBoundary>
));

ZoteroBibComponent.displayName = 'ZoteroBibComponent';

ZoteroBibComponent.init = (domEl, config = {}) => {
'hydrateItemsCount' in domEl.dataset ?
ReactDOM.hydrate(
<ZoteroBibComponent
hydrateItemsCount={ parseInt(domEl.dataset.hydrateItemsCount) }
title={ domEl.querySelector('.bibliography-title')?.textContent }
config={ config }
/>, domEl) :
ReactDOM.render(<ZoteroBibComponent config={ config } />, domEl);
}

static propTypes = {
config: PropTypes.object
}
ZoteroBibComponent.propTypes = {
config: PropTypes.object
}

export default ZoteroBibComponent;
52 changes: 24 additions & 28 deletions src/js/components/brand.jsx
View file
@@ -1,31 +1,27 @@
import React from 'react';
import React, { memo } from 'react';

class Brand extends React.PureComponent {
render() {
return (
<React.Fragment>
<h1 className="brand">
<a href="/">
ZoteroBib
const Brand = () => (
<React.Fragment>
<h1 className="brand">
<a href="/">
ZoteroBib

<svg width="188" height="38" viewBox="0 0 188 38">
<g>
<path d="M17.76,16.84,4.608,34.12H18.24V37H0V34.7L13.152,17.416H.672v-2.88H17.76Z" fill="#e52e3d"/>
<path d="M43.584,25.768a12.252,12.252,0,0,1-.888,4.7,11.129,11.129,0,0,1-6.24,6.215,12.7,12.7,0,0,1-4.824.889,12.563,12.563,0,0,1-4.776-.889,11.129,11.129,0,0,1-6.24-6.215,12.9,12.9,0,0,1,0-9.408,11.135,11.135,0,0,1,6.24-6.216,12.563,12.563,0,0,1,4.776-.888,12.7,12.7,0,0,1,4.824.888,11.135,11.135,0,0,1,6.24,6.216A12.252,12.252,0,0,1,43.584,25.768Zm-3.456,0a10.075,10.075,0,0,0-.6-3.5,8.44,8.44,0,0,0-1.7-2.832,8.023,8.023,0,0,0-2.664-1.9,9.29,9.29,0,0,0-7.056,0,7.737,7.737,0,0,0-2.64,1.9,8.637,8.637,0,0,0-1.68,2.832,10.529,10.529,0,0,0,0,7.007,8.607,8.607,0,0,0,1.68,2.832A7.713,7.713,0,0,0,28.1,34a9.3,9.3,0,0,0,7.056,0,8,8,0,0,0,2.664-1.9,8.411,8.411,0,0,0,1.7-2.832A10.066,10.066,0,0,0,40.128,25.768Z" fill="#222"/>
<path d="M59.039,17.416h-6.48V30.664a7.194,7.194,0,0,0,.24,2.04,2.879,2.879,0,0,0,.672,1.224,2.307,2.307,0,0,0,1.032.6,4.846,4.846,0,0,0,1.32.168,6.222,6.222,0,0,0,1.68-.239,7.722,7.722,0,0,0,1.584-.624l.144,2.928a10.175,10.175,0,0,1-4.272.816,8,8,0,0,1-1.9-.24,4.458,4.458,0,0,1-1.8-.912A5.018,5.018,0,0,1,49.919,34.6a7.316,7.316,0,0,1-.528-3.023V17.416H44.639v-2.88h4.752V8.2h3.168v6.336h6.48Z" fill="#222"/>
<path d="M63.646,26.632a9.638,9.638,0,0,0,.816,3.168,8.282,8.282,0,0,0,4.32,4.272,7.761,7.761,0,0,0,3.12.623,7.99,7.99,0,0,0,4.392-1.176A8.79,8.79,0,0,0,79.1,30.808l2.447,2.016a12.169,12.169,0,0,1-4.44,3.648,12.431,12.431,0,0,1-5.208,1.1,11.938,11.938,0,0,1-4.631-.889A10.828,10.828,0,0,1,63.6,34.216a11.7,11.7,0,0,1-2.425-3.744,12.252,12.252,0,0,1-.887-4.7,12.551,12.551,0,0,1,.863-4.7,11.4,11.4,0,0,1,2.4-3.744,11.036,11.036,0,0,1,3.6-2.472,11.174,11.174,0,0,1,4.464-.888,10.943,10.943,0,0,1,4.56.912A10.122,10.122,0,0,1,79.559,17.3a10.372,10.372,0,0,1,2.087,3.552,12.957,12.957,0,0,1,.72,4.344v1.44ZM78.911,24.04a7.191,7.191,0,0,0-1.921-5.208,7.117,7.117,0,0,0-5.376-1.992,7.67,7.67,0,0,0-2.976.6,8.359,8.359,0,0,0-2.519,1.608,8.028,8.028,0,0,0-1.728,2.3,5.928,5.928,0,0,0-.649,2.688Z" fill="#222"/>
<path d="M87.022,21.544q0-1.486-.071-3.024t-.12-3.984h3.12v4.176h.1a6.983,6.983,0,0,1,.96-1.752,7.5,7.5,0,0,1,1.513-1.512,7.4,7.4,0,0,1,2.064-1.08,8.118,8.118,0,0,1,2.664-.408,8.61,8.61,0,0,1,2.352.288l-.624,3.12a5.34,5.34,0,0,0-1.825-.24,6.515,6.515,0,0,0-3.12.7A6.913,6.913,0,0,0,91.871,19.6,7.339,7.339,0,0,0,90.6,21.928a7.692,7.692,0,0,0-.409,2.4V37H87.022Z" fill="#222"/>
<path d="M123.022,25.768a12.252,12.252,0,0,1-.888,4.7,11.129,11.129,0,0,1-6.24,6.215,12.7,12.7,0,0,1-4.824.889,12.563,12.563,0,0,1-4.776-.889,11.129,11.129,0,0,1-6.24-6.215,12.9,12.9,0,0,1,0-9.408,11.135,11.135,0,0,1,6.24-6.216,12.563,12.563,0,0,1,4.776-.888,12.7,12.7,0,0,1,4.824.888,11.135,11.135,0,0,1,6.24,6.216A12.252,12.252,0,0,1,123.022,25.768Zm-3.456,0a10.075,10.075,0,0,0-.6-3.5,8.41,8.41,0,0,0-1.7-2.832,8,8,0,0,0-2.664-1.9,9.287,9.287,0,0,0-7.055,0,7.737,7.737,0,0,0-2.64,1.9,8.637,8.637,0,0,0-1.68,2.832,10.529,10.529,0,0,0,0,7.007A8.607,8.607,0,0,0,104.9,32.1a7.713,7.713,0,0,0,2.64,1.9,9.3,9.3,0,0,0,7.055,0,7.977,7.977,0,0,0,2.664-1.9,8.381,8.381,0,0,0,1.7-2.832A10.066,10.066,0,0,0,119.566,25.768Z" fill="#222"/>
<path d="M126.669.712h4.321v16.8h.095A7.872,7.872,0,0,1,134.4,14.7a10.546,10.546,0,0,1,4.607-1.032,12.047,12.047,0,0,1,4.776.912,10.714,10.714,0,0,1,3.648,2.52,11.192,11.192,0,0,1,2.328,3.792,13.425,13.425,0,0,1,.817,4.728,13.228,13.228,0,0,1-.817,4.7,11.511,11.511,0,0,1-2.328,3.792,10.555,10.555,0,0,1-3.648,2.544,12.065,12.065,0,0,1-4.776.912,10.6,10.6,0,0,1-4.488-1.008,8.216,8.216,0,0,1-3.432-2.832h-.095V37h-4.321Zm11.808,32.832a7.772,7.772,0,0,0,3.12-.6,6.868,6.868,0,0,0,2.352-1.631,7.189,7.189,0,0,0,1.488-2.5,9.913,9.913,0,0,0,0-6.384,7.2,7.2,0,0,0-1.488-2.5A6.9,6.9,0,0,0,141.6,18.3a8.412,8.412,0,0,0-6.24,0,6.889,6.889,0,0,0-2.352,1.632,7.2,7.2,0,0,0-1.488,2.5,9.93,9.93,0,0,0,0,6.384,7.189,7.189,0,0,0,1.488,2.5,6.859,6.859,0,0,0,2.352,1.631A7.775,7.775,0,0,0,138.477,33.544Z" fill="#222"/>
<path d="M153.4,6.088a3.047,3.047,0,0,1,.936-2.232,3.129,3.129,0,0,1,4.464,0,3.044,3.044,0,0,1,.937,2.232A3.044,3.044,0,0,1,158.8,8.32a3.129,3.129,0,0,1-4.464,0A3.047,3.047,0,0,1,153.4,6.088Zm1.009,8.16h4.319V37h-4.319Z" fill="#222"/>
<path d="M163.676.712H168v16.8h.1A7.882,7.882,0,0,1,171.4,14.7a10.553,10.553,0,0,1,4.608-1.032,12.059,12.059,0,0,1,4.777.912,10.729,10.729,0,0,1,3.647,2.52,11.161,11.161,0,0,1,2.328,3.792,13.4,13.4,0,0,1,.816,4.728,13.206,13.206,0,0,1-.816,4.7,11.478,11.478,0,0,1-2.328,3.792,10.57,10.57,0,0,1-3.647,2.544,12.076,12.076,0,0,1-4.777.912,10.6,10.6,0,0,1-4.488-1.008,8.216,8.216,0,0,1-3.432-2.832H168V37h-4.32Zm11.808,32.832a7.775,7.775,0,0,0,3.12-.6,6.872,6.872,0,0,0,2.353-1.631,7.25,7.25,0,0,0,1.488-2.5,9.93,9.93,0,0,0,0-6.384,7.26,7.26,0,0,0-1.488-2.5A6.9,6.9,0,0,0,178.6,18.3a8.409,8.409,0,0,0-6.239,0,6.873,6.873,0,0,0-2.353,1.632,7.2,7.2,0,0,0-1.488,2.5,9.913,9.913,0,0,0,0,6.384,7.189,7.189,0,0,0,1.488,2.5,6.844,6.844,0,0,0,2.353,1.631A7.764,7.764,0,0,0,175.484,33.544Z" fill="#222"/>
</g>
</svg>
</a>
</h1>
</React.Fragment>
);
}
}
<svg width="188" height="38" viewBox="0 0 188 38">
<g>
<path d="M17.76,16.84,4.608,34.12H18.24V37H0V34.7L13.152,17.416H.672v-2.88H17.76Z" fill="#e52e3d"/>
<path d="M43.584,25.768a12.252,12.252,0,0,1-.888,4.7,11.129,11.129,0,0,1-6.24,6.215,12.7,12.7,0,0,1-4.824.889,12.563,12.563,0,0,1-4.776-.889,11.129,11.129,0,0,1-6.24-6.215,12.9,12.9,0,0,1,0-9.408,11.135,11.135,0,0,1,6.24-6.216,12.563,12.563,0,0,1,4.776-.888,12.7,12.7,0,0,1,4.824.888,11.135,11.135,0,0,1,6.24,6.216A12.252,12.252,0,0,1,43.584,25.768Zm-3.456,0a10.075,10.075,0,0,0-.6-3.5,8.44,8.44,0,0,0-1.7-2.832,8.023,8.023,0,0,0-2.664-1.9,9.29,9.29,0,0,0-7.056,0,7.737,7.737,0,0,0-2.64,1.9,8.637,8.637,0,0,0-1.68,2.832,10.529,10.529,0,0,0,0,7.007,8.607,8.607,0,0,0,1.68,2.832A7.713,7.713,0,0,0,28.1,34a9.3,9.3,0,0,0,7.056,0,8,8,0,0,0,2.664-1.9,8.411,8.411,0,0,0,1.7-2.832A10.066,10.066,0,0,0,40.128,25.768Z" fill="#222"/>
<path d="M59.039,17.416h-6.48V30.664a7.194,7.194,0,0,0,.24,2.04,2.879,2.879,0,0,0,.672,1.224,2.307,2.307,0,0,0,1.032.6,4.846,4.846,0,0,0,1.32.168,6.222,6.222,0,0,0,1.68-.239,7.722,7.722,0,0,0,1.584-.624l.144,2.928a10.175,10.175,0,0,1-4.272.816,8,8,0,0,1-1.9-.24,4.458,4.458,0,0,1-1.8-.912A5.018,5.018,0,0,1,49.919,34.6a7.316,7.316,0,0,1-.528-3.023V17.416H44.639v-2.88h4.752V8.2h3.168v6.336h6.48Z" fill="#222"/>
<path d="M63.646,26.632a9.638,9.638,0,0,0,.816,3.168,8.282,8.282,0,0,0,4.32,4.272,7.761,7.761,0,0,0,3.12.623,7.99,7.99,0,0,0,4.392-1.176A8.79,8.79,0,0,0,79.1,30.808l2.447,2.016a12.169,12.169,0,0,1-4.44,3.648,12.431,12.431,0,0,1-5.208,1.1,11.938,11.938,0,0,1-4.631-.889A10.828,10.828,0,0,1,63.6,34.216a11.7,11.7,0,0,1-2.425-3.744,12.252,12.252,0,0,1-.887-4.7,12.551,12.551,0,0,1,.863-4.7,11.4,11.4,0,0,1,2.4-3.744,11.036,11.036,0,0,1,3.6-2.472,11.174,11.174,0,0,1,4.464-.888,10.943,10.943,0,0,1,4.56.912A10.122,10.122,0,0,1,79.559,17.3a10.372,10.372,0,0,1,2.087,3.552,12.957,12.957,0,0,1,.72,4.344v1.44ZM78.911,24.04a7.191,7.191,0,0,0-1.921-5.208,7.117,7.117,0,0,0-5.376-1.992,7.67,7.67,0,0,0-2.976.6,8.359,8.359,0,0,0-2.519,1.608,8.028,8.028,0,0,0-1.728,2.3,5.928,5.928,0,0,0-.649,2.688Z" fill="#222"/>
<path d="M87.022,21.544q0-1.486-.071-3.024t-.12-3.984h3.12v4.176h.1a6.983,6.983,0,0,1,.96-1.752,7.5,7.5,0,0,1,1.513-1.512,7.4,7.4,0,0,1,2.064-1.08,8.118,8.118,0,0,1,2.664-.408,8.61,8.61,0,0,1,2.352.288l-.624,3.12a5.34,5.34,0,0,0-1.825-.24,6.515,6.515,0,0,0-3.12.7A6.913,6.913,0,0,0,91.871,19.6,7.339,7.339,0,0,0,90.6,21.928a7.692,7.692,0,0,0-.409,2.4V37H87.022Z" fill="#222"/>
<path d="M123.022,25.768a12.252,12.252,0,0,1-.888,4.7,11.129,11.129,0,0,1-6.24,6.215,12.7,12.7,0,0,1-4.824.889,12.563,12.563,0,0,1-4.776-.889,11.129,11.129,0,0,1-6.24-6.215,12.9,12.9,0,0,1,0-9.408,11.135,11.135,0,0,1,6.24-6.216,12.563,12.563,0,0,1,4.776-.888,12.7,12.7,0,0,1,4.824.888,11.135,11.135,0,0,1,6.24,6.216A12.252,12.252,0,0,1,123.022,25.768Zm-3.456,0a10.075,10.075,0,0,0-.6-3.5,8.41,8.41,0,0,0-1.7-2.832,8,8,0,0,0-2.664-1.9,9.287,9.287,0,0,0-7.055,0,7.737,7.737,0,0,0-2.64,1.9,8.637,8.637,0,0,0-1.68,2.832,10.529,10.529,0,0,0,0,7.007A8.607,8.607,0,0,0,104.9,32.1a7.713,7.713,0,0,0,2.64,1.9,9.3,9.3,0,0,0,7.055,0,7.977,7.977,0,0,0,2.664-1.9,8.381,8.381,0,0,0,1.7-2.832A10.066,10.066,0,0,0,119.566,25.768Z" fill="#222"/>
<path d="M126.669.712h4.321v16.8h.095A7.872,7.872,0,0,1,134.4,14.7a10.546,10.546,0,0,1,4.607-1.032,12.047,12.047,0,0,1,4.776.912,10.714,10.714,0,0,1,3.648,2.52,11.192,11.192,0,0,1,2.328,3.792,13.425,13.425,0,0,1,.817,4.728,13.228,13.228,0,0,1-.817,4.7,11.511,11.511,0,0,1-2.328,3.792,10.555,10.555,0,0,1-3.648,2.544,12.065,12.065,0,0,1-4.776.912,10.6,10.6,0,0,1-4.488-1.008,8.216,8.216,0,0,1-3.432-2.832h-.095V37h-4.321Zm11.808,32.832a7.772,7.772,0,0,0,3.12-.6,6.868,6.868,0,0,0,2.352-1.631,7.189,7.189,0,0,0,1.488-2.5,9.913,9.913,0,0,0,0-6.384,7.2,7.2,0,0,0-1.488-2.5A6.9,6.9,0,0,0,141.6,18.3a8.412,8.412,0,0,0-6.24,0,6.889,6.889,0,0,0-2.352,1.632,7.2,7.2,0,0,0-1.488,2.5,9.93,9.93,0,0,0,0,6.384,7.189,7.189,0,0,0,1.488,2.5,6.859,6.859,0,0,0,2.352,1.631A7.775,7.775,0,0,0,138.477,33.544Z" fill="#222"/>
<path d="M153.4,6.088a3.047,3.047,0,0,1,.936-2.232,3.129,3.129,0,0,1,4.464,0,3.044,3.044,0,0,1,.937,2.232A3.044,3.044,0,0,1,158.8,8.32a3.129,3.129,0,0,1-4.464,0A3.047,3.047,0,0,1,153.4,6.088Zm1.009,8.16h4.319V37h-4.319Z" fill="#222"/>
<path d="M163.676.712H168v16.8h.1A7.882,7.882,0,0,1,171.4,14.7a10.553,10.553,0,0,1,4.608-1.032,12.059,12.059,0,0,1,4.777.912,10.729,10.729,0,0,1,3.647,2.52,11.161,11.161,0,0,1,2.328,3.792,13.4,13.4,0,0,1,.816,4.728,13.206,13.206,0,0,1-.816,4.7,11.478,11.478,0,0,1-2.328,3.792,10.57,10.57,0,0,1-3.647,2.544,12.076,12.076,0,0,1-4.777.912,10.6,10.6,0,0,1-4.488-1.008,8.216,8.216,0,0,1-3.432-2.832H168V37h-4.32Zm11.808,32.832a7.775,7.775,0,0,0,3.12-.6,6.872,6.872,0,0,0,2.353-1.631,7.25,7.25,0,0,0,1.488-2.5,9.93,9.93,0,0,0,0-6.384,7.26,7.26,0,0,0-1.488-2.5A6.9,6.9,0,0,0,178.6,18.3a8.409,8.409,0,0,0-6.239,0,6.873,6.873,0,0,0-2.353,1.632,7.2,7.2,0,0,0-1.488,2.5,9.913,9.913,0,0,0,0,6.384,7.189,7.189,0,0,0,1.488,2.5,6.844,6.844,0,0,0,2.353,1.631A7.764,7.764,0,0,0,175.484,33.544Z" fill="#222"/>
</g>
</svg>
</a>
</h1>
</React.Fragment>
);

export default Brand;
export default memo(Brand);

0 comments on commit e2803f6

Please sign in to comment.