Merge branch 'master' into gw-ldaps-docs

Author: jstirnaman

.ci/Dockerfile.remark

@@ -1,14 +1,12 @@
 FROM registry.gitlab.com/pipeline-components/remark-lint:latest
 
-
 WORKDIR /app/
 
-# Generic
 #RUN apk add --no-cache
 COPY /.ci/remark-lint /app/
 
 # Node
-ENV PATH "$PATH:/app/node_modules/.bin/"
+ENV PATH="$PATH:/app/node_modules/.bin/"
 RUN yarn install && yarn cache clean
 ENV NODE_PATH=/app/node_modules/
 RUN ln -nfs /app/node_modules /node_modules
@@ -23,3 +21,6 @@ LABEL \
     org.label-schema.name="Remark-lint" \
     org.label-schema.schema-version="1.0" \
     org.label-schema.url="https://pipeline-components.gitlab.io/"
+
+ENTRYPOINT [ "remark" ]
+CMD [ "" ]

.ci/remark-lint/.remark-lint.js

@@ -0,0 +1,25 @@
+import remarkPresetLintConsistent from 'remark-preset-lint-consistent';
+import remarkPresetLintRecommended from 'remark-preset-lint-recommended';
+import remarkPresetLintMarkdownStyleGuide from 'remark-preset-lint-markdown-style-guide';
+import remarkFrontmatter from 'remark-frontmatter';
+import remarkFrontmatterSchema from 'remark-lint-frontmatter-schema';
+import remarkNoShellDollars from 'remark-lint-no-shell-dollars';
+import remarkToc from 'remark-toc';
+
+const remarkConfig = {
+  settings: {
+    bullet: '-',
+    plugins: [
+      remarkPresetLintConsistent,
+      remarkPresetLintRecommended,
+      remarkPresetLintMarkdownStyleGuide,
+      remarkFrontmatter,
+      remarkFrontmatterSchema,
+      remarkNoShellDollars,
+      // Generate a table of contents in `## Contents`
+      [remarkToc, { heading: '' }],
+    ],
+  },
+};
+
+export default remarkConfig;

.ci/remark-lint/yarn.lock

@@ -435,9 +435,9 @@ concat-stream@^2.0.0:
     typedarray "^0.0.6"
 
 cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

.ci/vale/styles/Google/Ordinal.yml

@@ -5,3 +5,9 @@ level: error
 nonword: true
 tokens:
   - \d+(?:st|nd|rd|th)
+  - tenth
+
+exceptions:
+  - 0th
+  - 50th
+  - 90th

.ci/vale/styles/Google/Units.yml

@@ -5,5 +5,5 @@ nonword: true
 level: error
 tokens:
   - \b\d+(?:B|kB|MB|GB|TB)
-# Ignore duration literals in code blocks.
-  - \b(?!\`)\d+(?:ns|ms|s|min|h|d)
+# Match time units, but not duration literals inside code blocks.
+  - \b`(\n)?\d+(ns|ms|s|min|h|d)`\b

.ci/vale/styles/InfluxDataDocs/Terms/query-functions.txt

@@ -128,6 +128,7 @@ left
 level
 like
 local
+locf
 lower
 match
 max

.ci/vale/styles/InfluxDataDocs/WordList.yml

@@ -55,7 +55,6 @@ swap:
   fewer data: less data
   file name: filename
   firewalls: firewall rules
-  fully qualified: fully-qualified
   functionality: capability|feature
   Google account: Google Account
   Google accounts: Google Accounts

.ci/vale/styles/config/vocabularies/InfluxDataDocs/accept.txt

@@ -68,10 +68,10 @@ influx3
 influxctl
 influxd
 influxdata.com
-iox
+(iox|IOx)
 keep-url
 lat
-locf
+(locf|LOCF)
 logicalplan
 noaa|NOAA
 npm|NPM

.husky/_/build

@@ -48,9 +48,6 @@ call_lefthook()
     elif command -v mint >/dev/null 2>&1
     then
       mint run csjones/lefthook-plugin "$@"
-    elif command -v npx >/dev/null 2>&1
-    then
-      npx lefthook "$@"
     else
       echo "Can't find lefthook in PATH"
     fi

.husky/_/pre-commit

@@ -48,9 +48,6 @@ call_lefthook()
     elif command -v mint >/dev/null 2>&1
     then
       mint run csjones/lefthook-plugin "$@"
-    elif command -v npx >/dev/null 2>&1
-    then
-      npx lefthook "$@"
     else
       echo "Can't find lefthook in PATH"
     fi