Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
os:
- ubuntu-latest
node:
- 18.x
- 20.x
- 22.x
connect-version:
- preview
# This version is the first Docker image that has R 4.3, which the
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
node-version: 22.x
- run: npm install
- run: npm run build
- run: printf '//registry.npmjs.org/:_authToken=%s\n' "${NPM_AUTH_TOKEN}" | tee .npmrc
Expand Down
14,601 changes: 4,394 additions & 10,207 deletions package-lock.json

Large diffs are not rendered by default.

29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,27 @@
"test": "jest"
},
"devDependencies": {
"@tsconfig/node16": "^1.0.3",
"@types/jest": "^29.5.12",
"@types/node": "^14.18.36",
"@tsconfig/node22": "^22.0.1",
"@types/jest": "^29.5.14",
"@types/node": "^22.15.21",
"babel-jest": "^29.7.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.5",
"ts-node": "^9.1.1",
"ts-standard": "^9.0.0",
"typescript": "^4.9.5"
"ts-jest": "^29.4.0",
"ts-node": "^10.9.2",
"ts-standard": "^12.0.2",
"typescript": "^5.8.3"
},
"dependencies": {
"@types/lodash": "^4.17.5",
"@types/qs": "^6.9.15",
"@types/tar": "^6.1.13",
"@types/lodash": "^4.17.16",
"@types/qs": "^6.14.0",
"@types/tmp": "^0.2.6",
"@types/tough-cookie": "^4.0.5",
"tough-cookie": "^4.1.4",
"axios": "^1.7.2",
"axios-cookiejar-support": "^5.0.2",
"tough-cookie": "^5.1.2",
"axios": "^1.9.0",
"axios-cookiejar-support": "^5.0.3",
"lodash": "^4.17.21",
"qs": "^6.12.1",
"tar": "^6.2.1",
"qs": "^6.14.0",
"tar": "^7.4.3",
"tmp": "^0.2.3"
}
}
4 changes: 2 additions & 2 deletions src/ApplicationPather.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ export class ApplicationPather {
)
return inSlashes
.replace(/\.\//g, '/')
.replace(new RegExp('( +|[^-_a-z0-9/])', 'ig'), '_')
.replace(/( +|[^-_a-z0-9/])/ig, '_')
.replace(/\/\//g, '/')
.replace(/\/_+/, '/_')
}

private pathFromGitRemoteURL (gitRemoteURL: string): string {
let rawURL = gitRemoteURL
if (gitRemoteURL.match(new RegExp('[^/]+:[^/]+')) !== null) {
if (gitRemoteURL.match(/[^/]+:[^/]+/) !== null) {
rawURL = 'ssh://' + gitRemoteURL.replace(/:/, '/')
}

Expand Down
2 changes: 1 addition & 1 deletion src/Bundler.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path'
import tar from 'tar'
import * as tar from 'tar'

import { Bundle } from './Bundle'
import { Manifest } from './Manifest'
Expand Down
2 changes: 1 addition & 1 deletion src/Deployer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export class Deployer {
throw err
}

return this.findExistingContentByName(name)
return await this.findExistingContentByName(name)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This await here caught my attention, there is an odd mix of async/await and then/catch in this method. Not specific to this PR, since seem to be a past practice in many places in this repo.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created a separate issue for this #50. I'll delegate this to Claude later.

})
}

Expand Down
4 changes: 2 additions & 2 deletions src/Environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class Environment extends Map {
}
}

public loadFileEnv (): string|null {
public loadFileEnv (): string | null {
const candidateFiles = [
process.env.CONNECT_ENV_FILE
].concat(Environment.CANDIDATE_FILES)
Expand All @@ -47,7 +47,7 @@ export class Environment extends Map {
`candidates=${JSON.stringify(candidateFiles)}`
].join(' '))

let envFile: string|null = null
let envFile: string | null = null

for (const candidateFile of candidateFiles) {
if (candidateFile === undefined) {
Expand Down
2 changes: 1 addition & 1 deletion src/ListContentPager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class ListContentPager {
let n = 0
for (const item of result.content) {
if (n >= maxRecords) {
debugLog(() => `ListContentPager: breaking at max records limit ${(maxRecords as number).toString()}`)
debugLog(() => `ListContentPager: breaking at max records limit ${(maxRecords).toString()}`)
return n
}
n++
Expand Down
6 changes: 4 additions & 2 deletions src/main.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export { APIClient, APIClientConfiguration } from './APIClient'
export { APIClient } from './APIClient'
export type { APIClientConfiguration } from './APIClient'
export { ApplicationPather } from './ApplicationPather'
export { ClientTaskPoller } from './ClientTaskPoller'
export { Deployer, DeployTaskResponse } from './Deployer'
export { Deployer } from './Deployer'
export type { DeployTaskResponse } from './Deployer'
export { Environment } from './Environment'
export { EnvironmentUpdater } from './EnvironmentUpdater'
export { ListContentPager } from './ListContentPager'
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"compilerOptions": {
"declaration": true,
"isolatedModules": true,
// NOTE: the inclusion of "dom" here is a bit misleading, as
// only the URL and URLSearchParams types are required, and
// haven't yet been extracted into a common DOM/Node group of
// types.
"lib": ["es2019", "es2020.promise", "es2020.bigint", "es2020.string", "dom"],
"lib": ["es2022", "dom"],
"outDir": "./lib",
"resolveJsonModule": true
},
"exclude": ["node_modules", "__tests__/**/*.spec.ts", ".cache/**/*", "lib/**/*"],
"extends": "@tsconfig/node16/tsconfig.json"
"extends": "@tsconfig/node22/tsconfig.json"
}