Skip to content

Commit

Permalink
fix(resume): Don't require config when we're building a default res…
Browse files Browse the repository at this point in the history
…ume.

Use it if we have it, but don't require it.
  • Loading branch information
randytarampi committed Sep 22, 2018
1 parent fdf5dea commit 58e90d9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/resume/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"@randy.tarampi/printables": "^0.39.1",
"@randy.tarampi/schema-dot-org-json-ld-components": "latest",
"@randy.tarampi/views": "^0.39.1",
"config": "^2.0.1",
"exiftool-vendored": "^6.2.3",
"history": "^4.7.2",
"immutable": "^4.0.0-rc.9",
Expand Down Expand Up @@ -109,7 +110,6 @@
"chai": "^4.1.2",
"chai-enzyme": "^1.0.0-beta.1",
"chokidar": "^2.0.4",
"config": "^2.0.1",
"connect-history-api-fallback": "^1.5.0",
"del": "^3.0.0",
"enzyme": "^3.6.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/resume/src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const config = require("config");

// NOTE-RT: This default module export is built to conform to the expectations of https://github.com/jsonresume/resume-cli
module.exports = {
render: (resumeJson, pageSize) => {
const {renderHtml} = require("./lib/renderHtml");
Expand All @@ -14,6 +15,10 @@ module.exports = {
format: process.env.RESUME_PDF_SIZE || "Letter",
mediaType: "print"
},
pdfRenderExpectations: config.get("resume.expectations")
pdfRenderExpectations: config.has("resume.expectations")
? config.get("resume.expectations")
: {
pages: 1
}
};

4 changes: 3 additions & 1 deletion packages/resume/src/lib/buildResume.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import Resume from "./resume";
export const buildResume = (resumeTemplate, id) => {
const json = Object.assign({}, baseResume, resumeTemplate);
const resume = Resume.fromResume({
renderExpectations: config.get("resume.expectations"),
renderExpectations: config.has("resume.expectations")
? config.get("resume.expectations")
: null,
...json,
id,
});
Expand Down
4 changes: 3 additions & 1 deletion packages/resume/src/lib/renderHtml.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export const renderHtml = ({passedPrintable, ...renderLocals} = {}) => {
printable
})({
bundleName: "resume",
pageUrl: config.get("resume.publishUrl"),
pageUrl: config.has("resume.publishUrl")
? config.get("resume.publishUrl")
: null,
packageJson,
printable,
...renderLocals
Expand Down

0 comments on commit 58e90d9

Please sign in to comment.