Skip to content

Commit

Permalink
Cleaned up a lot of scripts in package.json, upgraded package depende…
Browse files Browse the repository at this point in the history
…ncies & regenerated package-lock.json, tweaked config in .prettierrc
  • Loading branch information
jongpie committed Apr 27, 2024
1 parent 82331b4 commit 34673af
Show file tree
Hide file tree
Showing 12 changed files with 33,597 additions and 24,607 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
run: npm run test:apex:nocoverage -- --synchronous

- name: 'Delete Base Scratch Org'
run: npm run org:delete:noprompt
run: sf org delete scratch --no-prompt
if: ${{ always() }}

experience-cloud-scratch-org-tests:
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
flags: Apex

- name: 'Delete Experience Cloud Scratch Org'
run: npm run org:delete:noprompt
run: sf org delete scratch --no-prompt
if: ${{ always() }}

create-managed-package-beta:
Expand Down
8 changes: 2 additions & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@
"plugins": ["prettier-plugin-apex", "@prettier/plugin-xml"],
"overrides": [
{
"files": "*.{cls, apex}",
"files": "*.{apex,cls,trigger}",
"options": { "parser": "apex" }
},
{
"files": "**/lwc/**/*.html",
"options": { "parser": "lwc" }
},
{
"files": "*.{cmp,page,component}",
"files": "*.{cmp,page}",
"options": { "parser": "html" }
},
{
"files": "*.{md}",
"options": { "parser": "markdown" }
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<isFilteringDisabled>false</isFilteringDisabled>
<isNameField>false</isNameField>
<isSortingDisabled>false</isSortingDisabled>
<label>LoggedByFederationIdentifier</label>
<label>User Federation Identifier</label>
<length>512</length>
<type>LongTextArea</type>
<visibleLines>3</visibleLines>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,11 @@ private class LogEntryEventHandler_Tests {
System.Assert.areEqual(logEntryEvent.AsyncContextTriggerId__c, log.AsyncContextTriggerId__c, 'log.AsyncContextTriggerId__c was not properly set');
System.Assert.areEqual(logEntryEvent.AsyncContextType__c, log.AsyncContextType__c, 'log.AsyncContextTriggerId__c was not properly set');
System.Assert.areEqual(logEntryEvent.Locale__c, log.Locale__c, 'log.Locale__c was not properly set');
System.Assert.areEqual(logEntryEvent.LoggedByFederationIdentifier__c, log.LoggedByFederationIdentifier__c, 'log.LoggedByFederationIdentifier__c was not properly set');
System.Assert.areEqual(
logEntryEvent.LoggedByFederationIdentifier__c,
log.LoggedByFederationIdentifier__c,
'log.LoggedByFederationIdentifier__c was not properly set'
);
System.Assert.areEqual(logEntryEvent.LoggedById__c, log.LoggedBy__c, 'log.LoggedBy__c was not properly set');
System.Assert.areEqual(logEntryEvent.LoggedByUsername__c, log.LoggedByUsername__c, 'log.LoggedByUsername__c was not properly set');
System.Assert.areEqual(logEntryEvent.LoggerVersionNumber__c, log.LoggerVersionNumber__c, 'log.LoggerVersionNumber__c was not properly set');
Expand Down
57,984 changes: 33,571 additions & 24,413 deletions package-lock.json

Large diffs are not rendered by default.

76 changes: 16 additions & 60 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,18 @@
"scripts": {
"apex:tail:log": "sf apex tail log --color",
"apex:tail:log:file": "sh scripts/build/tail-log-to-file.sh",
"devhub:details": "pwsh ./scripts/build/get-devhub-org-details.ps1",
"devhub:limits": "pwsh ./scripts/build/get-devhub-org-limits.ps1",
"devhub:open": "pwsh ./scripts/build/open-devhub-org.ps1",
"docs:fix": "npm run docs:fix:apex && npm run docs:fix:lwc",
"docs:fix:apex": "pwsh ./scripts/build/generate-apex-docs.ps1 && git add ./docs/apex",
"docs:fix:lwc": "pwsh ./scripts/build/generate-lwc-docs.ps1 && git add ./docs/lightning-components",
"docs:verify": "pwsh ./scripts/build/verify-docs-up-to-date.ps1",
"experience:create": "sf community create --name \"Logger Test Site\" --template-name \"Customer Service\" --url-path-prefix logger --description \"Logger Test Site\"",
"experience:deploy": "sf project deploy start --source-dir ./config/experience-cloud --wait 30",
"husky:pre-commit": "lint-staged --config ./config/linters/lint-staged.config.js",
"org:create:base": "pwsh ./scripts/build/create-scratch-org.ps1 -definitionfile ./config/scratch-orgs/base-scratch-def.json && npm run org:debug:enable",
"org:create:experience-cloud": "pwsh ./scripts/build/create-scratch-org.ps1 -definitionfile ./config/scratch-orgs/experience-cloud-scratch-def.json && sfdx force:apex:execute --apexcodefile ./scripts/build/enable-debug-mode.apex",
"org:delete": "sf org delete scratch --json",
"org:debug:enable": "sf apex run --file ./scripts/build/enable-debug-mode.apex",
"org:delete:noprompt": "sf org delete scratch --json --no-prompt",
"org:details": "sf org display --json --verbose",
"org:open": "sf org open",
"org:open:chrome": "sf org open --browser chrome",
"org:open:firefox": "sf org open --browser firefox",
"lightning:debug:enable": "sf apex run --file ./scripts/build/enable-debug-mode.apex",
"package:version:create:managed": "pwsh ./scripts/build/create-managed-package-beta-version.ps1",
"package:version:create:unlocked": "sf package version create --json --package \"Nebula Logger - Core\" --skip-ancestor-check --code-coverage --installation-key-bypass --wait 30",
"package:version:number:fix": "pwsh ./scripts/build/sync-package-version-number.ps1",
"package:version:number:verify": "pwsh ./scripts/build/validate-current-package-version-number.ps1",
"permset:assign": "npm run permset:assign:admin && npm run permset:assign:big-object-admin && npm run permset:assign:recipes-admin && npm run permset:assign:slack-admin",
"permset:assign:all": "npm run permset:assign:admin && npm run permset:assign:big-object-admin && npm run permset:assign:recipes-admin && npm run permset:assign:slack-admin",
"permset:assign:admin": "sf org assign permset --name LoggerAdmin",
"permset:assign:big-object-admin": "sf org assign permset --name LoggerLogEntryArchiveAdmin",
"permset:assign:recipes-admin": "sf org assign permset --name LoggerRecipesAdmin",
Expand All @@ -77,67 +65,35 @@
"sf:plugins:link:bummer": "npx sf plugins link ./node_modules/@jongpie/sfdx-bummer-plugin",
"sf:plugins:link:prettier": "npx sf plugins link ./node_modules/@jayree/sfdx-plugin-prettier",
"sf:plugins:link:scanner": "npx sf plugins link ./node_modules/@salesforce/sfdx-scanner",
"source:deploy": "sf project deploy start --source-dir ./nebula-logger/ --wait 30",
"source:deploy:core": "sf project deploy start --source-dir ./nebula-logger/core --wait 30",
"source:push": "sf project deploy start --ignore-conflicts",
"source:push:test": "npm run source:push && npm run test:apex",
"test": "npm run test:lwc && npm run test:apex",
"test:apex": "npm run test:apex:nocoverage -- --code-coverage --detailed-coverage",
"test:apex:nocoverage": "npx sf apex run test --test-level RunLocalTests --wait 30 --result-format human --output-dir ./test-coverage/apex",
"test:apex:suites": "npx sf apex run test --suite-names LoggerCore,LoggerExtraTests --wait 30 --result-format human --code-coverage --detailed-coverage --output-dir ./tests/apex",
"test:apex:suite": "npx sf apex run test --suite-names LoggerCore --wait 30 --result-format human --code-coverage --detailed-coverage --output-dir ./tests/apex",
"test:lwc": "sf force lightning lwc test run --coverage",
"test:lwc:nocoverage": "sf force lightning lwc test run",
"test:nocoverage": "npm run test:lwc && npm run test:apex"
},
"dependencies": {
"@xmldom/xmldom": ">=0.8.4",
"ansi-regex": ">=5.0.1",
"async": ">=2.6.4",
"ejs": ">=3.1.7",
"fast-xml-parser": ">=4.1.2",
"follow-redirects": ">=1.14.8",
"glob-parent": ">=5.1.2",
"got": ">=11.8.5",
"http-cache-semantics": ">=4.1.1",
"json-schema": ">=0.4.0",
"json5": ">=2.2.2",
"jsonwebtoken": ">=9.0.0",
"markdown-it": ">=12.3.2",
"marked": ">=4.0.10",
"minimatch": ">=3.0.5",
"moment": ">=2.29.4",
"nanoid": ">=3.1.31",
"shelljs": ">=0.8.5",
"simple-get": ">=4.0.1",
"tough-cookie": ">=4.1.3",
"vm2": ">=3.9.18",
"word-wrap": ">=1.2.4",
"xml2js": ">=0.5.0"
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@babel/core": "7.24.4",
"@babel/eslint-parser": "7.24.1",
"@cparra/apexdocs": "1.13.7",
"@jayree/sfdx-plugin-prettier": "^1.3.41",
"@jongpie/sfdx-bummer-plugin": "^0.0.20",
"@lwc/eslint-plugin-lwc": "^1.7.2",
"@prettier/plugin-xml": "^3.2.2",
"@salesforce/cli": "^2.24.4",
"@salesforce/eslint-config-lwc": "^3.5.2",
"@salesforce/eslint-plugin-lightning": "^1.0.0",
"@salesforce/sfdx-lwc-jest": "^3.1.1",
"@salesforce/sfdx-scanner": "^3.20.0",
"@prettier/plugin-xml": "^3.4.1",
"@salesforce/cli": "^2.38.7",
"@salesforce/eslint-config-lwc": "^3.5.3",
"@salesforce/sfdx-lwc-jest": "^5.0.0",
"@salesforce/sfdx-scanner": "^3.23.0",
"@types/jest-when": "^3.5.5",
"babel-eslint": "^10.1.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"husky": "^8.0.3",
"husky": "^9.0.11",
"jest-when": "^3.6.0",
"jsdoc-to-markdown": "^8.0.0",
"lint-staged": "^15.2.0",
"prettier": "^3.2.4",
"prettier-plugin-apex": "^2.0.1",
"jsdoc-to-markdown": "^8.0.1",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"prettier-plugin-apex": "^2.1.0",
"pwsh": "^0.3.0"
}
}
61 changes: 0 additions & 61 deletions scripts/build/create-scratch-org.ps1

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/build/get-devhub-org-details.ps1

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/build/get-devhub-org-limits.ps1

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/build/install-latest-released-unlocked-package-version.ps1

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/build/open-devhub-org.ps1

This file was deleted.

0 comments on commit 34673af

Please sign in to comment.