From ad65dc9034d03ef21564caa68810cf643c28d3ba Mon Sep 17 00:00:00 2001 From: Eric BREHAULT Date: Sat, 25 Jan 2020 20:26:42 +0100 Subject: [PATCH 1/4] update to last pastanaga version --- mrs.developer.json | 2 +- package-lock.json | 43 ++++++++++++++++++++----------- package.json | 2 ++ projects/grange-form/package.json | 10 +++++-- src/app/app.component.ts | 11 ++------ src/app/app.module.ts | 5 ++++ src/assets/i18n/en.json | 17 +++++++++++- 7 files changed, 62 insertions(+), 28 deletions(-) diff --git a/mrs.developer.json b/mrs.developer.json index 74639fc..bd9b6cc 100644 --- a/mrs.developer.json +++ b/mrs.developer.json @@ -7,6 +7,6 @@ "ngx-schema-form": { "path": "/projects/schema-form/src/lib", "url": "git@github.com:guillotinaweb/ngx-schema-form.git", - "branch": "issue-circular-dep" + "branch": "master" } } diff --git a/package-lock.json b/package-lock.json index 064741b..2db4f81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1088,7 +1088,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -1999,6 +1999,14 @@ "tslib": "^1.9.0" } }, + "angular-traversal": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/angular-traversal/-/angular-traversal-1.2.7.tgz", + "integrity": "sha512-ukol0ERNzPSENAo5w0vlTRGx1eSWCGPNx1oxekYJZyTp1fdAmXS3uoUwIpyRrBl4lu+3bOau5eg5i2LSgOHaHw==", + "requires": { + "tslib": "^1.9.0" + } + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -2340,7 +2348,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -2581,7 +2589,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -3847,6 +3855,11 @@ "assert-plus": "^1.0.0" } }, + "date-fns": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.9.0.tgz", + "integrity": "sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA==" + }, "date-format": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", @@ -6106,7 +6119,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -7158,7 +7171,7 @@ }, "es6-promise": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", "dev": true }, @@ -7170,7 +7183,7 @@ }, "readable-stream": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { @@ -7359,7 +7372,7 @@ "dependencies": { "promise": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz", + "resolved": "http://registry.npmjs.org/promise/-/promise-7.0.4.tgz", "integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=", "dev": true, "requires": { @@ -7851,7 +7864,7 @@ }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, @@ -9414,7 +9427,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -9456,7 +9469,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -9721,7 +9734,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -9872,7 +9885,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -10356,7 +10369,7 @@ }, "sax": { "version": "0.5.8", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "resolved": "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz", "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", "dev": true }, @@ -11680,7 +11693,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -11699,7 +11712,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, diff --git a/package.json b/package.json index dd3845a..8b6025e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,9 @@ "@angular/platform-browser-dynamic": "^8.0.3", "@angular/router": "^8.0.3", "angular-svg-icon": "^7.2.1", + "angular-traversal": "^1.2.7", "core-js": "^2.5.4", + "date-fns": "^2.9.0", "jexl": "^2.1.1", "medium-editor": "5.23.3", "rxjs": "^6.5.2", diff --git a/projects/grange-form/package.json b/projects/grange-form/package.json index 2f76793..36843a4 100644 --- a/projects/grange-form/package.json +++ b/projects/grange-form/package.json @@ -1,8 +1,14 @@ { - "name": "grange-form", + "name": "@guillotinaweb/grange-form", "version": "1.0.1", + "license": "MIT", "peerDependencies": { "@angular/common": "^7.0.3", - "@angular/core": "^7.0.3" + "@angular/core": "^7.0.3", + "angular-traversal": "^1.2.7", + "date-fns": "^2.9.0" + }, + "publishConfig": { + "access": "public" } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 79cb379..3a3db8a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,13 +10,12 @@ export class AppComponent { title: 'Moby Dick', description: 'A good book', language: ['fr'], - theme: 'humor', - body: 'Love is in the air' + theme: 'humor' }; schema: any = { fieldsets: [ { - fields: ['title', 'description', 'body', 'moreInfo', 'age'], + fields: ['title', 'description', 'moreInfo', 'age'], id: 'default', title: 'Default', }, @@ -33,12 +32,6 @@ export class AppComponent { type: 'string', widget: 'textarea', }, - body: { - title: 'Body', - type: 'string', - description: 'Rich text to write everything', - widget: 'richtext' - }, title: { description: '', title: 'Title', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b378ccd..1fea86e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,6 +12,7 @@ import { GrangeFormModule, GrangeFormWidgetRegistry, } from '../../projects/grange-form/src/public_api'; +import * as en from '../assets/i18n/en.json'; import { AppComponent } from './app.component'; @@ -28,6 +29,10 @@ import { AppComponent } from './app.component'; provide: SchemaValidatorFactory, useClass: ZSchemaValidatorFactory, }, + {provide: 'LANG', useValue: 'en_US'}, + {provide: 'TRANSLATIONS', useValue: { + 'en_US': {...en} as any, + }}, ], bootstrap: [AppComponent], }) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 61b37dd..17b0836 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,4 +1,18 @@ { + "calendar": { + "next": "Next", + "previous": "Previous", + "select-start-date-legend": "Select start date", + "select-end-date-legend": "Select end date", + "no-end-button": "No end date", + "monday": "M", + "tuesday": "T", + "wednesday": "W", + "thursday": "T", + "friday": "F", + "saturday": "S", + "sunday": "S" + }, "common": { "close": "Close", "loading": "Loading…", @@ -12,7 +26,8 @@ "no": "No" }, "demo-page": { - "title": "Grange Form usage examples" + "title": "Pastanaga usage examples", + "score": "{{points}} points of {{total}}" } } From 1278f80156a3558454dbe8e26164a277406293a2 Mon Sep 17 00:00:00 2001 From: Eric BREHAULT Date: Sat, 25 Jan 2020 22:54:28 +0100 Subject: [PATCH 2/4] fix radio and checkboxes --- projects/grange-form/src/lib/checkbox.widget.html | 2 +- .../grange-form/src/lib/grange-form.components.ts | 13 ++++++++++++- projects/grange-form/src/lib/radio.widget.html | 8 +++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/grange-form/src/lib/checkbox.widget.html b/projects/grange-form/src/lib/checkbox.widget.html index aa349c5..bb1226e 100644 --- a/projects/grange-form/src/lib/checkbox.widget.html +++ b/projects/grange-form/src/lib/checkbox.widget.html @@ -1,2 +1,2 @@ {{ schema.title }} + [checkboxes]="checkboxes" (selection)="onSelection($event)">{{ schema.title }} diff --git a/projects/grange-form/src/lib/grange-form.components.ts b/projects/grange-form/src/lib/grange-form.components.ts index 813900b..1cd36e3 100644 --- a/projects/grange-form/src/lib/grange-form.components.ts +++ b/projects/grange-form/src/lib/grange-form.components.ts @@ -6,7 +6,6 @@ import { RadioWidget, CheckboxWidget, ButtonWidget, - ControlWidget, ArrayWidget, } from 'ngx-schema-form'; import { ControlModel } from 'pastanaga-angular'; @@ -55,6 +54,10 @@ export class GrangeFormRadioWidget extends RadioWidget implements OnInit { label: option.description, })); } + + onSelection(selection: string[]) { + this.formProperty.setValue(selection, false); + } } @Component({ @@ -70,6 +73,14 @@ export class GrangeFormCheckboxWidget extends CheckboxWidget implements OnInit { label: option.description, })); } + + onSelection(selection: string[]) { + this.checked = selection.reduce((all, value) => { + all[value] = true; + return all; + }, {}); + this.formProperty.setValue(Object.keys(this.checked), false); + } } @Component({ diff --git a/projects/grange-form/src/lib/radio.widget.html b/projects/grange-form/src/lib/radio.widget.html index 2e066bf..ccc90c7 100644 --- a/projects/grange-form/src/lib/radio.widget.html +++ b/projects/grange-form/src/lib/radio.widget.html @@ -1,3 +1,5 @@ -{{ schema.title }} +{{ schema.title }} \ No newline at end of file From f4c48bcdb48521182708bef904b467a62aeafb9f Mon Sep 17 00:00:00 2001 From: Eric BREHAULT Date: Sun, 23 Feb 2020 17:10:23 +0100 Subject: [PATCH 3/4] use latest versions --- angular.json | 2 +- mrs.developer.json | 1 + package-lock.json | 8 ++++++++ package.json | 1 + projects/grange-form/package.json | 4 +++- .../grange-form/src/lib/grange-form.components.ts | 2 +- projects/grange-form/src/lib/grange-form.module.ts | 2 +- src/styles.scss | 2 +- tsconfig.json | 11 ++--------- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/angular.json b/angular.json index 4127324..a9816d9 100644 --- a/angular.json +++ b/angular.json @@ -27,7 +27,7 @@ "src/assets", { "glob": "**/*", - "input": "./src/develop/pastanaga-angular/projects/pastanaga/src/assets", + "input": "./node_modules/@guillotinaweb/pastanaga-angular/lib/assets", "output": "assets" } ], diff --git a/mrs.developer.json b/mrs.developer.json index bd9b6cc..1ce9e5e 100644 --- a/mrs.developer.json +++ b/mrs.developer.json @@ -1,5 +1,6 @@ { "pastanaga-angular": { + "package": "@guillotinaweb/pastanaga-angular", "path": "/projects/pastanaga/src", "url": "git@github.com:plone/pastanaga-angular.git", "branch": "master" diff --git a/package-lock.json b/package-lock.json index 2db4f81..1256cc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1374,6 +1374,14 @@ } } }, + "@guillotinaweb/pastanaga-angular": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@guillotinaweb/pastanaga-angular/-/pastanaga-angular-1.11.0.tgz", + "integrity": "sha512-De92CLY+efWNr7zP5Qxw0B/MnatvZ98FVHavNxMasnPnKTKVCwxPJpBKOf7pv+zVa4BRJEdcX4WgpIJH2KhFgg==", + "requires": { + "tslib": "^1.9.0" + } + }, "@ngtools/json-schema": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", diff --git a/package.json b/package.json index 8b6025e..3d3cded 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@angular/platform-browser": "^8.0.3", "@angular/platform-browser-dynamic": "^8.0.3", "@angular/router": "^8.0.3", + "@guillotinaweb/pastanaga-angular": "^1.11.0", "angular-svg-icon": "^7.2.1", "angular-traversal": "^1.2.7", "core-js": "^2.5.4", diff --git a/projects/grange-form/package.json b/projects/grange-form/package.json index 36843a4..ed85dc3 100644 --- a/projects/grange-form/package.json +++ b/projects/grange-form/package.json @@ -5,8 +5,10 @@ "peerDependencies": { "@angular/common": "^7.0.3", "@angular/core": "^7.0.3", + "@guillotinaweb/pastanaga-angular": "^1.11.0", "angular-traversal": "^1.2.7", - "date-fns": "^2.9.0" + "date-fns": "^2.9.0", + "ngx-schema-form": "^2.4.3" }, "publishConfig": { "access": "public" diff --git a/projects/grange-form/src/lib/grange-form.components.ts b/projects/grange-form/src/lib/grange-form.components.ts index 1cd36e3..d9fc4e9 100644 --- a/projects/grange-form/src/lib/grange-form.components.ts +++ b/projects/grange-form/src/lib/grange-form.components.ts @@ -8,7 +8,7 @@ import { ButtonWidget, ArrayWidget, } from 'ngx-schema-form'; -import { ControlModel } from 'pastanaga-angular'; +import { ControlModel } from '@guillotinaweb/pastanaga-angular'; @Component({ selector: 'gf-string-widget', diff --git a/projects/grange-form/src/lib/grange-form.module.ts b/projects/grange-form/src/lib/grange-form.module.ts index d91b2e4..be394ec 100644 --- a/projects/grange-form/src/lib/grange-form.module.ts +++ b/projects/grange-form/src/lib/grange-form.module.ts @@ -7,7 +7,7 @@ import { TextFieldModule, ButtonModule, SvgModule, -} from 'pastanaga-angular'; +} from '@guillotinaweb/pastanaga-angular'; import { GrangeFormStringWidget, diff --git a/src/styles.scss b/src/styles.scss index f2d49e7..b12c021 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,5 +1,5 @@ /* You can add global styles to this file, and also import other style files */ -@import "./develop/pastanaga-angular/projects/pastanaga/src/lib/styles/common-reset"; +@import "~@guillotinaweb/pastanaga-angular/lib/styles/common-reset"; html, body { overflow: scroll; diff --git a/tsconfig.json b/tsconfig.json index c4d1422..fa1f268 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,7 @@ "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, + "resolveJsonModule": true, "target": "es2015", "typeRoots": [ "node_modules/@types" @@ -18,14 +19,6 @@ "lib": [ "es2017", "dom" - ], - "paths": { - "pastanaga-angular": [ - "develop/pastanaga-angular/projects/pastanaga/src" - ], - "ngx-schema-form": [ - "develop/ngx-schema-form/projects/schema-form/src/lib" - ] - } + ] } } \ No newline at end of file From a04a2f26c76d1d8c1879ed8176dc670112f7ec22 Mon Sep 17 00:00:00 2001 From: Eric BREHAULT Date: Sun, 23 Feb 2020 17:57:28 +0100 Subject: [PATCH 4/4] travis auto-publish --- .travis.yml | 37 +++++++++++++++++++++++++++++++ CHANGELOG.md | 4 ++++ package-lock.json | 19 +++++++++------- package.json | 8 +++---- projects/grange-form/package.json | 2 +- 5 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7585933 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,37 @@ +language: node_js +version: 1.0 +node_js: +- 12.4.0 +cache: + directories: + - node_modules +dist: trusty +install: +- npm install +script: +- npm run build +notifications: + email: + - ebrehault@gmail.com +before_deploy: if [[ $TRAVIS_TAG ]]; then cd dist/grange-form; else git config --global + user.email "build@travis-ci.com" && git config --global user.name "Travis CI" && + export PACKAGE_VERSION=$(npm run get_version | tail -n 1) && echo "TAGGING $PACKAGE_VERSION..." + && git tag $PACKAGE_VERSION; fi +deploy: + - provider: releases + api_key: + secure: R9hi4Vb1wlV91CrGmpJ8jZdksyQ3QxlEqJpa3xPyJ3k1tWEETYZqQBsNvj1iXY9mJsecqmUobIMMGxYfHuq0/mwyHO8jIb7AQ0WA/sRixN3EOSiYrv/YlbpQukDny94Q5964GFipaR3FTlk4dnj0ss1jfODwrknEkeKXc8qvJCjxE3eS04q9LqSSE3EL/QCbtTWPGR7GnOy075xTIVaNrvDVaAIg8E3+U9fEiJ0CIubnlqYT13YqIJWW7wjWcx8aA2Rh64nMRxm/WLZ0wiuhwReZJfiU1qDaEhNdY6mgXYZsXqGtg6dnVB+G6aQY08m6OY07h8yPH5z3Ps16PB49j1Y/cg+TSLTiwbuGj/xsgoAkoNi+9T/tHeWN2vN4rPjWj8lCu31srUeWTTxUwcABo0dtx7m4uEych19hZ9s6ZYK9HCFRuF3vuFIrZa6Pe5HUIhSamXGiIj8nEl3d23Ji5XmXWz+pKWtXrxWkyZyCOXlVLA61GBmSCrpHmcOwHdlR2BDgYht2ion8zAJUWMGmdMusPMdV9FHWtaZM47X4MpjEKogHhBuCpqK+BHvv7gRA2bwFnV2EI5wa0XclsIgustkPoQAZSjzRCekvWGa4VtPXaNrnuD1aV0QLMlNeBYZUv8svGVBBtXXFYn1OzkjhDphaJwF9IfSgEhWUD4xRsPc= + name: Build $PACKAGE_VERSION + on: + repo: guillotinaweb/grange-form + branch: master + - provider: npm + edge: true + email: ebrehault@gmail.com + skip_cleanup: true + api_key: + secure: w7wqsdUrH7rQF9dtOwO/Ocdksmf1iSHF/WOxHNVGN7IlJiu9/eWJMDyoBoUQ4MuHAhduV9yFNzxqhyeMp8jDXuOP03KANbncrJWjAhkDX5wOuL44q6kges5GFrhg04p0sHJ7wFnwQUYK3jgBZyAs/IkHWtJLCDFaKBeK0YwiI6WMzWWLuJv4FAUI9FdhBRTqQJhpHC8dVGQhJpie2nidaz15Age67KWUXwH9yGnSeAkvYLk2exoOEBvxpYY42k7yWacYLmn26K7eqUqcvJWGfj2Olm2AI6EOA3ppjkrGQ0ZU8ai5NGFpfuT+brtmwP9AdBoEhI9JS5oJc3lm696WzfJPP4IxRGTvzIxE+VmCLchivyRiFpSKd2CfkAG/SK6KBn69qCW4FGDRaSbZjlO72E88dUteVm2RCQFUD7kf+DkNbTFvMRqQ+ko4lw3Lfh5eBdOj0gz9FwmwuY4CSDDJpMM3EEbvRFPAhEh772llL56KsZhNDeE3wpHnpZAj1Bpu/tetot5HYZPF9IgfuPCMP/LLmQJ5lf2ZiHXkFoyQudUX5oj6rtSsEv/KVcsqR+2Z2NMVdEoOENRpo2sgxgCivnsSyeGwA7br/8OLUTyCKLayorbEjdFsycLFER6xGm41GmElyyo0bmED45t/UMwWgJjGgNTFYcLGCvv/oj+o+io= + on: + tags: true + repo: guillotinaweb/grange-form + branch: master \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index df99207..6a7d421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.0.3 + +- Auto-tagging and auto-publish on NPM [ebrehault] + # 1.0.2 - Fixing PA dependency [bloodbare] diff --git a/package-lock.json b/package-lock.json index 1256cc6..1922ece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2008,9 +2008,9 @@ } }, "angular-traversal": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/angular-traversal/-/angular-traversal-1.2.7.tgz", - "integrity": "sha512-ukol0ERNzPSENAo5w0vlTRGx1eSWCGPNx1oxekYJZyTp1fdAmXS3uoUwIpyRrBl4lu+3bOau5eg5i2LSgOHaHw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/angular-traversal/-/angular-traversal-1.3.1.tgz", + "integrity": "sha512-sf2dFaaxiPm0Ft375OiPYlwnwLPSgLnoqsTRFygV6LlGqEjsiukETBxs9IeGU80XV0s5TGY2rKoLJnuwnEMATQ==", "requires": { "tslib": "^1.9.0" } @@ -7727,11 +7727,6 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, - "medium-editor": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/medium-editor/-/medium-editor-5.23.3.tgz", - "integrity": "sha512-he9/TdjX8f8MGdXGfCs8AllrYnqXJJvjNkDKmPg3aPW/uoIrlRqtkFthrwvmd+u4QyzEiadhCCM0EwTiRdUCJw==" - }, "mem": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", @@ -8333,6 +8328,14 @@ } } }, + "ngx-schema-form": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/ngx-schema-form/-/ngx-schema-form-2.4.3.tgz", + "integrity": "sha512-iyS81vnsCoS620l012TwFT8T8ugFCpXqPT1wZaLowaotobxQHcD+mfatI3KkYhOIOKmNjQLn9US2zXiG1MmJew==", + "requires": { + "tslib": "^1.9.0" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", diff --git a/package.json b/package.json index 3d3cded..0a6f1fe 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "grange-form", - "version": "1.0.0", + "version": "0.0.0", "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build grange-form --prod && cp ./README.md ./dist/grange-form", + "build": "ng build grange-form-lib --prod && cp ./README.md ./dist/grange-form", "build_demo": "ng build --prod --base-href /grange-form/dist/grange-form/", "test": "ng test", "get_version": "cat ./projects/grange-form/package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]'", @@ -23,11 +23,11 @@ "@angular/router": "^8.0.3", "@guillotinaweb/pastanaga-angular": "^1.11.0", "angular-svg-icon": "^7.2.1", - "angular-traversal": "^1.2.7", + "angular-traversal": "^1.3.1", "core-js": "^2.5.4", "date-fns": "^2.9.0", "jexl": "^2.1.1", - "medium-editor": "5.23.3", + "ngx-schema-form": "^2.4.3", "rxjs": "^6.5.2", "rxjs-compat": "^6.3.3", "z-schema": "^3.24.1", diff --git a/projects/grange-form/package.json b/projects/grange-form/package.json index ed85dc3..67a4d4c 100644 --- a/projects/grange-form/package.json +++ b/projects/grange-form/package.json @@ -1,6 +1,6 @@ { "name": "@guillotinaweb/grange-form", - "version": "1.0.1", + "version": "1.0.3", "license": "MIT", "peerDependencies": { "@angular/common": "^7.0.3",