Skip to content

Commit ce85af5

Browse files
manfredsteyermanfredsteyer
committed
Merge branch '8.1'
2 parents 53264d3 + 3d98892 commit ce85af5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+926
-230
lines changed

‎angular.json‎

Lines changed: 133 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,149 @@
130130
}
131131
}
132132
},
133-
"sample-e2e": {
134-
"root": "projects/sample-e2e/",
133+
134+
"quickstart-demo": {
135135
"projectType": "application",
136+
"schematics": {},
137+
"root": "projects/quickstart-demo",
138+
"sourceRoot": "projects/quickstart-demo/src",
139+
"prefix": "app",
136140
"architect": {
141+
"build": {
142+
"builder": "@angular-devkit/build-angular:browser",
143+
"options": {
144+
"outputPath": "dist/quickstart-demo",
145+
"index": "projects/quickstart-demo/src/index.html",
146+
"main": "projects/quickstart-demo/src/main.ts",
147+
"polyfills": "projects/quickstart-demo/src/polyfills.ts",
148+
"tsConfig": "projects/quickstart-demo/tsconfig.app.json",
149+
"aot": false,
150+
"assets": [
151+
"projects/quickstart-demo/src/favicon.ico",
152+
"projects/quickstart-demo/src/assets"
153+
],
154+
"styles": [
155+
"projects/quickstart-demo/src/styles.css"
156+
],
157+
"scripts": []
158+
},
159+
"configurations": {
160+
"production": {
161+
"fileReplacements": [
162+
{
163+
"replace": "projects/quickstart-demo/src/environments/environment.ts",
164+
"with": "projects/quickstart-demo/src/environments/environment.prod.ts"
165+
}
166+
],
167+
"optimization": true,
168+
"outputHashing": "all",
169+
"sourceMap": false,
170+
"extractCss": true,
171+
"namedChunks": false,
172+
"aot": true,
173+
"extractLicenses": true,
174+
"vendorChunk": false,
175+
"buildOptimizer": true,
176+
"budgets": [
177+
{
178+
"type": "initial",
179+
"maximumWarning": "2mb",
180+
"maximumError": "5mb"
181+
}
182+
]
183+
}
184+
}
185+
},
186+
"serve": {
187+
"builder": "@angular-devkit/build-angular:dev-server",
188+
"options": {
189+
"browserTarget": "quickstart-demo:build"
190+
},
191+
"configurations": {
192+
"production": {
193+
"browserTarget": "quickstart-demo:build:production"
194+
}
195+
}
196+
},
197+
"extract-i18n": {
198+
"builder": "@angular-devkit/build-angular:extract-i18n",
199+
"options": {
200+
"browserTarget": "quickstart-demo:build"
201+
}
202+
},
203+
"test": {
204+
"builder": "@angular-devkit/build-angular:karma",
205+
"options": {
206+
"main": "projects/quickstart-demo/src/test.ts",
207+
"polyfills": "projects/quickstart-demo/src/polyfills.ts",
208+
"tsConfig": "projects/quickstart-demo/tsconfig.spec.json",
209+
"karmaConfig": "projects/quickstart-demo/karma.conf.js",
210+
"assets": [
211+
"projects/quickstart-demo/src/favicon.ico",
212+
"projects/quickstart-demo/src/assets"
213+
],
214+
"styles": [
215+
"projects/quickstart-demo/src/styles.css"
216+
],
217+
"scripts": []
218+
}
219+
},
220+
"lint": {
221+
"builder": "@angular-devkit/build-angular:tslint",
222+
"options": {
223+
"tsConfig": [
224+
"projects/quickstart-demo/tsconfig.app.json",
225+
"projects/quickstart-demo/tsconfig.spec.json",
226+
"projects/quickstart-demo/e2e/tsconfig.json"
227+
],
228+
"exclude": [
229+
"**/node_modules/**"
230+
]
231+
}
232+
},
137233
"e2e": {
138234
"builder": "@angular-devkit/build-angular:protractor",
139235
"options": {
140-
"protractorConfig": "projects/sample-e2e/protractor.conf.js",
141-
"devServerTarget": "sample:serve"
236+
"protractorConfig": "projects/quickstart-demo/e2e/protractor.conf.js",
237+
"devServerTarget": "quickstart-demo:serve"
238+
},
239+
"configurations": {
240+
"production": {
241+
"devServerTarget": "quickstart-demo:serve:production"
242+
}
243+
}
244+
}
245+
}
246+
},
247+
248+
"angular-oauth2-oidc-jwks": {
249+
"projectType": "library",
250+
"root": "projects/angular-oauth2-oidc-jwks",
251+
"sourceRoot": "projects/angular-oauth2-oidc-jwks/src",
252+
"prefix": "lib",
253+
"architect": {
254+
"build": {
255+
"builder": "@angular-devkit/build-ng-packagr:build",
256+
"options": {
257+
"tsConfig": "projects/angular-oauth2-oidc-jwks/tsconfig.lib.json",
258+
"project": "projects/angular-oauth2-oidc-jwks/ng-package.json"
259+
}
260+
},
261+
"test": {
262+
"builder": "@angular-devkit/build-angular:karma",
263+
"options": {
264+
"main": "projects/angular-oauth2-oidc-jwks/src/test.ts",
265+
"tsConfig": "projects/angular-oauth2-oidc-jwks/tsconfig.spec.json",
266+
"karmaConfig": "projects/angular-oauth2-oidc-jwks/karma.conf.js"
142267
}
143268
},
144269
"lint": {
145270
"builder": "@angular-devkit/build-angular:tslint",
146271
"options": {
147-
"tsConfig": "projects/sample-e2e/tsconfig.e2e.json",
272+
"tsConfig": [
273+
"projects/angular-oauth2-oidc-jwks/tsconfig.lib.json",
274+
"projects/angular-oauth2-oidc-jwks/tsconfig.spec.json"
275+
],
148276
"exclude": [
149277
"**/node_modules/**"
150278
]

‎package-lock.json‎

Lines changed: 6 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"rxjs-compat": "^6.5.2",
3737
"text-encoder-lite": "^1.0.1",
3838
"tsickle": "^0.35.0",
39+
"tslib": "^1.9.0",
3940
"zone.js": "^0.9.1"
4041
},
4142
"devDependencies": {
@@ -63,6 +64,7 @@
6364
"prettier": "1.18.2",
6465
"protractor": "~5.4.2",
6566
"ts-node": "~8.3.0",
67+
"tsickle": "^0.35.0",
6668
"tslib": "^1.9.0",
6769
"tslint": "~5.18.0",
6870
"typescript": "3.4.5"

‎projects/angular-oauth2-oidc-jwks/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# AngularOauth2OidcJwks
2+
3+
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.1.
4+
5+
## Code scaffolding
6+
7+
Run `ng generate component component-name --project angular-oauth2-oidc-jwks` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project angular-oauth2-oidc-jwks`.
8+
> Note: Don't forget to add `--project angular-oauth2-oidc-jwks` or else it will be added to the default project in your `angular.json` file.
9+
10+
## Build
11+
12+
Run `ng build angular-oauth2-oidc-jwks` to build the project. The build artifacts will be stored in the `dist/` directory.
13+
14+
## Publishing
15+
16+
After building your library with `ng build angular-oauth2-oidc-jwks`, go to the dist folder `cd dist/angular-oauth2-oidc-jwks` and run `npm publish`.
17+
18+
## Running unit tests
19+
20+
Run `ng test angular-oauth2-oidc-jwks` to execute the unit tests via [Karma](https://karma-runner.github.io).
21+
22+
## Further help
23+
24+
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

‎projects/angular-oauth2-oidc-jwks/karma.conf.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Karma configuration file, see link for more information
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
3+
4+
module.exports = function (config) {
5+
config.set({
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8+
plugins: [
9+
require('karma-jasmine'),
10+
require('karma-chrome-launcher'),
11+
require('karma-jasmine-html-reporter'),
12+
require('karma-coverage-istanbul-reporter'),
13+
require('@angular-devkit/build-angular/plugins/karma')
14+
],
15+
client: {
16+
clearContext: false // leave Jasmine Spec Runner output visible in browser
17+
},
18+
coverageIstanbulReporter: {
19+
dir: require('path').join(__dirname, '../../coverage/angular-oauth2-oidc-jwks'),
20+
reports: ['html', 'lcovonly'],
21+
fixWebpackSourcePaths: true
22+
},
23+
reporters: ['progress', 'kjhtml'],
24+
port: 9876,
25+
colors: true,
26+
logLevel: config.LOG_INFO,
27+
autoWatch: true,
28+
browsers: ['Chrome'],
29+
singleRun: false,
30+
restartOnFileChange: true
31+
});
32+
};

‎projects/angular-oauth2-oidc-jwks/ng-package.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"dest": "../../dist/angular-oauth2-oidc-jwks",
4+
"lib": {
5+
"entryFile": "src/public-api.ts"
6+
}
7+
}

‎projects/angular-oauth2-oidc-jwks/package.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "angular-oauth2-oidc-jwks",
3+
"version": "9.0.0",
4+
"dependencies": {
5+
"jsrsasign": "^8.0.12"
6+
}
7+
}

0 commit comments

Comments
 (0)