sfdx-hardis 8.9.0 → 8.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/defaults/mkdocs/docs/overrides/main.html +7 -2
- package/defaults/mkdocs/mkdocs.yml +7 -1
- package/defaults/mkdocs-project-doc/docs/overrides/main.html +7 -2
- package/defaults/mkdocs-project-doc/mkdocs.yml +7 -1
- package/defaults/monitoring/.github/workflows/org-monitoring.yml +6 -6
- package/defaults/monitoring/.mega-linter.yml +4 -3
- package/lib/commands/hardis/doc/plugin/generate.js +5 -2
- package/lib/commands/hardis/doc/plugin/generate.js.map +1 -1
- package/lib/commands/hardis/doc/project2markdown.js +4 -10
- package/lib/commands/hardis/doc/project2markdown.js.map +1 -1
- package/lib/commands/hardis/work/new.d.ts +6 -0
- package/lib/commands/hardis/work/new.js +39 -19
- package/lib/commands/hardis/work/new.js.map +1 -1
- package/lib/common/docBuilder/docUtils.d.ts +24 -0
- package/lib/common/docBuilder/docUtils.js +58 -0
- package/lib/common/docBuilder/docUtils.js.map +1 -1
- package/lib/common/websocketClient.d.ts +9 -0
- package/lib/common/websocketClient.js +14 -0
- package/lib/common/websocketClient.js.map +1 -1
- package/lib/i18n/de.json +2 -0
- package/lib/i18n/en.json +2 -0
- package/lib/i18n/es.json +2 -0
- package/lib/i18n/fr.json +2 -0
- package/lib/i18n/it.json +2 -0
- package/lib/i18n/ja.json +2 -0
- package/lib/i18n/nl.json +2 -0
- package/lib/i18n/pl.json +2 -0
- package/lib/i18n/pt-BR.json +2 -0
- package/oclif.lock +26 -26
- package/oclif.manifest.json +3585 -3585
- package/package.json +5 -5
- package/defaults/mkdocs/docs/javascripts/gtag.js +0 -27
- package/defaults/mkdocs-project-doc/docs/javascripts/gtag.js +0 -32
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
{% extends "base.html" %}
|
|
2
2
|
|
|
3
|
-
<!--
|
|
4
|
-
|
|
3
|
+
<!--
|
|
4
|
+
Google Analytics is not wired here. Put your measurement id in mkdocs.yml under
|
|
5
|
+
extra.analytics and the theme does the rest, including the page view of the page
|
|
6
|
+
a reader lands on.
|
|
7
|
+
|
|
8
|
+
This file stays because theme.custom_dir points at this folder.
|
|
9
|
+
-->
|
|
@@ -66,10 +66,16 @@ markdown_extensions:
|
|
|
66
66
|
extra_javascript:
|
|
67
67
|
- https://cdnjs.cloudflare.com/ajax/libs/tablesort/5.2.1/tablesort.min.js
|
|
68
68
|
- javascripts/tables.js
|
|
69
|
-
- javascripts/gtag.js
|
|
70
69
|
extra_css:
|
|
71
70
|
- stylesheets/extra.css
|
|
72
71
|
extra:
|
|
72
|
+
# Google Analytics. Uncomment and put your own measurement id in it, and the
|
|
73
|
+
# theme sends the page view of the page a reader lands on plus one per instant
|
|
74
|
+
# navigation. Leave it out and no request is made at all.
|
|
75
|
+
#
|
|
76
|
+
# analytics:
|
|
77
|
+
# provider: google
|
|
78
|
+
# property: G-XXXXXXXXXX
|
|
73
79
|
social:
|
|
74
80
|
- icon: fontawesome/regular/circle-question
|
|
75
81
|
link: https://github.com/hardisgroupcom/sfdx-hardis/issues
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
{% extends "base.html" %}
|
|
2
2
|
|
|
3
|
-
<!--
|
|
4
|
-
|
|
3
|
+
<!--
|
|
4
|
+
Google Analytics is not wired here. Put your measurement id in mkdocs.yml under
|
|
5
|
+
extra.analytics and the theme does the rest, including the page view of the page
|
|
6
|
+
a reader lands on.
|
|
7
|
+
|
|
8
|
+
This file stays because theme.custom_dir points at this folder.
|
|
9
|
+
-->
|
|
@@ -82,7 +82,6 @@ extra_javascript:
|
|
|
82
82
|
- https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.12/jstree.min.js
|
|
83
83
|
- https://cdnjs.cloudflare.com/ajax/libs/tablesort/5.2.1/tablesort.min.js
|
|
84
84
|
- javascripts/tables.js
|
|
85
|
-
- javascripts/gtag.js
|
|
86
85
|
- javascripts/jstree-handler.js
|
|
87
86
|
# Rewritten by sfdx-hardis on every run: put project behavior in javascripts/tables.js
|
|
88
87
|
- javascripts/sfdx-hardis-doc-labels.js
|
|
@@ -95,6 +94,13 @@ extra_css:
|
|
|
95
94
|
# Loaded last so it overrides the project stylesheet: sfdx-hardis rewrites it on every run
|
|
96
95
|
- stylesheets/sfdx-hardis-doc.css
|
|
97
96
|
extra:
|
|
97
|
+
# Google Analytics. Uncomment and put your own measurement id in it, and the
|
|
98
|
+
# theme sends the page view of the page a reader lands on plus one per instant
|
|
99
|
+
# navigation. Leave it out and no request is made at all.
|
|
100
|
+
#
|
|
101
|
+
# analytics:
|
|
102
|
+
# provider: google
|
|
103
|
+
# property: G-XXXXXXXXXX
|
|
98
104
|
social:
|
|
99
105
|
- icon: fontawesome/regular/circle-question
|
|
100
106
|
link: https://github.com/hardisgroupcom/sfdx-hardis/issues
|
|
@@ -178,10 +178,10 @@ jobs:
|
|
|
178
178
|
NOTIF_API_METRICS_BASIC_AUTH_PASSWORD: ${{ secrets.NOTIF_API_METRICS_BASIC_AUTH_PASSWORD }}
|
|
179
179
|
run: |
|
|
180
180
|
echo "Run apex tests against \"$CONFIG_BRANCH\""
|
|
181
|
-
|
|
182
|
-
#
|
|
183
|
-
# without this, git refuses the repository and the backup sees no change to commit
|
|
181
|
+
# The job runs as root in a container, over a workspace checked out by another user.
|
|
182
|
+
# This must come before any git command, or the pull below fails on dubious ownership.
|
|
184
183
|
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
|
184
|
+
git pull origin ${{ matrix.branch }} || echo "Issue when pulling latest branch state, but that should be ok"
|
|
185
185
|
sf hardis:auth:login
|
|
186
186
|
sf hardis:org:test:apex
|
|
187
187
|
|
|
@@ -312,10 +312,10 @@ jobs:
|
|
|
312
312
|
|
|
313
313
|
run: |
|
|
314
314
|
echo "Run Monitoring checks against \"$CONFIG_BRANCH\""
|
|
315
|
-
|
|
316
|
-
#
|
|
317
|
-
# without this, git refuses the repository and the backup sees no change to commit
|
|
315
|
+
# The job runs as root in a container, over a workspace checked out by another user.
|
|
316
|
+
# This must come before any git command, or the pull below fails on dubious ownership.
|
|
318
317
|
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
|
318
|
+
git pull origin ${{ matrix.branch }} || echo "Issue when pulling latest branch state, but that should be ok"
|
|
319
319
|
sf hardis:auth:login
|
|
320
320
|
sf hardis:org:monitor:all
|
|
321
321
|
|
|
@@ -3,12 +3,13 @@
|
|
|
3
3
|
EXTENDS:
|
|
4
4
|
- https://raw.githubusercontent.com/hardisgroupcom/sfdx-hardis/main/config/sfdx-hardis.mega-linter-config.yml
|
|
5
5
|
|
|
6
|
+
# The Salesforce analyzers are made non-blocking by the shared config this extends.
|
|
7
|
+
# SALESFORCE_SFDX_SCANNER_* used to be listed here; MegaLinter renamed those linters to
|
|
8
|
+
# SALESFORCE_CODE_ANALYZER_*, so the old keys matched nothing and hid that the flow engine
|
|
9
|
+
# was never covered.
|
|
6
10
|
DISABLE_ERRORS_LINTERS:
|
|
7
11
|
- CSS_STYLELINT
|
|
8
12
|
- COPYPASTE_JSCPD
|
|
9
|
-
- SALESFORCE_SFDX_SCANNER_APEX
|
|
10
|
-
- SALESFORCE_SFDX_SCANNER_AURA
|
|
11
|
-
- SALESFORCE_SFDX_SCANNER_LWC
|
|
12
13
|
|
|
13
14
|
# The monitoring jobs run the latest sfdx-hardis image on purpose, so that every night uses the
|
|
14
15
|
# latest checks: the image tag checks do not apply to these templates
|
|
@@ -10,7 +10,7 @@ import * as yaml from 'js-yaml';
|
|
|
10
10
|
import { uxLog } from '../../../../common/utils/index.js';
|
|
11
11
|
import { PACKAGE_ROOT_DIR } from '../../../../settings.js';
|
|
12
12
|
import { Config } from '@oclif/core';
|
|
13
|
-
import { readMkDocsFile, writeMkDocsFile } from '../../../../common/docBuilder/docUtils.js';
|
|
13
|
+
import { migrateGtagJsToMkDocsAnalytics, readMkDocsFile, writeMkDocsFile } from '../../../../common/docBuilder/docUtils.js';
|
|
14
14
|
import { t } from '../../../../common/utils/i18n.js';
|
|
15
15
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
16
16
|
const messages = Messages.loadMessages('sfdx-hardis', 'org');
|
|
@@ -36,7 +36,7 @@ After the initial run, you will need to manually update:
|
|
|
36
36
|
|
|
37
37
|
- \`mkdocs.yml\`: Customize the project title, theme, and other site settings. Zensical reads this file directly.
|
|
38
38
|
- \`.github/workflows/build-deploy-docs.yml\`: Configure the GitHub Actions workflow for automatic documentation deployment.
|
|
39
|
-
- \`
|
|
39
|
+
- \`mkdocs.yml\`, key \`extra.analytics\`: If desired, set up Google Analytics tracking with your own measurement id.
|
|
40
40
|
|
|
41
41
|
Finally, activate GitHub Pages with \`gh_pages\` as the target branch. This will enable automatic documentation rebuilding and publishing to GitHub Pages upon each merge into your \`master\`/\`main\` branch.
|
|
42
42
|
|
|
@@ -141,6 +141,9 @@ In agent mode, all interactive prompts are skipped and default values are used.
|
|
|
141
141
|
}
|
|
142
142
|
return navItem;
|
|
143
143
|
});
|
|
144
|
+
// Analytics used to be a gtag.js copied into the project, which never counted the page a
|
|
145
|
+
// reader landed on. The id moves to extra.analytics, where the theme reads it.
|
|
146
|
+
await migrateGtagJsToMkDocsAnalytics(process.cwd(), mkdocsYml);
|
|
144
147
|
await writeMkDocsFile(mkdocsYmlFile, mkdocsYml);
|
|
145
148
|
// Return an object to be displayed with --json
|
|
146
149
|
return { outputString: `Generated documentation` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/doc/plugin/generate.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,MAAM,qCAAqC,CAAC;AACrD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/doc/plugin/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { XMLBuilder } from "fast-xml-parser";
|
|
|
8
8
|
import sortArray from '../../../common/utils/sortArray.js';
|
|
9
9
|
import { Messages } from '@salesforce/core';
|
|
10
10
|
import { WebSocketClient } from '../../../common/websocketClient.js';
|
|
11
|
-
import { buildAllKnownNavLabels, completeAttributesDescriptionWithAi, getSearchExcludeLines, indexPageListsPages, isUntouchedGeneratedHomePage, normalizeMkDocsNavTarget, promoteSectionIndexTitle, readMkDocsFile, removeDeadDocumentationLinks, removeEmptySectionIndexPages, replaceInFile, sortDescriptionsByName, sortMkDocsNavItems, stampGeneratedHomePage, writeMkDocsFile } from '../../../common/docBuilder/docUtils.js';
|
|
11
|
+
import { buildAllKnownNavLabels, completeAttributesDescriptionWithAi, migrateGtagJsToMkDocsAnalytics, getSearchExcludeLines, indexPageListsPages, isUntouchedGeneratedHomePage, normalizeMkDocsNavTarget, promoteSectionIndexTitle, readMkDocsFile, removeDeadDocumentationLinks, removeEmptySectionIndexPages, replaceInFile, sortDescriptionsByName, sortMkDocsNavItems, stampGeneratedHomePage, writeMkDocsFile } from '../../../common/docBuilder/docUtils.js';
|
|
12
12
|
import { getLargeXmlParser, parseXmlFile } from '../../../common/utils/xmlUtils.js';
|
|
13
13
|
import { bool2emoji, createTempDir, execCommand, execSfdxJson, filterPackageXml, getCurrentGitBranch, sortCrossPlatform, uxLog } from '../../../common/utils/index.js';
|
|
14
14
|
import { CONSTANTS, getBannerMarkdownAndLink, getConfig } from '../../../config/index.js';
|
|
@@ -1271,14 +1271,6 @@ The free [Salesforce DevOps with sfdx-hardis](https://hardisgroupcom.github.io/s
|
|
|
1271
1271
|
for (const ownedAsset of SFDX_HARDIS_OWNED_DOC_ASSETS) {
|
|
1272
1272
|
await fs.copy(path.join(PACKAGE_ROOT_DIR, 'defaults/mkdocs-project-doc/docs', ownedAsset), path.join(process.cwd(), 'docs', ownedAsset), { overwrite: true });
|
|
1273
1273
|
}
|
|
1274
|
-
// gtag.js carries the measurement id of the project, so it is not an owned asset: rewriting
|
|
1275
|
-
// it would throw away an id someone configured. A project that never set one still calls
|
|
1276
|
-
// googletagmanager.com on every page load with the placeholder, which the current default now
|
|
1277
|
-
// guards against, so that file is refreshed only while it still declares the placeholder.
|
|
1278
|
-
const projectGtagFile = path.join(process.cwd(), "docs", "javascripts", "gtag.js");
|
|
1279
|
-
if (fs.existsSync(projectGtagFile) && /gtag_id\s*=\s*"G-XXXXXXXXXX"/.test(await fs.readFile(projectGtagFile, "utf8"))) {
|
|
1280
|
-
await fs.copy(path.join(PACKAGE_ROOT_DIR, "defaults/mkdocs-project-doc/docs/javascripts/gtag.js"), projectGtagFile, { overwrite: true });
|
|
1281
|
-
}
|
|
1282
1274
|
const docLabels = {
|
|
1283
1275
|
filterTableRows: t('docJsFilterTableRows'),
|
|
1284
1276
|
filterRowsPlaceholder: t('docJsFilterRowsPlaceholder'),
|
|
@@ -1321,7 +1313,6 @@ The free [Salesforce DevOps with sfdx-hardis](https://hardisgroupcom.github.io/s
|
|
|
1321
1313
|
"https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.12/jstree.min.js",
|
|
1322
1314
|
"https://cdnjs.cloudflare.com/ajax/libs/tablesort/5.2.1/tablesort.min.js",
|
|
1323
1315
|
"javascripts/tables.js",
|
|
1324
|
-
"javascripts/gtag.js",
|
|
1325
1316
|
"javascripts/jstree-handler.js",
|
|
1326
1317
|
// Labels first: the script below reads them
|
|
1327
1318
|
SFDX_HARDIS_DOC_LABELS_JS,
|
|
@@ -1334,6 +1325,9 @@ The free [Salesforce DevOps with sfdx-hardis](https://hardisgroupcom.github.io/s
|
|
|
1334
1325
|
}
|
|
1335
1326
|
}
|
|
1336
1327
|
mkdocsYml.extra_javascript = extraJavascript;
|
|
1328
|
+
// Analytics used to be a gtag.js copied into the project, which never counted the page a
|
|
1329
|
+
// reader landed on. The id moves to extra.analytics, where the theme reads it.
|
|
1330
|
+
await migrateGtagJsToMkDocsAnalytics(process.cwd(), mkdocsYml);
|
|
1337
1331
|
// Add missing CSS if necessary
|
|
1338
1332
|
const allCss = [
|
|
1339
1333
|
"https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.12/themes/default/style.min.css",
|