Skip to content

Commit

Permalink
upgrade angular to 14
Browse files Browse the repository at this point in the history
  • Loading branch information
kiedd committed Jan 6, 2023
1 parent 1f6edcb commit dc2be21
Show file tree
Hide file tree
Showing 7 changed files with 3,248 additions and 3,159 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
npm-debug.log
testem.log
/typings
/.angular

# e2e
/e2e/*.js
Expand Down
4 changes: 3 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@
}
}
},
"defaultProject": "angular-archwizard"
"cli": {
"analytics": false
}
}
67 changes: 37 additions & 30 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,43 @@

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular', 'detectBrowsers'],
basePath: "",
frameworks: ["jasmine", "@angular-devkit/build-angular", "detectBrowsers"],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-firefox-launcher'),
require('karma-safari-launcher'),
require('karma-detect-browsers'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-firefox-launcher"),
require("karma-safari-launcher"),
require("karma-detect-browsers"),
require("karma-jasmine-html-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
coverageReporter: {
dir: require('path').join(__dirname, './coverage'),
subdir: '.',
dir: require("path").join(__dirname, "./coverage"),
subdir: ".",
reporters: [
{ type: 'html' },
{ type: 'text-summary' },
{ type: 'lcovonly' }
{ type: "html" },
{ type: "text-summary" },
{ type: "lcovonly" },
],
fixWebpackSourcePaths: true,
thresholds: {
statements: 80,
lines: 80,
branches: 80,
functions: 80
}
functions: 80,
},
},
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
base: "ChromeHeadless",
flags: ["--no-sandbox"],
},
ChromiumHeadlessNoSandbox: {
base: 'ChromiumHeadless',
flags: ['--no-sandbox']
}
base: "ChromiumHeadless",
flags: ["--no-sandbox"],
},
},
detectBrowsers: {
// enable/disable, default is true
Expand All @@ -52,23 +52,30 @@ module.exports = function (config) {
preferHeadless: true,

postDetection: function (availableBrowsers) {
// Replace IE with emulated IE9
if (availableBrowsers.includes("IE")) {
const index = availableBrowsers.indexOf("IE");

availableBrowsers.splice(index, 1);
}

// ChromeHeadless -> ChromeHeadlessNoSandbox
if (availableBrowsers.includes('ChromeHeadless')) {
const index = availableBrowsers.indexOf('ChromeHeadless');
if (availableBrowsers.includes("ChromeHeadless")) {
const index = availableBrowsers.indexOf("ChromeHeadless");

availableBrowsers[index] = 'ChromeHeadlessNoSandbox';
availableBrowsers[index] = "ChromeHeadlessNoSandbox";
}

// ChromiumHeadless -> ChromiumHeadlessNoSandbox
if (availableBrowsers.includes('ChromiumHeadless')) {
const index = availableBrowsers.indexOf('ChromiumHeadless');
if (availableBrowsers.includes("ChromiumHeadless")) {
const index = availableBrowsers.indexOf("ChromiumHeadless");

availableBrowsers[index] = 'ChromiumHeadlessNoSandbox';
availableBrowsers[index] = "ChromiumHeadlessNoSandbox";
}

return availableBrowsers;
}
},
},
singleRun: true
singleRun: true,
});
};
Loading

0 comments on commit dc2be21

Please sign in to comment.