Skip to content

Commit

Permalink
Merge pull request #910 from help-me-mom/renovate/root/puppeteer-21.x
Browse files Browse the repository at this point in the history
chore(deps): update dependency puppeteer to v21
  • Loading branch information
satanTime authored Nov 18, 2023
2 parents b44a49b + eacd4c9 commit 5f308f2
Show file tree
Hide file tree
Showing 14 changed files with 233 additions and 158 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
name: Install
command: |
if [ ! -d "./node_modules/" ]; then
npm ci --no-optional --ignore-scripts && \
node ./node_modules/puppeteer/install.js && \
npm install --no-audit && \
node ./node_modules/puppeteer/install.mjs && \
./node_modules/.bin/ngcc
fi
- save_cache:
Expand Down
18 changes: 18 additions & 0 deletions .codesandbox/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"setupTasks": [
{
"name": "Install Dependencies",
"command": "npm install"
}
],
"tasks": {
"start": {
"name": "start",
"command": "npm run start",
"runAtStart": true,
"preview": {
"port": 9876
}
}
}
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.13.0
20.9.0
20 changes: 18 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
"outputPath": "dist/ng-mocks-sandbox",
"index": "index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts",
"zone.js",
"zone.js/testing",
"jasmine-core/lib/jasmine-core/jasmine.js",
"jasmine-core/lib/jasmine-core/jasmine-html.js",
"jasmine-core/lib/jasmine-core/boot0.js",
"jasmine-core/lib/jasmine-core/boot1.js"
],
"tsConfig": "tsconfig.json",
"styles": ["./node_modules/jasmine-core/lib/jasmine-core/jasmine.css"]
}
Expand All @@ -31,7 +39,15 @@
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts",
"zone.js",
"zone.js/testing",
"jasmine-core/lib/jasmine-core/jasmine.js",
"jasmine-core/lib/jasmine-core/jasmine-html.js",
"jasmine-core/lib/jasmine-core/boot0.js",
"jasmine-core/lib/jasmine-core/boot1.js"
],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js"
}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ export NVM_DIR="$HOME/.nvm" && \. "$NVM_DIR/nvm.sh"
docker-compose up -- core && \
nvm install && \
nvm use && \
node ./node_modules/puppeteer/install.js
node ./node_modules/puppeteer/install.mjs

docker-compose down --remove-orphans
20 changes: 13 additions & 7 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html

process.env.CHROME_BIN = require('puppeteer').executablePath();
if (process.env.CSB === undefined) {
process.env.CHROME_BIN = require('puppeteer').executablePath();
}

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('@angular-devkit/build-angular/plugins/karma'),
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-ie-launcher'),
require('karma-jasmine'),
require('karma-junit-reporter'),
require('karma-jasmine-html-reporter'),
require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
Expand All @@ -35,12 +38,15 @@ module.exports = function (config) {
outputFile: 'specs-junit.xml',
useBrowserName: false,
},
reporters: process.env.WITH_COVERAGE === undefined ? ['dots'] : ['junit'],
reporters:
process.env.CSB === undefined && process.env.WITH_COVERAGE !== undefined ? ['junit'] : ['kjhtml', 'dots'],
hostname: undefined,
listenAddress: process.env.CSB === undefined ? 'localhost' : '0.0.0.0',
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: false,
browsers: ['ChromeCi'],
singleRun: true,
autoWatch: process.env.CSB !== undefined,
browsers: process.env.CSB === undefined ? ['ChromeCi'] : [],
singleRun: process.env.CSB === undefined,
});
};
Loading

0 comments on commit 5f308f2

Please sign in to comment.