Skip to content

Commit

Permalink
fix: update node engines to 18+, CI to test 18, 20, update eslint-con…
Browse files Browse the repository at this point in the history
…fig and eslint errors (#20)
  • Loading branch information
shazron authored Jan 8, 2024
1 parent 65c03a4 commit e30a7fd
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [18.x, 20.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-push-publish-to-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- run: npm install
- run: npm test
- uses: JS-DevTools/npm-publish@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
git config user.email github-actions@github.com
- uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- run: |
npm install
npm test
- name: Update your package.json with an npm pre-release version
id: pre-release-version
uses: adobe/update-prerelease-npm-version@v1.0.0
uses: adobe/update-prerelease-npm-version@v1.1.0
with:
pre-release-tag: ${{ github.event.inputs.pre-release-tag }}
dependencies-to-update: ${{ github.event.inputs.dependencies-to-update }}
Expand Down
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,29 @@
"splunk-logging": "^0.11.1"
},
"devDependencies": {
"@adobe/eslint-config-aio-lib-config": "^1.4.0",
"@adobe/eslint-config-aio-lib-config": "^2.0.2",
"babel-runtime": "^6.26.0",
"eslint": "^7.32.0",
"eslint": "^8.56.0",
"eslint-config-oclif": "^1",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^23.20.0",
"eslint-plugin-jsdoc": "^37.9.7",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.1",
"eslint-plugin-jsdoc": "^42.0.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^4.0.1",
"execa": "^4.0.2",
"jest": "^26.6.3",
"jest": "^29",
"jest-fetch-mock": "^3.0.0",
"jest-junit": "^13.0.0",
"jest-plugin-fs": "^2.9.0",
"oclif": "^3.2.0",
"stdout-stderr": "^0.1.9"
"stdout-stderr": "^0.1.9",
"typescript": "^5.3.3"
},
"engines": {
"node": "^14.18 || ^16.13 || >=18"
"node": ">=18"
},
"files": [
"/npm-shrinkwrap.json",
Expand Down
10 changes: 5 additions & 5 deletions src/telemetry-lib.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ async function trackEvent (eventType, eventData = '') {
headers: fetchHeaders,
body: JSON.stringify({
id: Math.floor(timestamp * Math.random()),
timestamp: timestamp,
timestamp,
_adobeio: {
eventType: eventType,
eventData: eventData,
eventType,
eventData,
cliVersion: rootCliVersion,
clientId: clientId,
clientId,
command: prerunEvent.command,
commandDuration: timestamp - prerunEvent.start,
commandFlags: prerunEvent.flags.toString(),
commandSuccess: eventType !== 'command-error',
nodeVersion: process.version,
osNameVersion: osNameVersion
osNameVersion
}
})
}
Expand Down

0 comments on commit e30a7fd

Please sign in to comment.