From fab4ba286dfae59e68449f72d34aadaca7f0dc70 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Sat, 10 Sep 2022 02:35:56 -0700 Subject: [PATCH] ci: [Bug] Web based karma tests are no longer running #1135 (#1137) Co-authored-by: Daniel Dyla Co-authored-by: Valentin Marchaud --- karma.conf.js | 21 +-------------------- package.json | 15 ++++++--------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 133e22df63..edcd9f055f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,5 +1,5 @@ /*! - * Copyright The OpenTelemetry Authors + * Copyright 2020, OpenTelemetry Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,10 @@ * limitations under the License. */ -const webpack = require('webpack'); - const karmaWebpackConfig = require('../../karma.webpack'); const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { - { - const plugins = karmaWebpackConfig.plugins = []; - plugins.push(new webpack.ProvidePlugin({ - process: 'process/browser', - })); - } - - { - const plugins = karmaBaseConfig.plugins = []; - const toAdd = Object.keys(require('./package.json').devDependencies) - .filter((packageName) => packageName.startsWith('karma-')) - .map((packageName) => require(packageName)); - plugins.push( - ...toAdd - ); - } - config.set(Object.assign({}, karmaBaseConfig, { webpack: karmaWebpackConfig })) diff --git a/package.json b/package.json index cef8e11b4d..a2b25c8d37 100644 --- a/package.json +++ b/package.json @@ -48,28 +48,25 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/webpack-env": "1.16.2", - "assert": "2.0.0", "gts": "3.1.0", - "karma": "6.3.17", - "karma-chrome-launcher": "3.1.1", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.33", - "karma-webpack": "5.0.0", + "karma-spec-reporter": "0.0.32", + "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "process": "0.11.10", "rimraf": "3.0.2", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.3.5", - "webpack": "5.72.0", - "webpack-cli": "4.9.2" + "webpack": "4.46.0" }, "dependencies": { "@opentelemetry/core": "^1.0.0"