From f675acd16c0cd1a0d5464fbf2798d61d5d1f7d67 Mon Sep 17 00:00:00 2001 From: Wylie Conlon Date: Wed, 21 Apr 2021 16:36:26 -0400 Subject: [PATCH] Switch Tinymath to use peggy instead of pegjs --- package.json | 1 + packages/kbn-tinymath/BUILD.bazel | 8 ++++---- .../kbn-tinymath/grammar/{grammar.pegjs => grammar.peggy} | 0 yarn.lock | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) rename packages/kbn-tinymath/grammar/{grammar.pegjs => grammar.peggy} (100%) diff --git a/package.json b/package.json index 992433e17e6c15..d4d3706d8b6b8c 100644 --- a/package.json +++ b/package.json @@ -300,6 +300,7 @@ "p-retry": "^4.2.0", "papaparse": "^5.2.0", "pdfmake": "^0.1.65", + "peggy": "^1.0.0", "pegjs": "0.10.0", "pluralize": "3.1.0", "pngjs": "^3.4.0", diff --git a/packages/kbn-tinymath/BUILD.bazel b/packages/kbn-tinymath/BUILD.bazel index 9d521776fb4919..ae029c88774e84 100644 --- a/packages/kbn-tinymath/BUILD.bazel +++ b/packages/kbn-tinymath/BUILD.bazel @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm") -load("@npm//pegjs:index.bzl", "pegjs") +load("@npm//peggy:index.bzl", "peggy") PKG_BASE_NAME = "kbn-tinymath" PKG_REQUIRE_NAME = "@kbn/tinymath" @@ -30,16 +30,16 @@ DEPS = [ "@npm//lodash", ] -pegjs( +peggy( name = "grammar", data = [ - ":grammar/grammar.pegjs" + ":grammar/grammar.peggy" ], output_dir = True, args = [ "-o", "$(@D)/index.js", - "./%s/grammar/grammar.pegjs" % package_name() + "./%s/grammar/grammar.peggy" % package_name() ], ) diff --git a/packages/kbn-tinymath/grammar/grammar.pegjs b/packages/kbn-tinymath/grammar/grammar.peggy similarity index 100% rename from packages/kbn-tinymath/grammar/grammar.pegjs rename to packages/kbn-tinymath/grammar/grammar.peggy diff --git a/yarn.lock b/yarn.lock index f4d76841749673..465667230b6399 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21252,6 +21252,11 @@ pdfmake@^0.1.65: pdfkit "^0.11.0" svg-to-pdfkit "^0.1.8" +peggy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/peggy/-/peggy-1.0.0.tgz#df6c7816c9df0ef35e071aaf96836cb866fe7eb4" + integrity sha512-lH12sxAXj4Aug+vH6IGoByIQOREIlhH+x4Uzb9kce6DD8wcGeidkC0JYEOwHormKrLt5BFLTbR4PuD/tiMOirQ== + pegjs@0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"