Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Angular to 14 #389

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x, 15.x]
node-version: [16.x, 18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

name: Test and Build with node.js ${{ matrix.node-version }}
Expand All @@ -26,4 +26,4 @@ jobs:
run: |
npm ci
npm test
npm build
npm run build
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "12.x"
node-version: "18.x"
- name: Run Tests
run: |
npm ci
Expand Down
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
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"tabWidth": 2,
"singleQuote": true,
"useTabs": false
}
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
}
}
25 changes: 16 additions & 9 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,33 @@ module.exports = function (config) {
require('karma-detect-browsers'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma'),
],
coverageReporter: {
dir: require('path').join(__dirname, './coverage'),
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' },
{ type: 'lcovonly' }
{ type: 'lcovonly' },
],
fixWebpackSourcePaths: true,
thresholds: {
statements: 80,
lines: 80,
branches: 80,
functions: 80
}
functions: 80,
},
},
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
flags: ['--no-sandbox'],
},
ChromiumHeadlessNoSandbox: {
base: 'ChromiumHeadless',
flags: ['--no-sandbox']
}
flags: ['--no-sandbox'],
},
},
detectBrowsers: {
// enable/disable, default is true
Expand All @@ -52,6 +52,13 @@ module.exports = function (config) {
preferHeadless: true,

postDetection: function (availableBrowsers) {
// remove IE if detected
if (availableBrowsers.includes('IE')) {
const index = availableBrowsers.indexOf('IE');

availableBrowsers.splice(index, 1);
}

// ChromeHeadless -> ChromeHeadlessNoSandbox
if (availableBrowsers.includes('ChromeHeadless')) {
const index = availableBrowsers.indexOf('ChromeHeadless');
Expand All @@ -67,8 +74,8 @@ module.exports = function (config) {
}

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