Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit 816b520

Browse files
PeshouPeshou
committed
Merge branch 'feature/ng-packagr-migration-ng-10'
* feature/ng-packagr-migration-ng-10: Upgrade to workspace and use ng-packagr. Bump to Angular 10
2 parents d8860d7 + 8a3c214 commit 816b520

File tree

148 files changed

+17029
-15820
lines changed

Some content is hidden

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

148 files changed

+17029
-15820
lines changed

‎.editorconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.ts]
12+
quote_type = single
13+
14+
[*.md]
15+
max_line_length = off
16+
trim_trailing_whitespace = false

‎.gitignore

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,46 @@
1-
.idea
2-
aot
3-
node_modules
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
# Only exists if Bazel was run
8+
/bazel-out
9+
10+
# dependencies
11+
/node_modules
12+
13+
# profiling files
14+
chrome-profiler-events*.json
15+
speed-measure-plugin*.json
16+
17+
# IDEs and editors
18+
/.idea
19+
.project
20+
.classpath
21+
.c9/
22+
*.launch
23+
.settings/
24+
*.sublime-workspace
25+
26+
# IDE - VSCode
27+
.vscode/*
28+
!.vscode/settings.json
29+
!.vscode/tasks.json
30+
!.vscode/launch.json
31+
!.vscode/extensions.json
32+
.history/*
33+
34+
# misc
35+
/.sass-cache
36+
/connect.lock
37+
/coverage
38+
/libpeerconnection.log
439
npm-debug.log
40+
yarn-error.log
41+
testem.log
542
/typings
6-
*.map
7-
/docs/build
8-
ngfactory
43+
44+
# System Files
45+
.DS_Store
46+
Thumbs.db

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
## Canvas version changes
3+
#### v4.0.0 Switches the repo to an angular-workspace and uses ng-packagr for *building the library*.
4+
5+
It will help with testing, maintaining and future changes of the library. The peer-dependency for @angular is ^10.0.6
6+
7+
#### v3.1.1 Audits the npm packages and upgrades the lodash version from 4.17.11 to 4.17.13
8+
9+
#### v3.1.0 Merges the pull request from https://github.com/webfactorymk/ng2-canvas-whiteboard/pull/55 to allow the component to be used in Angular 8 and 9 applications. Also fixes the imports for rxjs items from 'rxjs/index' to 'rxjs'
10+
11+
#### v3.0.4 Fixes a bug with production build and recognition of shape names by adding an abstract method in the base Shape class.
12+
13+
#### v3.0.0 Removes the `rxjs-compat` library and adds `rxjs^6`. This means that older versions will not be supported if they upgrade to `ng2-canvas-whiteboard^3.0.0`.
14+
#### *This version also changes the way of how this library is built and made ready for publish.*
15+
16+
#### For applications before Angular 6 please use versions below v3.0.0.
17+
#

‎README.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
# ng2-canvas-whiteboard
22

3-
4-
## Canvas version changes
5-
#### v3.1.1 Audits the npm packages and upgrades the lodash version from 4.17.11 to 4.17.13
6-
7-
#### v3.1.0 Merges the pull request from https://github.com/webfactorymk/ng2-canvas-whiteboard/pull/55 to allow the component to be used in Angular 8 and 9 applications. Also fixes the imports for rxjs items from 'rxjs/index' to 'rxjs'
8-
9-
#### v3.0.4 Fixes a bug with production build and recognition of shape names by adding an abstract method in the base Shape class.
10-
11-
#### v3.0.0 Removes the `rxjs-compat` library and adds `rxjs^6`. This means that older versions will not be supported if they upgrade to `ng2-canvas-whiteboard^3.0.0`.
12-
#### *This version also changes the way of how this library is built and made ready for publish.*
13-
14-
#### For applications before Angular 6 please use versions below v3.0.0.
15-
#
163
**Features:**<br/>
174
- Premade Shapes
185
- The ability to create custom premade shapes

‎angular.json

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

‎build.js

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

0 commit comments

Comments
 (0)