Skip to content

Commit 124d037

Browse files
cmckni3cmckni3
authored
Merge pull request #537 from webcat12345/angular-15
Migration angular 15 bootstrap 5 ngx-bootstrap 10
2 parents ab83952 + 6969b8b commit 124d037

40 files changed

+7578
-11104
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ root = true
55
charset = utf-8
66
indent_style = space
77
indent_size = 2
8+
end_of_line = lf
89
insert_final_newline = true
910
trim_trailing_whitespace = true
1011

1112
[*.ts]
1213
quote_type = single
1314

14-
[*.md]
15+
[*.{md,rst}]
1516
max_line_length = off
17+
insert_final_newline = false
1618
trim_trailing_whitespace = false

‎.jsbeautifyrc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"indent_inner_html": true,
3-
"indent_with_tabs": true,
4-
"tab_size": 2,
5-
"wrap_attributes": "force"
2+
"indent_inner_html": true,
3+
"indent_with_tabs": true,
4+
"tab_size": 2,
5+
"wrap_attributes": "force"
66
}

‎angular.json‎

Lines changed: 143 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,145 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"ngx-intl-tel-input-app": {
7-
"root": "",
8-
"sourceRoot": "src",
9-
"projectType": "application",
10-
"prefix": "app",
11-
"schematics": {},
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/ngx-intl-tel-input-app",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "src/tsconfig.app.json",
21-
"assets": ["src/favicon.ico", "src/assets"],
22-
"styles": [
23-
"./node_modules/intl-tel-input/build/css/intlTelInput.css",
24-
"src/styles.css"
25-
],
26-
"scripts": [],
27-
"vendorChunk": true,
28-
"extractLicenses": false,
29-
"buildOptimizer": false,
30-
"sourceMap": true,
31-
"optimization": false,
32-
"namedChunks": true
33-
},
34-
"configurations": {
35-
"production": {
36-
"fileReplacements": [
37-
{
38-
"replace": "src/environments/environment.ts",
39-
"with": "src/environments/environment.prod.ts"
40-
}
41-
],
42-
"optimization": true,
43-
"outputHashing": "all",
44-
"sourceMap": false,
45-
"namedChunks": false,
46-
"extractLicenses": true,
47-
"vendorChunk": false,
48-
"buildOptimizer": true,
49-
"budgets": [
50-
{
51-
"type": "initial",
52-
"maximumWarning": "2mb",
53-
"maximumError": "5mb"
54-
},
55-
{
56-
"type": "anyComponentStyle",
57-
"maximumWarning": "6kb"
58-
}
59-
]
60-
}
61-
},
62-
"defaultConfiguration": ""
63-
},
64-
"serve": {
65-
"builder": "@angular-devkit/build-angular:dev-server",
66-
"options": {
67-
"browserTarget": "ngx-intl-tel-input-app:build"
68-
},
69-
"configurations": {
70-
"production": {
71-
"browserTarget": "ngx-intl-tel-input-app:build:production"
72-
}
73-
}
74-
},
75-
"extract-i18n": {
76-
"builder": "@angular-devkit/build-angular:extract-i18n",
77-
"options": {
78-
"browserTarget": "ngx-intl-tel-input-app:build"
79-
}
80-
},
81-
"test": {
82-
"builder": "@angular-devkit/build-angular:karma",
83-
"options": {
84-
"main": "src/test.ts",
85-
"polyfills": "src/polyfills.ts",
86-
"tsConfig": "src/tsconfig.spec.json",
87-
"karmaConfig": "src/karma.conf.js",
88-
"styles": [
89-
"./node_modules/intl-tel-input/build/css/intlTelInput.css",
90-
"src/styles.css"
91-
],
92-
"scripts": [],
93-
"assets": ["src/favicon.ico", "src/assets"]
94-
}
95-
}
96-
}
97-
},
98-
"ngx-intl-tel-input-app-e2e": {
99-
"root": "e2e/",
100-
"projectType": "application",
101-
"prefix": "",
102-
"architect": {
103-
"e2e": {
104-
"builder": "@angular-devkit/build-angular:protractor",
105-
"options": {
106-
"protractorConfig": "e2e/protractor.conf.js",
107-
"devServerTarget": "ngx-intl-tel-input-app:serve"
108-
},
109-
"configurations": {
110-
"production": {
111-
"devServerTarget": "ngx-intl-tel-input-app:serve:production"
112-
}
113-
}
114-
}
115-
}
116-
},
117-
"ngx-intl-tel-input": {
118-
"root": "projects/ngx-intl-tel-input",
119-
"sourceRoot": "projects/ngx-intl-tel-input/src",
120-
"projectType": "library",
121-
"prefix": "ngx",
122-
"architect": {
123-
"build": {
124-
"builder": "@angular-devkit/build-angular:ng-packagr",
125-
"options": {
126-
"tsConfig": "projects/ngx-intl-tel-input/tsconfig.lib.json",
127-
"project": "projects/ngx-intl-tel-input/ng-package.json"
128-
}
129-
},
130-
"test": {
131-
"builder": "@angular-devkit/build-angular:karma",
132-
"options": {
133-
"main": "projects/ngx-intl-tel-input/src/test.ts",
134-
"tsConfig": "projects/ngx-intl-tel-input/tsconfig.spec.json",
135-
"karmaConfig": "projects/ngx-intl-tel-input/karma.conf.js"
136-
}
137-
}
138-
}
139-
}
140-
},
141-
"defaultProject": "ngx-intl-tel-input-app"
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ngx-intl-tel-input-app": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {},
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:browser",
15+
"options": {
16+
"outputPath": "dist/ngx-intl-tel-input-app",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "src/tsconfig.app.json",
21+
"assets": ["src/favicon.ico", "src/assets"],
22+
"styles": [
23+
"./node_modules/intl-tel-input/build/css/intlTelInput.css",
24+
"src/styles.css"
25+
],
26+
"scripts": [],
27+
"vendorChunk": true,
28+
"extractLicenses": false,
29+
"buildOptimizer": false,
30+
"sourceMap": true,
31+
"optimization": false,
32+
"namedChunks": true
33+
},
34+
"configurations": {
35+
"production": {
36+
"fileReplacements": [
37+
{
38+
"replace": "src/environments/environment.ts",
39+
"with": "src/environments/environment.prod.ts"
40+
}
41+
],
42+
"optimization": true,
43+
"outputHashing": "all",
44+
"sourceMap": false,
45+
"namedChunks": false,
46+
"extractLicenses": true,
47+
"vendorChunk": false,
48+
"buildOptimizer": true,
49+
"budgets": [
50+
{
51+
"type": "initial",
52+
"maximumWarning": "2mb",
53+
"maximumError": "5mb"
54+
},
55+
{
56+
"type": "anyComponentStyle",
57+
"maximumWarning": "6kb"
58+
}
59+
]
60+
}
61+
},
62+
"defaultConfiguration": ""
63+
},
64+
"serve": {
65+
"builder": "@angular-devkit/build-angular:dev-server",
66+
"options": {
67+
"browserTarget": "ngx-intl-tel-input-app:build"
68+
},
69+
"configurations": {
70+
"production": {
71+
"browserTarget": "ngx-intl-tel-input-app:build:production"
72+
}
73+
}
74+
},
75+
"extract-i18n": {
76+
"builder": "@angular-devkit/build-angular:extract-i18n",
77+
"options": {
78+
"browserTarget": "ngx-intl-tel-input-app:build"
79+
}
80+
},
81+
"test": {
82+
"builder": "@angular-devkit/build-angular:karma",
83+
"options": {
84+
"main": "src/test.ts",
85+
"polyfills": "src/polyfills.ts",
86+
"tsConfig": "src/tsconfig.spec.json",
87+
"karmaConfig": "src/karma.conf.js",
88+
"styles": [
89+
"./node_modules/intl-tel-input/build/css/intlTelInput.css",
90+
"src/styles.css"
91+
],
92+
"scripts": [],
93+
"assets": ["src/favicon.ico", "src/assets"]
94+
}
95+
}
96+
}
97+
},
98+
"ngx-intl-tel-input-app-e2e": {
99+
"root": "e2e/",
100+
"projectType": "application",
101+
"prefix": "",
102+
"architect": {
103+
"e2e": {
104+
"builder": "@angular-devkit/build-angular:protractor",
105+
"options": {
106+
"protractorConfig": "e2e/protractor.conf.js",
107+
"devServerTarget": "ngx-intl-tel-input-app:serve"
108+
},
109+
"configurations": {
110+
"production": {
111+
"devServerTarget": "ngx-intl-tel-input-app:serve:production"
112+
}
113+
}
114+
}
115+
}
116+
},
117+
"ngx-intl-tel-input": {
118+
"root": "projects/ngx-intl-tel-input",
119+
"sourceRoot": "projects/ngx-intl-tel-input/src",
120+
"projectType": "library",
121+
"prefix": "ngx",
122+
"architect": {
123+
"build": {
124+
"builder": "@angular-devkit/build-angular:ng-packagr",
125+
"options": {
126+
"tsConfig": "projects/ngx-intl-tel-input/tsconfig.lib.json",
127+
"project": "projects/ngx-intl-tel-input/ng-package.json"
128+
}
129+
},
130+
"test": {
131+
"builder": "@angular-devkit/build-angular:karma",
132+
"options": {
133+
"main": "projects/ngx-intl-tel-input/src/test.ts",
134+
"tsConfig": "projects/ngx-intl-tel-input/tsconfig.spec.json",
135+
"karmaConfig": "projects/ngx-intl-tel-input/karma.conf.js"
136+
}
137+
}
138+
}
139+
}
140+
},
141+
"defaultProject": "ngx-intl-tel-input-app",
142+
"cli": {
143+
"analytics": false
144+
}
142145
}

0 commit comments

Comments
 (0)