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
33 changes: 23 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,32 @@ on:
branches: [ master ]

jobs:
build:

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 22
cache: pnpm
- run: pnpm install
- run: pnpm lint

build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [20.x, 22.x, 24.x]

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --frozen-lockfile
- run: yarn lint:js
- run: yarn test
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: pnpm
- run: pnpm install
- run: pnpm dlx puppeteer browsers install chrome
- run: pnpm test
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

5 changes: 4 additions & 1 deletion lib/gather/gather-single-telemetry.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
const puppeteer = require('puppeteer');
const { setTelemetryWithKey } = require('../utils/telemetry');

const DEFAULT_PUPPETEER_ARGS = { ignoreHTTPSErrors: true };
const DEFAULT_PUPPETEER_ARGS = {
ignoreHTTPSErrors: true,
args: ['--no-sandbox', '--disable-setuid-sandbox'],
};

module.exports = async function gatherSingleTelemetry(url, options = {}, gatherFn, ...args) {
const browser = await puppeteer.launch(DEFAULT_PUPPETEER_ARGS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const { getTelemetry } = require('../utils/telemetry');
const APP_TIMEOUT = 100000;
const TELEMETRY_KEY = 'single-telemetry';

import { describe, beforeAll, test, afterAll, expect } from 'vitest';

function resolverWithoutArgs() {
return { foo: 'bar' };
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const { getTelemetry } = require('../utils/telemetry');
const analyzeEmberObject = require('../gather/analyze-ember-object');
const APP_TIMEOUT = 100000;

import { describe, test, beforeAll, afterAll, expect } from 'vitest';

function helper(possibleEmberObject) {
if (
possibleEmberObject &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const { getModulePathFor } = require('./get-module-path-for');

import { describe, test, expect } from 'vitest';

describe('getModulePathFor', () => {
const addonPaths = {
'/User/whomever/some-app/lib/special-sauce': 'special-sauce',
Expand Down
2 changes: 2 additions & 0 deletions lib/utils/telemetry.test.js → lib/utils/telemetry.test.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const { getTelemetry, setTelemetry, setTelemetryWithKey, getTelemetryFor } = require('./telemetry');

import { describe, test, expect } from 'vitest';

describe('get/set Telemetry', () => {
test('can get the set telemetry', () => {
let fakeTelemetry = {
Expand Down
17 changes: 7 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
],
"main": "lib/index.js",
"scripts": {
"lint:js": "eslint .",
"test": "jest . --verbose --no-watchman --runInBand --forceExit"
"lint": "eslint .",
"test": "vitest --no-file-parallelism"
},
"jest": {
"testEnvironment": "node"
},
"dependencies": {
"fs-extra": "^8.1.0",
"git-repo-info": "^2.1.0",
"puppeteer": "^15.3.2",
"puppeteer": "^24.22.0",
"sync-disk-cache": "^1.3.3",
"walk-sync": "^2.0.2"
},
Expand All @@ -30,13 +30,13 @@
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-prettier": "^3.1.1",
"execa": "^2.1.0",
"jest": "^24.9.0",
"prettier": "^1.18.2",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0"
"release-it-lerna-changelog": "^3.1.0",
"vitest": "^3.2.4"
},
"engines": {
"node": "10.* || >= 12.*"
"node": "20.* || 22.* || >= 24.*"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand All @@ -56,8 +56,5 @@
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "12.21.0",
"yarn": "1.22.10"
}
"packageManager": "[email protected]+sha512.fce8a3dd29a4ed2ec566fb53efbb04d8c44a0f05bc6f24a73046910fb9c3ce7afa35a0980500668fa3573345bd644644fa98338fa168235c80f4aa17aa17fbef"
}
Loading