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

Commit

Permalink
Merge branch 'feature/ng-packagr-migration-ng-10'
Browse files Browse the repository at this point in the history
* feature/ng-packagr-migration-ng-10:
  Upgrade to workspace and use ng-packagr. Bump to Angular 10
  • Loading branch information
Peshou committed Aug 26, 2020
2 parents d8860d7 + 8a3c214 commit 816b520
Show file tree
Hide file tree
Showing 148 changed files with 17,029 additions and 15,820 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
50 changes: 44 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,46 @@
.idea
aot
node_modules
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings
*.map
/docs/build
ngfactory

# System Files
.DS_Store
Thumbs.db
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

## Canvas version changes
#### v4.0.0 Switches the repo to an angular-workspace and uses ng-packagr for *building the library*.

It will help with testing, maintaining and future changes of the library. The peer-dependency for @angular is ^10.0.6

#### v3.1.1 Audits the npm packages and upgrades the lodash version from 4.17.11 to 4.17.13

#### 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'

#### v3.0.4 Fixes a bug with production build and recognition of shape names by adding an abstract method in the base Shape class.

#### 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`.
#### *This version also changes the way of how this library is built and made ready for publish.*

#### For applications before Angular 6 please use versions below v3.0.0.
#
13 changes: 0 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# ng2-canvas-whiteboard


## Canvas version changes
#### v3.1.1 Audits the npm packages and upgrades the lodash version from 4.17.11 to 4.17.13

#### 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'

#### v3.0.4 Fixes a bug with production build and recognition of shape names by adding an abstract method in the base Shape class.

#### 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`.
#### *This version also changes the way of how this library is built and made ready for publish.*

#### For applications before Angular 6 please use versions below v3.0.0.
#
**Features:**<br/>
- Premade Shapes
- The ability to create custom premade shapes
Expand Down
169 changes: 169 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ng2-canvas-whiteboard": {
"projectType": "library",
"root": "projects/ng2-canvas-whiteboard",
"sourceRoot": "projects/ng2-canvas-whiteboard/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/ng2-canvas-whiteboard/tsconfig.lib.json",
"project": "projects/ng2-canvas-whiteboard/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ng2-canvas-whiteboard/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng2-canvas-whiteboard/src/test.ts",
"tsConfig": "projects/ng2-canvas-whiteboard/tsconfig.spec.json",
"karmaConfig": "projects/ng2-canvas-whiteboard/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/ng2-canvas-whiteboard/tsconfig.lib.json",
"projects/ng2-canvas-whiteboard/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"ng2-canvas-whiteboard-example": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "projects/ng2-canvas-whiteboard-example",
"sourceRoot": "projects/ng2-canvas-whiteboard-example/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/ng2-canvas-whiteboard-example",
"index": "projects/ng2-canvas-whiteboard-example/src/index.html",
"main": "projects/ng2-canvas-whiteboard-example/src/main.ts",
"polyfills": "projects/ng2-canvas-whiteboard-example/src/polyfills.ts",
"tsConfig": "projects/ng2-canvas-whiteboard-example/tsconfig.app.json",
"aot": true,
"assets": [
"projects/ng2-canvas-whiteboard-example/src/favicon.ico",
"projects/ng2-canvas-whiteboard-example/src/assets"
],
"styles": [
"projects/ng2-canvas-whiteboard-example/src/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "projects/ng2-canvas-whiteboard-example/src/environments/environment.ts",
"with": "projects/ng2-canvas-whiteboard-example/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ng2-canvas-whiteboard-example:build"
},
"configurations": {
"production": {
"browserTarget": "ng2-canvas-whiteboard-example:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ng2-canvas-whiteboard-example:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng2-canvas-whiteboard-example/src/test.ts",
"polyfills": "projects/ng2-canvas-whiteboard-example/src/polyfills.ts",
"tsConfig": "projects/ng2-canvas-whiteboard-example/tsconfig.spec.json",
"karmaConfig": "projects/ng2-canvas-whiteboard-example/karma.conf.js",
"assets": [
"projects/ng2-canvas-whiteboard-example/src/favicon.ico",
"projects/ng2-canvas-whiteboard-example/src/assets"
],
"styles": [
"projects/ng2-canvas-whiteboard-example/src/styles.scss"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/ng2-canvas-whiteboard-example/tsconfig.app.json",
"projects/ng2-canvas-whiteboard-example/tsconfig.spec.json",
"projects/ng2-canvas-whiteboard-example/e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "projects/ng2-canvas-whiteboard-example/e2e/protractor.conf.js",
"devServerTarget": "ng2-canvas-whiteboard-example:serve"
},
"configurations": {
"production": {
"devServerTarget": "ng2-canvas-whiteboard-example:serve:production"
}
}
}
}
}
},
"defaultProject": "ng2-canvas-whiteboard"
}
54 changes: 0 additions & 54 deletions build.js

This file was deleted.

Loading

0 comments on commit 816b520

Please sign in to comment.