diff --git a/package.json b/package.json index fd31f9f0c..7942a4b0a 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,14 @@ "dependencies": { "@iarna/toml": "^2.2.5", "@unicode/unicode-13.0.0": "^1.0.2", - "cldr": "^5.7.0", + "cldr": "^5.8.0", "ejs": "^3.1.5", "fs-extra": "^9.0.1", "object-assign": "^4.1.1", - "ot-builder": "^0.10.31", - "otb-ttc-bundle": "^0.10.31", + "ot-builder": "^0.10.37", + "otb-ttc-bundle": "^0.10.37", "patel": "^0.34.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "spiro": "^2.0.0", "stylus": "^0.54.8", "toposort": "^2.0.2", @@ -27,9 +27,9 @@ "which": "^2.0.2" }, "devDependencies": { - "eslint": "^7.12.0", - "eslint-config-prettier": "^6.14.0", - "prettier": "^2.1.2" + "eslint": "^7.16.0", + "eslint-config-prettier": "^7.1.0", + "prettier": "^2.2.1" }, "engines": { "node": ">=12.16.0" diff --git a/verdafile.js b/verdafile.js index ee27f2096..eff215764 100644 --- a/verdafile.js +++ b/verdafile.js @@ -10,7 +10,7 @@ const toml = require("@iarna/toml"); const { task, file, oracle, computed, phony } = build.ruleTypes; const { de, fu, sfu, ofu } = build.rules; -const { run, node, cd, cp, rm, mv, fail, echo, silently } = build.actions; +const { run, cd, cp, rm, fail, echo, silently } = build.actions; const { FileList } = build.predefinedFuncs; module.exports = build; @@ -23,7 +23,7 @@ const SNAPSHOT_TMP = ".build/snapshot"; const DIST_SUPER_TTC = "dist/.super-ttc"; const ARCHIVE_DIR = "release-archives"; -const PATEL_C = ["node", "./node_modules/patel/bin/patel-c"]; +const PATEL_C = ["node", "node_modules/patel/bin/patel-c"]; const TTCIZE = ["node", "node_modules/otb-ttc-bundle/bin/otb-ttc-bundle"]; const webfontFormats = [ ["woff2", "woff2"], @@ -554,11 +554,7 @@ const PagesFastFontExport = task.group(`pages:fast-font-export`, async (target, }); async function exportFontDir(pagesDir, dir) { - await cp(`${DIST}/${dir}`, Path.resolve(pagesDir, "shared/font-import", dir)); - await mv( - Path.resolve(pagesDir, "shared/font-import", dir, `${dir}.css`), - Path.resolve(pagesDir, "shared/font-import", dir, `${dir}.styl`) - ); + await cp(`${DIST}/${dir}`, Path.resolve(pagesDir, "shared/fonts", dir)); } ///////////////////////////////////////////////////////////