Skip to content

Commit b21aad5

Browse files
authored
Merge pull request #154 from VadimDez/feat/ng-17
Update to Feat/ng 17 & Ivy
2 parents cedac43 + 9b378c9 commit b21aad5

21 files changed

+10943
-12635
lines changed

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ indent_size = 2
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[*.ts]
12+
quote_type = single
13+
1114
[*.md]
1215
max_line_length = off
1316
trim_trailing_whitespace = false

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest]
17-
node-version: [12.x]
17+
node-version: [20.x]
1818

1919
steps:
2020
- uses: actions/checkout@v2

.gitignore

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
22

3-
# compiled output
3+
# Compiled output
44
/dist
55
/tmp
66
/out-tsc
7-
# Only exists if Bazel was run
87
/bazel-out
98

10-
# dependencies
9+
# Node
1110
/node_modules
12-
13-
# profiling files
14-
chrome-profiler-events*.json
15-
speed-measure-plugin*.json
11+
npm-debug.log
12+
yarn-error.log
1613

1714
# IDEs and editors
18-
/.idea
15+
.idea/
1916
.project
2017
.classpath
2118
.c9/
2219
*.launch
2320
.settings/
2421
*.sublime-workspace
2522

26-
# IDE - VSCode
23+
# Visual Studio Code
2724
.vscode/*
2825
!.vscode/settings.json
2926
!.vscode/tasks.json
3027
!.vscode/launch.json
3128
!.vscode/extensions.json
3229
.history/*
3330

34-
# misc
35-
/.sass-cache
31+
# Miscellaneous
32+
/.angular/cache
33+
.sass-cache/
3634
/connect.lock
3735
/coverage
3836
/libpeerconnection.log
39-
npm-debug.log
40-
yarn-error.log
4137
testem.log
4238
/typings
4339

44-
# System Files
40+
# System files
4541
.DS_Store
4642
Thumbs.db

angular.json

+36-76
Original file line numberDiff line numberDiff line change
@@ -15,113 +15,73 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-devkit/build-angular:application",
1919
"options": {
20-
"outputPath": "dist",
20+
"outputPath": "dist/ngx-filter-pipe",
2121
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
22+
"browser": "src/main.ts",
23+
"polyfills": ["zone.js"],
2424
"tsConfig": "tsconfig.app.json",
25-
"aot": false,
26-
"assets": [
27-
"src/favicon.ico",
28-
"src/assets"
29-
],
30-
"styles": [
31-
"src/styles.scss"
32-
],
25+
"inlineStyleLanguage": "scss",
26+
"assets": ["src/favicon.ico", "src/assets"],
27+
"styles": ["src/styles.scss"],
3328
"scripts": []
3429
},
3530
"configurations": {
3631
"production": {
37-
"fileReplacements": [{
38-
"replace": "src/environments/environment.ts",
39-
"with": "src/environments/environment.prod.ts"
40-
}],
41-
"optimization": true,
42-
"outputHashing": "all",
43-
"sourceMap": false,
44-
"extractCss": true,
45-
"namedChunks": false,
46-
"aot": true,
47-
"extractLicenses": true,
48-
"vendorChunk": false,
49-
"buildOptimizer": true,
50-
"budgets": [{
32+
"budgets": [
33+
{
5134
"type": "initial",
52-
"maximumWarning": "2mb",
53-
"maximumError": "5mb"
35+
"maximumWarning": "500kb",
36+
"maximumError": "1mb"
5437
},
5538
{
5639
"type": "anyComponentStyle",
57-
"maximumWarning": "6kb",
58-
"maximumError": "10kb"
40+
"maximumWarning": "2kb",
41+
"maximumError": "4kb"
5942
}
60-
]
43+
],
44+
"outputHashing": "all"
45+
},
46+
"development": {
47+
"optimization": false,
48+
"extractLicenses": false,
49+
"sourceMap": true
6150
}
62-
}
51+
},
52+
"defaultConfiguration": "production"
6353
},
6454
"serve": {
6555
"builder": "@angular-devkit/build-angular:dev-server",
66-
"options": {
67-
"browserTarget": "ngx-filter-pipe:build"
68-
},
6956
"configurations": {
7057
"production": {
71-
"browserTarget": "ngx-filter-pipe:build:production"
58+
"buildTarget": "ngx-filter-pipe:build:production"
59+
},
60+
"development": {
61+
"buildTarget": "ngx-filter-pipe:build:development"
7262
}
73-
}
63+
},
64+
"defaultConfiguration": "development"
7465
},
7566
"extract-i18n": {
7667
"builder": "@angular-devkit/build-angular:extract-i18n",
7768
"options": {
78-
"browserTarget": "ngx-filter-pipe:build"
69+
"buildTarget": "ngx-filter-pipe:build"
7970
}
8071
},
8172
"test": {
8273
"builder": "@angular-devkit/build-angular:karma",
8374
"options": {
84-
"main": "src/test.ts",
85-
"polyfills": "src/polyfills.ts",
75+
"polyfills": ["zone.js", "zone.js/testing"],
8676
"tsConfig": "tsconfig.spec.json",
87-
"karmaConfig": "karma.conf.js",
88-
"assets": [
89-
"src/favicon.ico",
90-
"src/assets"
91-
],
92-
"styles": [
93-
"src/styles.scss"
94-
],
95-
"scripts": []
96-
}
97-
},
98-
"lint": {
99-
"builder": "@angular-devkit/build-angular:tslint",
100-
"options": {
101-
"tsConfig": [
102-
"tsconfig.app.json",
103-
"tsconfig.spec.json",
104-
"e2e/tsconfig.json"
105-
],
106-
"exclude": [
107-
"**/node_modules/**"
108-
]
109-
}
110-
},
111-
"e2e": {
112-
"builder": "@angular-devkit/build-angular:protractor",
113-
"options": {
114-
"protractorConfig": "e2e/protractor.conf.js",
115-
"devServerTarget": "ngx-filter-pipe:serve"
116-
},
117-
"configurations": {
118-
"production": {
119-
"devServerTarget": "ngx-filter-pipe:serve:production"
120-
}
77+
"inlineStyleLanguage": "scss",
78+
"assets": ["src/favicon.ico", "src/assets"],
79+
"styles": ["src/styles.scss"],
80+
"scripts": [],
81+
"karmaConfig": "karma.conf.js"
12182
}
12283
}
12384
}
12485
}
125-
},
126-
"defaultProject": "ngx-filter-pipe"
86+
}
12787
}

karma.conf.js

+18-13
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,34 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
13-
require('@angular-devkit/build-angular/plugins/karma')
12+
require('karma-coverage'),
13+
require('@angular-devkit/build-angular/plugins/karma'),
1414
],
1515
client: {
16-
clearContext: false // leave Jasmine Spec Runner output visible in browser
16+
jasmine: {
17+
// you can add configuration options for Jasmine here
18+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
19+
// for example, you can disable the random execution with `random: false`
20+
// or set a specific seed with `seed: 4321`
21+
},
22+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
23+
},
24+
jasmineHtmlReporter: {
25+
suppressAll: true, // removes the duplicated traces
1726
},
18-
coverageIstanbulReporter: {
27+
coverageReporter: {
1928
dir: require('path').join(__dirname, './coverage/ngx-filter-pipe'),
20-
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
29+
subdir: '.',
30+
reporters: [{ type: 'html' }, { type: 'text-summary' }],
2231
},
2332
reporters: ['progress', 'kjhtml'],
24-
port: 9876,
25-
colors: true,
26-
logLevel: config.LOG_INFO,
27-
autoWatch: true,
33+
2834
browsers: ['Chrome'],
29-
singleRun: false,
3035
restartOnFileChange: true,
3136
customLaunchers: {
3237
ChromeHeadlessCustom: {
33-
base: "ChromeHeadless",
34-
flags: ["--no-sandbox", "--disable-gpu"],
38+
base: 'ChromeHeadless',
39+
flags: ['--no-sandbox', '--disable-gpu'],
3540
},
3641
},
3742
});

ng-package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "./node_modules/ng-packagr/ng-package.schema.json",
3+
"lib": {
4+
"entryFile": "public_api.ts"
5+
}
6+
}

0 commit comments

Comments
 (0)