Skip to content

Commit

Permalink
Ks renderer (mdn#534)
Browse files Browse the repository at this point in the history
* initial changes for kumascript (mdn#449)

* initial changes for kumascript

* async changes for build.js, server/index.js
* modify importer to use raw HTML instead of
  rendered
* add kumascript as its own workspace
* remove unused aspects of kumascript
    * redis
    * express
* replace deprecated "request" npm package with
  "got" in kumascript (and related, simplify
  caching by removing "cacheFn" and
  "cacheFnIgnoreCacheControl")
* remove mdn.getFileContent since it's not
  used anywhere

* add empty .prettierrc file

* prettify kumascript files

* Ks renderer 6667 (mdn#459)

* initial changes for kumascript

* async changes for build.js, server/index.js
* modify importer to use raw HTML instead of
  rendered
* add kumascript as its own workspace
* remove unused aspects of kumascript
    * redis
    * express
* replace deprecated "request" npm package with
  "got" in kumascript (and related, simplify
  caching by removing "cacheFn" and
  "cacheFnIgnoreCacheControl")
* remove mdn.getFileContent since it's not
  used anywhere

* add initial KS shim

* Implement subpages, supagesExpand, translations, and getPage

* add summary to importer & change ks renderer setup

* fix/improve kumascript tests

* already rendered archive content (mdn#478)

* already rendered archive content

* Update content/scripts/build.js

Co-Authored-By: Ryan Johnson <[email protected]>

* feedbacked

Co-authored-by: Ryan Johnson <[email protected]>

* add updates from the in-use kumascript/macros (mdn#509)

* replace wiki.page with shim (mdn#484)

* feedbacked: fix .gitignore

* replace kumascript.wiki.page with shim

* greatly simplify prerequisite rendering (mdn#524)

* improve macro-rendering flaw messages (mdn#527)

* Ks renderer flaws only (mdn#530)

* fix on flaws cli

* collapse all errors and flaws into flaws

* cleanup

Co-authored-by: Peter Bengtsson <[email protected]>

* remove html-differ npm package from content (mdn#531)

* Ks renderer (mdn#533)

* remove html-differ npm package from content

* remove unused prerequisitesByUri from Builder

* Ks renderer (mdn#535)

* remove html-differ npm package from content

* remove unused prerequisitesByUri from Builder

* fix two kumascript tests

* feedbacked (mainly simplify macro-rendering flaws)

Co-authored-by: Peter Bengtsson <[email protected]>
  • Loading branch information
escattone and peterbe authored May 5, 2020
1 parent b0b0d03 commit df49654
Show file tree
Hide file tree
Showing 404 changed files with 42,234 additions and 269 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ server/dist/
ssr/node_modules/
ssr/dist/
watcher/node_modules/
archivecontent/
content/node_modules/
content/files/
content/build/
content/_all-titles.json
kumascript/coverage/

# Can be removed once content lives in its own repo
archivecontent/files
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Backup files
*~
# exclude these files
*.ejs
Dockerfile
Makefile
Procfile
Expand All @@ -18,6 +19,7 @@ content/_all-titles.json
/client/src/water.css/
/archivecontent/
/content/files/
/kumascript/coverage/

# Misc files to ignore
/client/src/serviceWorker.js
Empty file added .prettierrc
Empty file.
9 changes: 8 additions & 1 deletion content/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const {
DEFAULT_BUILD_NOT_LOCALES,
DEFAULT_SITEMAP_BASE_URL,
DEFAULT_FOLDER_SEARCHES,
DEFAULT_POPULARITIES_FILEPATH,
DEFAULT_FLAWS_LEVEL,
FLAWS_LEVELS,
MAX_GOOGLE_ANALYTICS_URIS,
} = require("./scripts/constants.js");

Expand Down Expand Up @@ -99,6 +100,12 @@ cli
cli.ARRAY,
DEFAULT_BUILD_NOT_LOCALES
)
.option(
`--flaws <${Object.values(FLAWS_LEVELS).join("|")}>`,
"How to deal with imperfections in the content building process",
new RegExp(Object.values(FLAWS_LEVELS).join("|")),
DEFAULT_FLAWS_LEVEL
)
.option("--no-progressbar", "no progress bar but listing instead", cli.BOOL)
.option("--start-clean", "delete anything created first", cli.BOOL)
.option("--list-locales", "display all locales and their counts", cli.BOOL)
Expand Down
2 changes: 2 additions & 0 deletions content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"chokidar": "3.4.0",
"dotenv": "8.2.0",
"fast-csv": "4.1.3",
"got": "10.7.0",
"js-yaml": "3.13.1",
"kumascript": "0.1.0",
"mdn-browser-compat-data": "1.0.19",
"mysql": "2.18.1",
"sanitize-filename": "^1.6.3",
Expand Down
Loading

0 comments on commit df49654

Please sign in to comment.