Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 80fd0ea

Browse files
Merge branch 'master' into feature/rmq-transport
2 parents 2688a18 + faff0ae commit 80fd0ea

File tree

131 files changed

+22763
-11481
lines changed

Some content is hidden

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

131 files changed

+22763
-11481
lines changed

‎.angular-cli.json‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎angular.json‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"docs.nestjs.com": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": ["src/assets", "src/favicon.ico"],
20+
"styles": ["src/styles.scss"],
21+
"scripts": [
22+
"src/assets/js/prism.js",
23+
"node_modules/marked/lib/marked.js"
24+
]
25+
},
26+
"configurations": {
27+
"production": {
28+
"optimization": true,
29+
"outputHashing": "all",
30+
"sourceMap": false,
31+
"extractCss": true,
32+
"namedChunks": false,
33+
"aot": true,
34+
"extractLicenses": true,
35+
"vendorChunk": false,
36+
"buildOptimizer": true,
37+
"serviceWorker": false,
38+
"ngswConfigPath": "/src/ngsw-config.json",
39+
"fileReplacements": [
40+
{
41+
"replace": "src/environments/environment.ts",
42+
"with": "src/environments/environment.prod.ts"
43+
}
44+
]
45+
}
46+
}
47+
},
48+
"serve": {
49+
"builder": "@angular-devkit/build-angular:dev-server",
50+
"options": {
51+
"browserTarget": "docs.nestjs.com:build"
52+
},
53+
"configurations": {
54+
"production": {
55+
"browserTarget": "docs.nestjs.com:build:production"
56+
}
57+
}
58+
},
59+
"extract-i18n": {
60+
"builder": "@angular-devkit/build-angular:extract-i18n",
61+
"options": {
62+
"browserTarget": "docs.nestjs.com:build"
63+
}
64+
},
65+
"test": {
66+
"builder": "@angular-devkit/build-angular:karma",
67+
"options": {
68+
"main": "src/test.ts",
69+
"karmaConfig": "./karma.conf.js",
70+
"polyfills": "src/polyfills.ts",
71+
"tsConfig": "src/tsconfig.spec.json",
72+
"scripts": ["src/assets/js/prism.js"],
73+
"styles": ["src/styles.scss"],
74+
"assets": ["src/assets", "src/favicon.ico"]
75+
}
76+
},
77+
"lint": {
78+
"builder": "@angular-devkit/build-angular:tslint",
79+
"options": {
80+
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
81+
"exclude": ["**/node_modules/**"]
82+
}
83+
}
84+
}
85+
},
86+
"docs.nestjs.com-e2e": {
87+
"root": "e2e",
88+
"sourceRoot": "e2e",
89+
"projectType": "application",
90+
"architect": {
91+
"e2e": {
92+
"builder": "@angular-devkit/build-angular:protractor",
93+
"options": {
94+
"protractorConfig": "./protractor.conf.js",
95+
"devServerTarget": "docs.nestjs.com:serve"
96+
}
97+
},
98+
"lint": {
99+
"builder": "@angular-devkit/build-angular:tslint",
100+
"options": {
101+
"tsConfig": ["e2e/tsconfig.e2e.json"],
102+
"exclude": ["**/node_modules/**"]
103+
}
104+
}
105+
}
106+
}
107+
},
108+
"defaultProject": "docs.nestjs.com",
109+
"schematics": {
110+
"@schematics/angular:component": {
111+
"prefix": "app",
112+
"styleext": "scss"
113+
},
114+
"@schematics/angular:directive": {
115+
"prefix": "app"
116+
}
117+
}
118+
}

‎karma.conf.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname,'coverage'),reports: [ 'html', 'lcovonly' ],
2020
fixWebpackSourcePaths: true
2121
},
22-
angularCli: {
23-
environment: 'dev'
24-
},
22+
2523
reporters: ['progress', 'kjhtml'],
2624
port: 9876,
2725
colors: true,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /