diff --git a/README.md b/README.md index 87916fc..8888eb6 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ the containers with the new dependencies by running `docker-compose build` befor ## Useful commands ## To pre-compile nunjucks templates: -`nunjucks-precompile quarry/web/static/templates/ > quarry/web/static/templates/compiled.js` +`npm run build` See also commands listed in the mainters documentation: https://wikitech.wikimedia.org/wiki/Portal:Data_Services/Admin/Quarry diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml index e646799..968ac22 100644 --- a/helm-quarry/values.yaml +++ b/helm-quarry/values.yaml @@ -1,6 +1,6 @@ web: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-86 # web tag managed by github actions + tag: pr-88 # web tag managed by github actions resources: requests: memory: "300Mi" @@ -11,7 +11,7 @@ web: worker: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-86 # worker tag managed by github actions + tag: pr-88 # worker tag managed by github actions resources: requests: memory: "400Mi" diff --git a/package.json b/package.json index 2b7122c..9e8bac9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "private": true, "scripts": { - "test": "eslint quarry/web/static/js/" + "test": "eslint quarry/web/static/js/", + "build": "nunjucks-precompile quarry/web/static/templates/ > quarry/web/static/templates/compiled.js" }, "devDependencies": { "eslint": "5.6.0", diff --git a/quarry/web/static/templates/compiled.js b/quarry/web/static/templates/compiled.js index 773d10a..15db419 100644 --- a/quarry/web/static/templates/compiled.js +++ b/quarry/web/static/templates/compiled.js @@ -1,7 +1,7 @@ (function() {(window.nunjucksPrecompiled = window.nunjucksPrecompiled || {})["query-resultset.html"] = (function() { function root(env, context, frame, runtime, cb) { -var lineno = 0; -var colno = 0; +var lineno = null; +var colno = null; var output = ""; try { var parentTemplate = null; @@ -21,15 +21,14 @@ output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "ro output += " rows)\n \n