Merge pull request #477 from stasm/cleanup1

Build tools cleanups, part 1

Author: stasm

common.mk

@@ -17,22 +17,6 @@ all: lint test build
 # Used for pre-publishing.
 dist: clean lint test build html
 
-_lint:
-	@eslint --config $(ROOT)/eslint_src.json --max-warnings 0 src/
-	@eslint --config $(ROOT)/eslint_test.json --max-warnings 0 test/
-	@echo -e " $(OK) lint"
-
-_html:
-ifneq (,$(wildcard ./.esdoc.json))
-	@esdoc
-	@echo -e " $(OK) html built"
-endif
-
-_clean:
-	@rm -f index.js compat.js
-	@rm -rf .nyc_output coverage
-	@echo -e " $(OK) clean"
-
 deps:
 	@npm install
 	@echo -e " $(OK) deps installed"

eslint_src.json renamed to eslint_js.json

@@ -1,5 +1,4 @@
 {
-    "parser": "babel-eslint",
     "parserOptions": {
         "ecmaVersion": 9,
         "sourceType": "module"

eslint_test.json

@@ -1,5 +1,4 @@
 {
-    "parser": "babel-eslint",
     "parserOptions": {
         "ecmaVersion": 9,
         "sourceType": "module",

eslint_ts.json

@@ -13,7 +13,7 @@
         "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
-        "./eslint_src.json"
+        "./eslint_js.json"
     ],
     "rules": {
         "complexity": "off",

fluent-dom/makefile

@@ -5,7 +5,7 @@ DEPS    := cached-iterable:CachedIterable
 include ../common.mk
 
 lint:
-	@eslint --config $(ROOT)/eslint_src.json --max-warnings 0 src/
+	@eslint --config $(ROOT)/eslint_js.json --max-warnings 0 src/
 	@eslint --config $(ROOT)/eslint_test.json --max-warnings 0 test/
 	@echo -e " $(OK) lint"
 

fluent-gecko/makefile

@@ -6,6 +6,11 @@ include ../common.mk
 version = $(1)@$(shell node -e "\
 	console.log(require('../$(1)/package.json').version)")
 
+lint:
+	@eslint --config $(ROOT)/eslint_js.json --max-warnings 0 src/
+	@eslint --config $(ROOT)/eslint_test.json --max-warnings 0 test/
+	@echo -e " $(OK) lint"
+
 test:
 	@nyc --reporter=text --reporter=html mocha \
 	    --recursive --ui tdd \
@@ -66,5 +71,4 @@ clean:
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
 
-lint: _lint
-html: _html
+html: ;

fluent-langneg/src/subtags.ts

@@ -52,7 +52,7 @@ const regionMatchingLangs = [
 ];
 
 export function getLikelySubtagsMin(loc: string): Locale | null {
-  if (likelySubtagsMin.hasOwnProperty(loc)) {
+  if (Object.prototype.hasOwnProperty.call(likelySubtagsMin, loc)) {
     return new Locale(likelySubtagsMin[loc]);
   }
   const locale = new Locale(loc);

fluent-react/src/localized.ts

@@ -155,7 +155,10 @@ export function Localized(props: LocalizedProps): ReactElement {
     const childName = childNode.nodeName.toLowerCase();
 
     // If the child is not expected just take its textContent.
-    if (!elemsLower || !elemsLower.hasOwnProperty(childName)) {
+    if (
+      !elemsLower ||
+      !Object.prototype.hasOwnProperty.call(elemsLower, childName)
+    ) {
       return childNode.textContent;
     }
 

package.json

@@ -10,20 +10,14 @@
     "@babel/preset-env": "^7.4.3",
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
-    "babel-eslint": "^10.0.1",
     "colors": "^1.3.3",
     "commander": "^2.20",
-    "esdoc": "^1.1.0",
-    "esdoc-ecmascript-proposal-plugin": "^1.0.0",
-    "esdoc-jsx-plugin": "^1.0.0",
-    "esdoc-standard-plugin": "^1.0.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-mocha": "^5.3.0",
+    "eslint": "6.8.x",
+    "eslint-plugin-mocha": "6.3.x",
     "esm": "^3.2.22",
     "fuzzer": "^0.2.1",
     "gh-pages": "^2.0.1",
     "intl-pluralrules": "^1.0.0",
-    "jsdoc": "^3.5.5",
     "mocha": "^6.1.2",
     "nyc": "^13.3.0",
     "prettyjson": "^1.2.1",