Skip to content

Commit de738f7

Browse files
SvetlanaMuravlovaSvetlanaMuravlova
committed
feat(core): added nx
1 parent 69cd64d commit de738f7

69 files changed

Lines changed: 19820 additions & 8952 deletions

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"**/*"
5+
],
6+
"plugins": [
7+
"@nrwl/nx"
8+
],
9+
"overrides": [
10+
{
11+
"files": [
12+
"*.ts",
13+
"*.tsx",
14+
"*.js",
15+
"*.jsx"
16+
],
17+
"rules": {
18+
"@nrwl/nx/enforce-module-boundaries": [
19+
"error",
20+
{
21+
"enforceBuildableLibDependency": true,
22+
"allow": [],
23+
"depConstraints": [
24+
{
25+
"sourceTag": "*",
26+
"onlyDependOnLibsWithTags": [
27+
"*"
28+
]
29+
}
30+
]
31+
}
32+
]
33+
}
34+
},
35+
{
36+
"files": [
37+
"*.ts",
38+
"*.tsx"
39+
],
40+
"extends": [
41+
"plugin:@nrwl/nx/typescript"
42+
],
43+
"parserOptions": { "project": "./tsconfig.*?.json" },
44+
"rules": {
45+
"semi": "off",
46+
"@typescript-eslint/semi": ["error"]
47+
}
48+
},
49+
{
50+
"files": [
51+
"*.js",
52+
"*.jsx"
53+
],
54+
"extends": [
55+
"plugin:@nrwl/nx/javascript"
56+
],
57+
"rules": {}
58+
}
59+
]
60+
}

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# [1.3.0](https://github.com/valor-software/ng2-file-upload/compare/v1.2.0...v1.3.0) (2021-08-31)
2+
3+
4+
### Bug Fixes
5+
6+
* **ci:** fix xvfb service issue ([33ac156](https://github.com/valor-software/ng2-file-upload/commit/33ac156208bfcf57851210f037719107e1ca9eb9))
7+
* **style:** delete extra rule ([b5917b9](https://github.com/valor-software/ng2-file-upload/commit/b5917b9fa77e63c4c1b06598abc817b8033730c3))
8+
* **typo:** fix grammatical mistake in readme ([#1119](https://github.com/valor-software/ng2-file-upload/issues/1119)) ([8171bc8](https://github.com/valor-software/ng2-file-upload/commit/8171bc831b69692d04b650be19ff82f04ff56662))
9+
10+
11+
### Features
12+
13+
* **bump:** added strict mode, doesn't build in dist, should be resolved ([69cd64d](https://github.com/valor-software/ng2-file-upload/commit/69cd64dc287c9bdd1c35af1062e27ce32a47e977))
14+
* **package:** relaxed peer dependencies to allow ng v4 ([#713](https://github.com/valor-software/ng2-file-upload/issues/713)) ([7704e0e](https://github.com/valor-software/ng2-file-upload/commit/7704e0e970276ebcd8bfefe34bf153f82108a11e))
15+
* **upgrade:** updated up to angular 11 tests are failed ([ce9dc20](https://github.com/valor-software/ng2-file-upload/commit/ce9dc20056cc6c7cd58e502af05d7d97043c8f3a))
16+
17+
18+
119
<a name="1.3.0"></a>
220
# [1.3.0](https://github.com/valor-software/ng2-file-upload/compare/v1.2.0...v1.3.0) (2017-11-25)
321

‎angular.json‎

Lines changed: 62 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,87 @@
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
44
"newProjectRoot": "projects",
5+
"defaultProject": "ng2-file-upload-demo",
56
"projects": {
67
"ng2-file-upload": {
7-
"root": ".",
8-
"sourceRoot": "src",
8+
"root": "libs/ng2-file-upload",
9+
"sourceRoot": "libs/ng2-file-upload/src",
910
"projectType": "library",
1011
"architect": {
1112
"build": {
12-
"builder": "@angular-devkit/build-ng-packagr:build",
13+
"builder": "@nrwl/angular:package",
1314
"outputs": [
14-
"./dist/ng2-file-upload"
15+
"dist/libs/ng2-file-upload"
1516
],
1617
"options": {
17-
"tsConfig": "src/tsconfig.lib.json",
18-
"project": "src/ng-package.json"
18+
"tsConfig": "libs/ng2-file-upload/tsconfig.lib.json",
19+
"project": "libs/ng2-file-upload/ng-package.json"
1920
},
2021
"configurations": {
2122
"production": {
22-
"tsConfig": "src/tsconfig.lib.prod.json"
23+
"tsConfig": "libs/ng2-file-upload/tsconfig.lib.prod.json"
2324
}
2425
}
26+
},
27+
"lint": {
28+
"builder": "@nrwl/linter:eslint",
29+
"options": {
30+
"lintFilePatterns": [
31+
"libs/ng2-file-upload/**/*.ts"
32+
]
33+
}
34+
},
35+
"test": {
36+
"builder": "@nrwl/jest:jest",
37+
"outputs": [
38+
"coverage/libs/ng2-file-upload"
39+
],
40+
"options": {
41+
"jestConfig": "libs/ng2-file-upload/jest.config.js",
42+
"passWithNoTests": true
43+
}
44+
},
45+
"version": {
46+
"builder": "@nrwl/workspace:run-commands",
47+
"outputs": [
48+
],
49+
"options": {
50+
"commands": [
51+
"conventional-changelog -i CHANGELOG.md -s -p angular",
52+
"git add -A"
53+
],
54+
"parallel": false
55+
},
56+
"configurations": {
57+
"production": {}
58+
}
2559
}
2660
}
2761
},
2862
"ng2-file-upload-demo": {
29-
"root": "demo",
30-
"sourceRoot": "demo/src",
63+
"root": "apps/demo",
64+
"sourceRoot": "apps/demo/src",
3165
"projectType": "application",
3266
"architect": {
3367
"build": {
3468
"builder": "@angular-devkit/build-angular:browser",
3569
"options": {
36-
"outputPath": "demo/dist",
37-
"index": "demo/src/index.html",
38-
"main": "demo/src/main.ts",
39-
"tsConfig": "demo/src/tsconfig.json",
40-
"assets": ["demo/src/assets"],
70+
"outputPath": "dist/apps/demo",
71+
"index": "apps/demo/src/index.html",
72+
"main": "apps/demo/src/main.ts",
73+
"tsConfig": "apps/demo/tsconfig.json",
74+
"assets": [
75+
"apps/demo/src/assets"
76+
],
4177
"styles": [],
4278
"scripts": []
4379
},
80+
"dependsOn": [
81+
{
82+
"target": "build",
83+
"projects": "dependencies"
84+
}
85+
],
4486
"configurations": {
4587
"production": {
4688
"optimization": true,
@@ -54,8 +96,8 @@
5496
"buildOptimizer": true,
5597
"fileReplacements": [
5698
{
57-
"replace": "demo/src/environments/environment.ts",
58-
"with": "demo/src/environments/environment.prod.ts"
99+
"replace": "apps/demo/src/environments/environment.ts",
100+
"with": "apps/demo/src/environments/environment.prod.ts"
59101
}
60102
]
61103
}
@@ -71,33 +113,13 @@
71113
"browserTarget": "ng2-file-upload-demo:build:production"
72114
}
73115
}
74-
}
75-
}
76-
},
77-
"ng2-file-upload-test": {
78-
"root": ".",
79-
"sourceRoot": "test",
80-
"projectType": "library",
81-
"architect": {
82-
"test": {
83-
"builder": "@angular-devkit/build-angular:karma",
84-
"options": {
85-
"main": "test/test.ts",
86-
"karmaConfig": "test/karma.conf.js",
87-
"scripts": [],
88-
"styles": [],
89-
"tsConfig": "test/tsconfig.json"
90-
}
91116
},
92117
"lint": {
93-
"builder": "@angular-devkit/build-angular:tslint",
118+
"builder": "@nrwl/linter:eslint",
94119
"options": {
95-
"tsConfig": [
96-
"src/tsconfig.json",
97-
"demo/src/tsconfig.json",
98-
"test/tsconfig.json"
99-
],
100-
"exclude": ["**/node_modules/**"]
120+
"lintFilePatterns": [
121+
"apps/demo/**/*.ts"
122+
]
101123
}
102124
}
103125
}

‎apps/demo/.eslintrc.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"extends": ["../../.eslintrc.json"],
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"extends": [
8+
"plugin:@nrwl/nx/angular",
9+
"plugin:@angular-eslint/template/process-inline-templates"
10+
],
11+
"parserOptions": { "project": ["src/accordion/tsconfig.*?.json"] },
12+
"rules": {
13+
}
14+
},
15+
{
16+
"files": ["*.html"],
17+
"extends": ["plugin:@nrwl/nx/angular-template"],
18+
"rules": {}
19+
}
20+
]
21+
}

demo/.gitignore renamed to apps/demo/.gitignore

File renamed without changes.

demo/browserslist renamed to apps/demo/browserslist

File renamed without changes.

‎apps/demo/bs-config.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"port": 4200,
3+
"server": { "baseDir": "./dist/apps/demo" }
4+
}

demo/server/file-catcher.js renamed to apps/demo/server/file-catcher.js

File renamed without changes.

demo/src/app/app.component.ts renamed to apps/demo/src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from '@angular/core';
2-
3-
let gettingStarted = require('html-loader!markdown-loader!../getting-started.md');
2+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3+
const gettingStarted = require('html-loader!markdown-loader!../getting-started.md');
44

55
@Component({
66
selector: 'app',

demo/src/app/app.module.ts renamed to apps/demo/src/app/app.module.ts

File renamed without changes.

0 commit comments

Comments
 (0)
⚡