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
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
id: versions

- name: Set up node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: ${{ steps.versions.outputs.node-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
id: versions

- name: Set up node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: ${{ steps.versions.outputs.node-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
id: versions

- name: Set up node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: ${{ steps.versions.outputs.node-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
id: versions

- name: Set up node
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: ${{ steps.versions.outputs.node-version }}
registry-url: https://registry.npmjs.org
Expand Down
2 changes: 1 addition & 1 deletion cypress/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "../tsconfig.json",
"include": ["../lib/**/*.ts", "./**/*.ts"],
"include": ["./**/*.ts"],
"compilerOptions": {
"types": ["cypress", "node"],
"lib": ["ES2022", "DOM", "DOM.Iterable"],
Expand Down
9 changes: 6 additions & 3 deletions lib/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { XMLParser } from 'fast-xml-parser'
import { User } from './User'

const SERVER_IMAGE = 'ghcr.io/nextcloud/continuous-integration-shallow-server'
const VENDOR_APPS = {
const VENDOR_APPS: Record<string, string> = {
text: 'https://github.com/nextcloud/text.git',
viewer: 'https://github.com/nextcloud/viewer.git',
notifications: 'https://github.com/nextcloud/notifications.git',
Expand Down Expand Up @@ -204,7 +204,7 @@ export async function startNextcloud(branch = 'master', mountApp: boolean|string
const pullImage = function() {
// Pulling images
console.log('\nPulling images… ⏳')
return new Promise((resolve, reject) => docker.pull(SERVER_IMAGE, (_err, stream: Stream) => {
return new Promise((resolve, reject) => docker.pull(SERVER_IMAGE, (_: unknown, stream: Stream) => {
const onFinished = function(err: Error | null) {
if (!err) {
return resolve(true)
Expand Down Expand Up @@ -355,7 +355,10 @@ export const getContainerIP = async function(
tries++

await container.inspect((_err, data) => {
ip = data?.NetworkSettings?.IPAddress || ''
ip = data?.NetworkSettings?.Networks?.default?.IPAddress
// @ts-expect-error -- fallback to legacy network settings
|| data?.NetworkSettings?.IPAddress
|| ''
})

if (ip !== '') {
Expand Down
20 changes: 20 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"exports": {
"./commands": {
"types": "./dist/commands/index.d.ts",
"import": "./dist/commands/index.cjs",
"require": "./dist/commands/index.cjs"
"import": "./dist/commands.mjs",
"require": "./dist/commands.cjs"
},
"./selectors": {
"types": "./dist/selectors/index.d.ts",
"import": "./dist/selectors/index.cjs",
"require": "./dist/selectors/index.cjs"
"import": "./dist/selectors.mjs",
"require": "./dist/selectors.cjs"
},
"./docker": {
"types": "./dist/docker.d.ts",
Expand Down Expand Up @@ -63,7 +63,7 @@
],
"scripts": {
"build": "vite --mode production build",
"build:doc": "typedoc --tsconfig cypress/tsconfig.json --out dist/doc lib/commands lib/selectors lib && touch dist/doc/.nojekyll",
"build:doc": "typedoc --out dist/doc lib/commands lib/selectors/index.ts lib && touch dist/doc/.nojekyll",
"build:instrumented": "vite --mode instrumented build",
"cypress": "npm run cypress:e2e && npm run cypress:component",
"cypress:e2e": "cypress run --e2e",
Expand All @@ -87,6 +87,7 @@
"@playwright/test": "^1.61.1",
"@types/cypress": "^1.1.6",
"@types/dockerode": "^4.0.1",
"@types/wait-on": "^5.3.4",
"cypress": "^15.18.0",
"nyc": "^18.0.0",
"rollup-plugin-istanbul": "^5.0.0",
Expand Down
6 changes: 5 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"ES2024",
"DOM"
],
"rootDir": ".",
"types": [
"cypress",
"node"
],
"rootDir": "lib",
"outDir": "./dist",
"target": "esnext",
"module": "esnext",
Expand Down
Loading