diff --git a/bower.json b/bower.json index ed67258..df0c566 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-dialog", - "version": "1.0.0", + "version": "2.0.0-rc.1", "description": "A dialog plugin for Aurelia.", "keywords": [ "aurelia", @@ -19,10 +19,11 @@ "url": "https://github.com/aurelia/dialog" }, "dependencies": { + "aurelia-binding": "^2.1.4", "aurelia-dependency-injection": "^1.0.0", "aurelia-framework": "^1.0.0", "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", - "aurelia-templating": "^1.0.0" + "aurelia-templating": "^1.8.2" } } diff --git a/dist/amd/aurelia-dialog.d.ts b/dist/amd/aurelia-dialog.d.ts index 7d7d580..9d72aca 100644 --- a/dist/amd/aurelia-dialog.d.ts +++ b/dist/amd/aurelia-dialog.d.ts @@ -1,11 +1,6 @@ import { FrameworkConfiguration } from 'aurelia-framework'; import { DialogConfiguration } from './dialog-configuration'; -export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void; -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; +export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void | Promise; export * from './interfaces'; export * from './dialog-settings'; export * from './dialog-configuration'; diff --git a/dist/amd/aurelia-dialog.js b/dist/amd/aurelia-dialog.js index fc85595..8936e36 100644 --- a/dist/amd/aurelia-dialog.js +++ b/dist/amd/aurelia-dialog.js @@ -1,4 +1,4 @@ -define(["require", "exports", "./dialog-configuration", "./ux-dialog", "./ux-dialog-header", "./ux-dialog-body", "./ux-dialog-footer", "./attach-focus", "./dialog-settings", "./dialog-configuration", "./renderer", "./dialog-cancel-error", "./dialog-service", "./dialog-controller"], function (require, exports, dialog_configuration_1, ux_dialog_1, ux_dialog_header_1, ux_dialog_body_1, ux_dialog_footer_1, attach_focus_1, dialog_settings_1, dialog_configuration_2, renderer_1, dialog_cancel_error_1, dialog_service_1, dialog_controller_1) { +define(["require", "exports", "./dialog-configuration", "./dialog-settings", "./dialog-configuration", "./renderer", "./dialog-cancel-error", "./dialog-service", "./dialog-controller"], function (require, exports, dialog_configuration_1, dialog_settings_1, dialog_configuration_2, renderer_1, dialog_cancel_error_1, dialog_service_1, dialog_controller_1) { "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; @@ -13,14 +13,9 @@ define(["require", "exports", "./dialog-configuration", "./ux-dialog", "./ux-dia else { config.useDefaults(); } - applyConfig(); + return applyConfig(); } exports.configure = configure; - __export(ux_dialog_1); - __export(ux_dialog_header_1); - __export(ux_dialog_body_1); - __export(ux_dialog_footer_1); - __export(attach_focus_1); __export(dialog_settings_1); __export(dialog_configuration_2); __export(renderer_1); diff --git a/dist/amd/dialog-configuration.d.ts b/dist/amd/dialog-configuration.d.ts index 2a741e1..705a45e 100644 --- a/dist/amd/dialog-configuration.d.ts +++ b/dist/amd/dialog-configuration.d.ts @@ -14,8 +14,8 @@ export declare class DialogConfiguration { * The global configuration settings. */ settings: DialogSettings; - constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void) => void); - private _apply(); + constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void | Promise) => void); + private _apply; /** * Selects the Aurelia conventional defaults for the dialog plugin. * @return This instance. diff --git a/dist/amd/dialog-configuration.js b/dist/amd/dialog-configuration.js index 6651bb3..f6921a4 100644 --- a/dist/amd/dialog-configuration.js +++ b/dist/amd/dialog-configuration.js @@ -3,11 +3,11 @@ define(["require", "exports", "./renderer", "./dialog-settings", "./dialog-rende Object.defineProperty(exports, "__esModule", { value: true }); var defaultRenderer = dialog_renderer_1.DialogRenderer; var resources = { - 'ux-dialog': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog'), - 'ux-dialog-header': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-header'), - 'ux-dialog-body': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-body'), - 'ux-dialog-footer': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-footer'), - 'attach-focus': aurelia_pal_1.PLATFORM.moduleName('./attach-focus') + 'ux-dialog': function () { return new Promise(function (resolve_1, reject_1) { require(['./resources/ux-dialog'], resolve_1, reject_1); }); }, + 'ux-dialog-header': function () { return new Promise(function (resolve_2, reject_2) { require(['./resources/ux-dialog-header'], resolve_2, reject_2); }); }, + 'ux-dialog-body': function () { return new Promise(function (resolve_3, reject_3) { require(['./resources/ux-dialog-body'], resolve_3, reject_3); }); }, + 'ux-dialog-footer': function () { return new Promise(function (resolve_4, reject_4) { require(['./resources/ux-dialog-footer'], resolve_4, reject_4); }); }, + 'attach-focus': function () { return new Promise(function (resolve_5, reject_5) { require(['./resources/attach-focus'], resolve_5, reject_5); }); } }; // tslint:disable-next-line:max-line-length var defaultCSSText = "ux-dialog-container,ux-dialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}ux-dialog-overlay{opacity:0}ux-dialog-overlay.active{opacity:1}ux-dialog-container{display:block;transition:opacity .2s linear;opacity:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}ux-dialog-container.active{opacity:1}ux-dialog-container>div{padding:30px}ux-dialog-container>div>div{display:block;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto}ux-dialog-container,ux-dialog-container>div,ux-dialog-container>div>div{outline:0}ux-dialog{display:table;box-shadow:0 5px 15px rgba(0,0,0,.5);border:1px solid rgba(0,0,0,.2);border-radius:5px;padding:3px;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border-image-source:initial;border-image-slice:initial;border-image-width:initial;border-image-outset:initial;border-image-repeat:initial;background:#fff}ux-dialog>ux-dialog-header{display:block;padding:16px;border-bottom:1px solid #e5e5e5}ux-dialog>ux-dialog-header>button{float:right;border:none;display:block;width:32px;height:32px;background:0 0;font-size:22px;line-height:16px;margin:-14px -16px 0 0;padding:0;cursor:pointer}ux-dialog>ux-dialog-body{display:block;padding:16px}ux-dialog>ux-dialog-footer{display:block;padding:6px;border-top:1px solid #e5e5e5;text-align:right}ux-dialog>ux-dialog-footer button{color:#333;background-color:#fff;padding:6px 12px;font-size:14px;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid #ccc;border-radius:4px;margin:5px 0 5px 5px}ux-dialog>ux-dialog-footer button:disabled{cursor:default;opacity:.45}ux-dialog>ux-dialog-footer button:hover:enabled{color:#333;background-color:#e6e6e6;border-color:#adadad}.ux-dialog-open{overflow:hidden}"; @@ -27,10 +27,15 @@ define(["require", "exports", "./renderer", "./dialog-settings", "./dialog-rende DialogConfiguration.prototype._apply = function () { var _this = this; this.fwConfig.transient(renderer_1.Renderer, this.renderer); - this.resources.forEach(function (resourceName) { return _this.fwConfig.globalResources(resources[resourceName]); }); if (this.cssText) { aurelia_pal_1.DOM.injectStyles(this.cssText); } + if (this.resources.length) { + return Promise.all(this.resources.map(function (name) { return resources[name](); })) + .then(function (modules) { + _this.fwConfig.globalResources(modules.map(function (m) { return m.default; })); + }); + } }; /** * Selects the Aurelia conventional defaults for the dialog plugin. diff --git a/dist/amd/dialog-renderer.d.ts b/dist/amd/dialog-renderer.d.ts index e7ef185..9533b1d 100644 --- a/dist/amd/dialog-renderer.d.ts +++ b/dist/amd/dialog-renderer.d.ts @@ -13,15 +13,15 @@ export declare class DialogRenderer implements Renderer { dialogOverlay: HTMLElement; host: Element; anchor: Element; - private getOwnElements(parent, selector); - private attach(dialogController); - private detach(dialogController); - private setAsActive(); - private setAsInactive(); - private setupClickHandling(dialogController); - private clearClickHandling(); - private centerDialog(); - private awaitTransition(setActiveInactive, ignore); + private getOwnElements; + private attach; + private detach; + private setAsActive; + private setAsInactive; + private setupClickHandling; + private clearClickHandling; + private centerDialog; + private awaitTransition; getDialogContainer(): Element; showDialog(dialogController: DialogController): Promise; hideDialog(dialogController: DialogController): Promise; diff --git a/dist/amd/dialog-renderer.js b/dist/amd/dialog-renderer.js index 992a49d..b518117 100644 --- a/dist/amd/dialog-renderer.js +++ b/dist/amd/dialog-renderer.js @@ -22,7 +22,7 @@ define(["require", "exports", "aurelia-pal", "aurelia-dependency-injection"], fu MozTransition: 'transitionend', WebkitTransition: 'webkitTransitionEnd' }; - for (var t in transitions) { + for (var t in transitions) { // tslint:disable-line:prefer-const if (el.style[t] !== undefined) { transition = transitions[t]; return transition; @@ -222,12 +222,12 @@ define(["require", "exports", "aurelia-pal", "aurelia-dependency-injection"], fu return this.awaitTransition(function () { return _this.setAsInactive(); }, dialogController.settings.ignoreTransitions) .then(function () { _this.detach(dialogController); }); }; + var DialogRenderer_1; DialogRenderer.dialogControllers = []; DialogRenderer = DialogRenderer_1 = __decorate([ aurelia_dependency_injection_1.transient() ], DialogRenderer); return DialogRenderer; - var DialogRenderer_1; }()); exports.DialogRenderer = DialogRenderer; }); diff --git a/dist/amd/dialog-service.d.ts b/dist/amd/dialog-service.d.ts index 093294b..9f9abdf 100644 --- a/dist/amd/dialog-service.d.ts +++ b/dist/amd/dialog-service.d.ts @@ -27,11 +27,11 @@ export declare class DialogService { hasOpenDialog: boolean; hasActiveDialog: boolean; constructor(container: Container, compositionEngine: CompositionEngine, defaultSettings: DialogSettings); - private validateSettings(settings); - private createCompositionContext(childContainer, host, settings); - private ensureViewModel(compositionContext); - private _cancelOperation(rejectOnCancel); - private composeAndShowDialog(compositionContext, dialogController); + private validateSettings; + private createCompositionContext; + private ensureViewModel; + private _cancelOperation; + private composeAndShowDialog; /** * Opens a new dialog. * @param settings Dialog settings for this dialog instance. diff --git a/dist/amd/dialog-service.js b/dist/amd/dialog-service.js index 75d2f37..efb48a9 100644 --- a/dist/amd/dialog-service.js +++ b/dist/amd/dialog-service.js @@ -1,4 +1,4 @@ -define(["require", "exports", "aurelia-dependency-injection", "aurelia-metadata", "aurelia-templating", "./dialog-settings", "./dialog-cancel-error", "./lifecycle", "./dialog-controller"], function (require, exports, aurelia_dependency_injection_1, aurelia_metadata_1, aurelia_templating_1, dialog_settings_1, dialog_cancel_error_1, lifecycle_1, dialog_controller_1) { +define(["require", "exports", "aurelia-dependency-injection", "aurelia-templating", "./dialog-settings", "./dialog-cancel-error", "./lifecycle", "./dialog-controller"], function (require, exports, aurelia_dependency_injection_1, aurelia_templating_1, dialog_settings_1, dialog_cancel_error_1, lifecycle_1, dialog_controller_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /* tslint:enable:max-line-length */ @@ -47,17 +47,10 @@ define(["require", "exports", "aurelia-dependency-injection", "aurelia-metadata" }; }; DialogService.prototype.ensureViewModel = function (compositionContext) { - if (typeof compositionContext.viewModel === 'function') { - var moduleId = aurelia_metadata_1.Origin.get(compositionContext.viewModel).moduleId; - if (!moduleId) { - return Promise.reject(new Error("Can not resolve \"moduleId\" of \"" + compositionContext.viewModel.name + "\".")); - } - compositionContext.viewModel = moduleId; - } - if (typeof compositionContext.viewModel === 'string') { - return this.compositionEngine.ensureViewModel(compositionContext); + if (typeof compositionContext.viewModel === 'object') { + return Promise.resolve(compositionContext); } - return Promise.resolve(compositionContext); + return this.compositionEngine.ensureViewModel(compositionContext); }; DialogService.prototype._cancelOperation = function (rejectOnCancel) { if (!rejectOnCancel) { diff --git a/dist/amd/attach-focus.d.ts b/dist/amd/resources/attach-focus.d.ts similarity index 84% rename from dist/amd/attach-focus.d.ts rename to dist/amd/resources/attach-focus.d.ts index 8e8835c..4739274 100644 --- a/dist/amd/attach-focus.d.ts +++ b/dist/amd/resources/attach-focus.d.ts @@ -4,5 +4,4 @@ export declare class AttachFocus implements ComponentAttached { value: boolean | string; constructor(element: HTMLElement); attached(): void; - valueChanged(newValue: string): void; } diff --git a/dist/amd/attach-focus.js b/dist/amd/resources/attach-focus.js similarity index 72% rename from dist/amd/attach-focus.js rename to dist/amd/resources/attach-focus.js index 5cca6a2..776d906 100644 --- a/dist/amd/attach-focus.js +++ b/dist/amd/resources/attach-focus.js @@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -define(["require", "exports", "aurelia-templating", "aurelia-pal"], function (require, exports, aurelia_templating_1, aurelia_pal_1) { +define(["require", "exports", "aurelia-binding", "aurelia-templating", "aurelia-pal"], function (require, exports, aurelia_binding_1, aurelia_templating_1, aurelia_pal_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var AttachFocus = /** @class */ (function () { @@ -12,21 +12,18 @@ define(["require", "exports", "aurelia-templating", "aurelia-pal"], function (re this.element = element; this.value = true; } - /** - * @internal - */ - // tslint:disable-next-line:member-ordering - AttachFocus.inject = function () { return [aurelia_pal_1.DOM.Element]; }; AttachFocus.prototype.attached = function () { - if (this.value && this.value !== 'false') { + if (this.value === '' || (this.value && this.value !== 'false')) { this.element.focus(); } }; - AttachFocus.prototype.valueChanged = function (newValue) { - this.value = newValue; - }; + /** + * @internal + */ + // tslint:disable-next-line:member-ordering + AttachFocus.inject = [aurelia_pal_1.DOM.Element]; AttachFocus = __decorate([ - aurelia_templating_1.customAttribute('attach-focus') + aurelia_templating_1.customAttribute('attach-focus', aurelia_binding_1.bindingMode.oneTime) ], AttachFocus); return AttachFocus; }()); diff --git a/dist/amd/resources/ux-dialog-body.d.ts b/dist/amd/resources/ux-dialog-body.d.ts new file mode 100644 index 0000000..87413a7 --- /dev/null +++ b/dist/amd/resources/ux-dialog-body.d.ts @@ -0,0 +1,2 @@ +export default class UxDialogBody { +} diff --git a/dist/amd/ux-dialog-body.js b/dist/amd/resources/ux-dialog-body.js similarity index 96% rename from dist/amd/ux-dialog-body.js rename to dist/amd/resources/ux-dialog-body.js index abaa1b4..827df27 100644 --- a/dist/amd/ux-dialog-body.js +++ b/dist/amd/resources/ux-dialog-body.js @@ -16,5 +16,5 @@ define(["require", "exports", "aurelia-templating"], function (require, exports, ], UxDialogBody); return UxDialogBody; }()); - exports.UxDialogBody = UxDialogBody; + exports.default = UxDialogBody; }); diff --git a/dist/commonjs/ux-dialog-footer.d.ts b/dist/amd/resources/ux-dialog-footer.d.ts similarity index 77% rename from dist/commonjs/ux-dialog-footer.d.ts rename to dist/amd/resources/ux-dialog-footer.d.ts index 136e1bc..4b62e9f 100644 --- a/dist/commonjs/ux-dialog-footer.d.ts +++ b/dist/amd/resources/ux-dialog-footer.d.ts @@ -1,8 +1,8 @@ -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ -export declare class UxDialogFooter { +export default class UxDialogFooter { controller: DialogController; static isCancelButton(value: string): boolean; buttons: any[]; diff --git a/dist/amd/ux-dialog-footer.js b/dist/amd/resources/ux-dialog-footer.js similarity index 92% rename from dist/amd/ux-dialog-footer.js rename to dist/amd/resources/ux-dialog-footer.js index 1408321..56acc7d 100644 --- a/dist/amd/ux-dialog-footer.js +++ b/dist/amd/resources/ux-dialog-footer.js @@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -define(["require", "exports", "aurelia-templating", "./dialog-controller"], function (require, exports, aurelia_templating_1, dialog_controller_1) { +define(["require", "exports", "aurelia-templating", "../dialog-controller"], function (require, exports, aurelia_templating_1, dialog_controller_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** @@ -33,6 +33,7 @@ define(["require", "exports", "aurelia-templating", "./dialog-controller"], func this.buttons = ['Cancel', 'Ok']; } }; + var UxDialogFooter_1; /** * @internal */ @@ -49,7 +50,6 @@ define(["require", "exports", "aurelia-templating", "./dialog-controller"], func aurelia_templating_1.inlineView("\n \n") ], UxDialogFooter); return UxDialogFooter; - var UxDialogFooter_1; }()); - exports.UxDialogFooter = UxDialogFooter; + exports.default = UxDialogFooter; }); diff --git a/dist/es2015/ux-dialog-header.d.ts b/dist/amd/resources/ux-dialog-header.d.ts similarity index 61% rename from dist/es2015/ux-dialog-header.d.ts rename to dist/amd/resources/ux-dialog-header.d.ts index c8843dd..629f073 100644 --- a/dist/es2015/ux-dialog-header.d.ts +++ b/dist/amd/resources/ux-dialog-header.d.ts @@ -1,6 +1,6 @@ import { ComponentBind } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; -export declare class UxDialogHeader implements ComponentBind { +import { DialogController } from '../dialog-controller'; +export default class UxDialogHeader implements ComponentBind { controller: DialogController; showCloseButton: boolean | undefined; constructor(controller: DialogController); diff --git a/dist/amd/ux-dialog-header.js b/dist/amd/resources/ux-dialog-header.js similarity index 90% rename from dist/amd/ux-dialog-header.js rename to dist/amd/resources/ux-dialog-header.js index 6402894..a9f0e59 100644 --- a/dist/amd/ux-dialog-header.js +++ b/dist/amd/resources/ux-dialog-header.js @@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -define(["require", "exports", "aurelia-templating", "./dialog-controller"], function (require, exports, aurelia_templating_1, dialog_controller_1) { +define(["require", "exports", "aurelia-templating", "../dialog-controller"], function (require, exports, aurelia_templating_1, dialog_controller_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var UxDialogHeader = /** @class */ (function () { @@ -30,5 +30,5 @@ define(["require", "exports", "aurelia-templating", "./dialog-controller"], func ], UxDialogHeader); return UxDialogHeader; }()); - exports.UxDialogHeader = UxDialogHeader; + exports.default = UxDialogHeader; }); diff --git a/dist/amd/resources/ux-dialog.d.ts b/dist/amd/resources/ux-dialog.d.ts new file mode 100644 index 0000000..318732a --- /dev/null +++ b/dist/amd/resources/ux-dialog.d.ts @@ -0,0 +1,2 @@ +export default class UxDialog { +} diff --git a/dist/amd/ux-dialog.js b/dist/amd/resources/ux-dialog.js similarity index 97% rename from dist/amd/ux-dialog.js rename to dist/amd/resources/ux-dialog.js index 96aa754..c54325d 100644 --- a/dist/amd/ux-dialog.js +++ b/dist/amd/resources/ux-dialog.js @@ -16,5 +16,5 @@ define(["require", "exports", "aurelia-templating"], function (require, exports, ], UxDialog); return UxDialog; }()); - exports.UxDialog = UxDialog; + exports.default = UxDialog; }); diff --git a/dist/amd/ux-dialog-body.d.ts b/dist/amd/ux-dialog-body.d.ts deleted file mode 100644 index 913aa89..0000000 --- a/dist/amd/ux-dialog-body.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialogBody { -} diff --git a/dist/amd/ux-dialog.d.ts b/dist/amd/ux-dialog.d.ts deleted file mode 100644 index 66dc80e..0000000 --- a/dist/amd/ux-dialog.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialog { -} diff --git a/dist/commonjs/aurelia-dialog.d.ts b/dist/commonjs/aurelia-dialog.d.ts index 7d7d580..9d72aca 100644 --- a/dist/commonjs/aurelia-dialog.d.ts +++ b/dist/commonjs/aurelia-dialog.d.ts @@ -1,11 +1,6 @@ import { FrameworkConfiguration } from 'aurelia-framework'; import { DialogConfiguration } from './dialog-configuration'; -export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void; -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; +export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void | Promise; export * from './interfaces'; export * from './dialog-settings'; export * from './dialog-configuration'; diff --git a/dist/commonjs/aurelia-dialog.js b/dist/commonjs/aurelia-dialog.js index 53ced03..5ec1bf8 100644 --- a/dist/commonjs/aurelia-dialog.js +++ b/dist/commonjs/aurelia-dialog.js @@ -13,14 +13,9 @@ function configure(frameworkConfig, callback) { else { config.useDefaults(); } - applyConfig(); + return applyConfig(); } exports.configure = configure; -__export(require("./ux-dialog")); -__export(require("./ux-dialog-header")); -__export(require("./ux-dialog-body")); -__export(require("./ux-dialog-footer")); -__export(require("./attach-focus")); __export(require("./dialog-settings")); __export(require("./dialog-configuration")); __export(require("./renderer")); diff --git a/dist/commonjs/dialog-configuration.d.ts b/dist/commonjs/dialog-configuration.d.ts index 2a741e1..705a45e 100644 --- a/dist/commonjs/dialog-configuration.d.ts +++ b/dist/commonjs/dialog-configuration.d.ts @@ -14,8 +14,8 @@ export declare class DialogConfiguration { * The global configuration settings. */ settings: DialogSettings; - constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void) => void); - private _apply(); + constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void | Promise) => void); + private _apply; /** * Selects the Aurelia conventional defaults for the dialog plugin. * @return This instance. diff --git a/dist/commonjs/dialog-configuration.js b/dist/commonjs/dialog-configuration.js index 7d5c21a..bfb6385 100644 --- a/dist/commonjs/dialog-configuration.js +++ b/dist/commonjs/dialog-configuration.js @@ -6,11 +6,11 @@ var dialog_renderer_1 = require("./dialog-renderer"); var aurelia_pal_1 = require("aurelia-pal"); var defaultRenderer = dialog_renderer_1.DialogRenderer; var resources = { - 'ux-dialog': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog'), - 'ux-dialog-header': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-header'), - 'ux-dialog-body': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-body'), - 'ux-dialog-footer': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-footer'), - 'attach-focus': aurelia_pal_1.PLATFORM.moduleName('./attach-focus') + 'ux-dialog': function () { return Promise.resolve().then(function () { return require('./resources/ux-dialog'); }); }, + 'ux-dialog-header': function () { return Promise.resolve().then(function () { return require('./resources/ux-dialog-header'); }); }, + 'ux-dialog-body': function () { return Promise.resolve().then(function () { return require('./resources/ux-dialog-body'); }); }, + 'ux-dialog-footer': function () { return Promise.resolve().then(function () { return require('./resources/ux-dialog-footer'); }); }, + 'attach-focus': function () { return Promise.resolve().then(function () { return require('./resources/attach-focus'); }); } }; // tslint:disable-next-line:max-line-length var defaultCSSText = "ux-dialog-container,ux-dialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}ux-dialog-overlay{opacity:0}ux-dialog-overlay.active{opacity:1}ux-dialog-container{display:block;transition:opacity .2s linear;opacity:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}ux-dialog-container.active{opacity:1}ux-dialog-container>div{padding:30px}ux-dialog-container>div>div{display:block;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto}ux-dialog-container,ux-dialog-container>div,ux-dialog-container>div>div{outline:0}ux-dialog{display:table;box-shadow:0 5px 15px rgba(0,0,0,.5);border:1px solid rgba(0,0,0,.2);border-radius:5px;padding:3px;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border-image-source:initial;border-image-slice:initial;border-image-width:initial;border-image-outset:initial;border-image-repeat:initial;background:#fff}ux-dialog>ux-dialog-header{display:block;padding:16px;border-bottom:1px solid #e5e5e5}ux-dialog>ux-dialog-header>button{float:right;border:none;display:block;width:32px;height:32px;background:0 0;font-size:22px;line-height:16px;margin:-14px -16px 0 0;padding:0;cursor:pointer}ux-dialog>ux-dialog-body{display:block;padding:16px}ux-dialog>ux-dialog-footer{display:block;padding:6px;border-top:1px solid #e5e5e5;text-align:right}ux-dialog>ux-dialog-footer button{color:#333;background-color:#fff;padding:6px 12px;font-size:14px;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid #ccc;border-radius:4px;margin:5px 0 5px 5px}ux-dialog>ux-dialog-footer button:disabled{cursor:default;opacity:.45}ux-dialog>ux-dialog-footer button:hover:enabled{color:#333;background-color:#e6e6e6;border-color:#adadad}.ux-dialog-open{overflow:hidden}"; @@ -30,10 +30,15 @@ var DialogConfiguration = /** @class */ (function () { DialogConfiguration.prototype._apply = function () { var _this = this; this.fwConfig.transient(renderer_1.Renderer, this.renderer); - this.resources.forEach(function (resourceName) { return _this.fwConfig.globalResources(resources[resourceName]); }); if (this.cssText) { aurelia_pal_1.DOM.injectStyles(this.cssText); } + if (this.resources.length) { + return Promise.all(this.resources.map(function (name) { return resources[name](); })) + .then(function (modules) { + _this.fwConfig.globalResources(modules.map(function (m) { return m.default; })); + }); + } }; /** * Selects the Aurelia conventional defaults for the dialog plugin. diff --git a/dist/commonjs/dialog-renderer.d.ts b/dist/commonjs/dialog-renderer.d.ts index e7ef185..9533b1d 100644 --- a/dist/commonjs/dialog-renderer.d.ts +++ b/dist/commonjs/dialog-renderer.d.ts @@ -13,15 +13,15 @@ export declare class DialogRenderer implements Renderer { dialogOverlay: HTMLElement; host: Element; anchor: Element; - private getOwnElements(parent, selector); - private attach(dialogController); - private detach(dialogController); - private setAsActive(); - private setAsInactive(); - private setupClickHandling(dialogController); - private clearClickHandling(); - private centerDialog(); - private awaitTransition(setActiveInactive, ignore); + private getOwnElements; + private attach; + private detach; + private setAsActive; + private setAsInactive; + private setupClickHandling; + private clearClickHandling; + private centerDialog; + private awaitTransition; getDialogContainer(): Element; showDialog(dialogController: DialogController): Promise; hideDialog(dialogController: DialogController): Promise; diff --git a/dist/commonjs/dialog-renderer.js b/dist/commonjs/dialog-renderer.js index ee95c83..61f9630 100644 --- a/dist/commonjs/dialog-renderer.js +++ b/dist/commonjs/dialog-renderer.js @@ -23,7 +23,7 @@ exports.transitionEvent = (function () { MozTransition: 'transitionend', WebkitTransition: 'webkitTransitionEnd' }; - for (var t in transitions) { + for (var t in transitions) { // tslint:disable-line:prefer-const if (el.style[t] !== undefined) { transition = transitions[t]; return transition; @@ -223,11 +223,11 @@ var DialogRenderer = /** @class */ (function () { return this.awaitTransition(function () { return _this.setAsInactive(); }, dialogController.settings.ignoreTransitions) .then(function () { _this.detach(dialogController); }); }; + var DialogRenderer_1; DialogRenderer.dialogControllers = []; DialogRenderer = DialogRenderer_1 = __decorate([ aurelia_dependency_injection_1.transient() ], DialogRenderer); return DialogRenderer; - var DialogRenderer_1; }()); exports.DialogRenderer = DialogRenderer; diff --git a/dist/commonjs/dialog-service.d.ts b/dist/commonjs/dialog-service.d.ts index 093294b..9f9abdf 100644 --- a/dist/commonjs/dialog-service.d.ts +++ b/dist/commonjs/dialog-service.d.ts @@ -27,11 +27,11 @@ export declare class DialogService { hasOpenDialog: boolean; hasActiveDialog: boolean; constructor(container: Container, compositionEngine: CompositionEngine, defaultSettings: DialogSettings); - private validateSettings(settings); - private createCompositionContext(childContainer, host, settings); - private ensureViewModel(compositionContext); - private _cancelOperation(rejectOnCancel); - private composeAndShowDialog(compositionContext, dialogController); + private validateSettings; + private createCompositionContext; + private ensureViewModel; + private _cancelOperation; + private composeAndShowDialog; /** * Opens a new dialog. * @param settings Dialog settings for this dialog instance. diff --git a/dist/commonjs/dialog-service.js b/dist/commonjs/dialog-service.js index 72c4a37..3f08088 100644 --- a/dist/commonjs/dialog-service.js +++ b/dist/commonjs/dialog-service.js @@ -1,7 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var aurelia_dependency_injection_1 = require("aurelia-dependency-injection"); -var aurelia_metadata_1 = require("aurelia-metadata"); var aurelia_templating_1 = require("aurelia-templating"); var dialog_settings_1 = require("./dialog-settings"); var dialog_cancel_error_1 = require("./dialog-cancel-error"); @@ -53,17 +52,10 @@ var DialogService = /** @class */ (function () { }; }; DialogService.prototype.ensureViewModel = function (compositionContext) { - if (typeof compositionContext.viewModel === 'function') { - var moduleId = aurelia_metadata_1.Origin.get(compositionContext.viewModel).moduleId; - if (!moduleId) { - return Promise.reject(new Error("Can not resolve \"moduleId\" of \"" + compositionContext.viewModel.name + "\".")); - } - compositionContext.viewModel = moduleId; - } - if (typeof compositionContext.viewModel === 'string') { - return this.compositionEngine.ensureViewModel(compositionContext); + if (typeof compositionContext.viewModel === 'object') { + return Promise.resolve(compositionContext); } - return Promise.resolve(compositionContext); + return this.compositionEngine.ensureViewModel(compositionContext); }; DialogService.prototype._cancelOperation = function (rejectOnCancel) { if (!rejectOnCancel) { diff --git a/dist/es2015/attach-focus.d.ts b/dist/commonjs/resources/attach-focus.d.ts similarity index 84% rename from dist/es2015/attach-focus.d.ts rename to dist/commonjs/resources/attach-focus.d.ts index 8e8835c..4739274 100644 --- a/dist/es2015/attach-focus.d.ts +++ b/dist/commonjs/resources/attach-focus.d.ts @@ -4,5 +4,4 @@ export declare class AttachFocus implements ComponentAttached { value: boolean | string; constructor(element: HTMLElement); attached(): void; - valueChanged(newValue: string): void; } diff --git a/dist/commonjs/attach-focus.js b/dist/commonjs/resources/attach-focus.js similarity index 80% rename from dist/commonjs/attach-focus.js rename to dist/commonjs/resources/attach-focus.js index 961f5be..cc11615 100644 --- a/dist/commonjs/attach-focus.js +++ b/dist/commonjs/resources/attach-focus.js @@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; Object.defineProperty(exports, "__esModule", { value: true }); +var aurelia_binding_1 = require("aurelia-binding"); var aurelia_templating_1 = require("aurelia-templating"); var aurelia_pal_1 = require("aurelia-pal"); var AttachFocus = /** @class */ (function () { @@ -13,21 +14,18 @@ var AttachFocus = /** @class */ (function () { this.element = element; this.value = true; } - /** - * @internal - */ - // tslint:disable-next-line:member-ordering - AttachFocus.inject = function () { return [aurelia_pal_1.DOM.Element]; }; AttachFocus.prototype.attached = function () { - if (this.value && this.value !== 'false') { + if (this.value === '' || (this.value && this.value !== 'false')) { this.element.focus(); } }; - AttachFocus.prototype.valueChanged = function (newValue) { - this.value = newValue; - }; + /** + * @internal + */ + // tslint:disable-next-line:member-ordering + AttachFocus.inject = [aurelia_pal_1.DOM.Element]; AttachFocus = __decorate([ - aurelia_templating_1.customAttribute('attach-focus') + aurelia_templating_1.customAttribute('attach-focus', aurelia_binding_1.bindingMode.oneTime) ], AttachFocus); return AttachFocus; }()); diff --git a/dist/commonjs/resources/ux-dialog-body.d.ts b/dist/commonjs/resources/ux-dialog-body.d.ts new file mode 100644 index 0000000..87413a7 --- /dev/null +++ b/dist/commonjs/resources/ux-dialog-body.d.ts @@ -0,0 +1,2 @@ +export default class UxDialogBody { +} diff --git a/dist/commonjs/ux-dialog-body.js b/dist/commonjs/resources/ux-dialog-body.js similarity index 96% rename from dist/commonjs/ux-dialog-body.js rename to dist/commonjs/resources/ux-dialog-body.js index acc4b4f..3584677 100644 --- a/dist/commonjs/ux-dialog-body.js +++ b/dist/commonjs/resources/ux-dialog-body.js @@ -16,4 +16,4 @@ var UxDialogBody = /** @class */ (function () { ], UxDialogBody); return UxDialogBody; }()); -exports.UxDialogBody = UxDialogBody; +exports.default = UxDialogBody; diff --git a/dist/amd/ux-dialog-footer.d.ts b/dist/commonjs/resources/ux-dialog-footer.d.ts similarity index 77% rename from dist/amd/ux-dialog-footer.d.ts rename to dist/commonjs/resources/ux-dialog-footer.d.ts index 136e1bc..4b62e9f 100644 --- a/dist/amd/ux-dialog-footer.d.ts +++ b/dist/commonjs/resources/ux-dialog-footer.d.ts @@ -1,8 +1,8 @@ -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ -export declare class UxDialogFooter { +export default class UxDialogFooter { controller: DialogController; static isCancelButton(value: string): boolean; buttons: any[]; diff --git a/dist/commonjs/ux-dialog-footer.js b/dist/commonjs/resources/ux-dialog-footer.js similarity index 96% rename from dist/commonjs/ux-dialog-footer.js rename to dist/commonjs/resources/ux-dialog-footer.js index 9e242f9..5b85199 100644 --- a/dist/commonjs/ux-dialog-footer.js +++ b/dist/commonjs/resources/ux-dialog-footer.js @@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; Object.defineProperty(exports, "__esModule", { value: true }); var aurelia_templating_1 = require("aurelia-templating"); -var dialog_controller_1 = require("./dialog-controller"); +var dialog_controller_1 = require("../dialog-controller"); /** * View-model for footer of Dialog. */ @@ -34,6 +34,7 @@ var UxDialogFooter = /** @class */ (function () { this.buttons = ['Cancel', 'Ok']; } }; + var UxDialogFooter_1; /** * @internal */ @@ -50,6 +51,5 @@ var UxDialogFooter = /** @class */ (function () { aurelia_templating_1.inlineView("\n \n") ], UxDialogFooter); return UxDialogFooter; - var UxDialogFooter_1; }()); -exports.UxDialogFooter = UxDialogFooter; +exports.default = UxDialogFooter; diff --git a/dist/native-modules/ux-dialog-header.d.ts b/dist/commonjs/resources/ux-dialog-header.d.ts similarity index 61% rename from dist/native-modules/ux-dialog-header.d.ts rename to dist/commonjs/resources/ux-dialog-header.d.ts index c8843dd..629f073 100644 --- a/dist/native-modules/ux-dialog-header.d.ts +++ b/dist/commonjs/resources/ux-dialog-header.d.ts @@ -1,6 +1,6 @@ import { ComponentBind } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; -export declare class UxDialogHeader implements ComponentBind { +import { DialogController } from '../dialog-controller'; +export default class UxDialogHeader implements ComponentBind { controller: DialogController; showCloseButton: boolean | undefined; constructor(controller: DialogController); diff --git a/dist/commonjs/ux-dialog-header.js b/dist/commonjs/resources/ux-dialog-header.js similarity index 94% rename from dist/commonjs/ux-dialog-header.js rename to dist/commonjs/resources/ux-dialog-header.js index b9264af..89ec6e8 100644 --- a/dist/commonjs/ux-dialog-header.js +++ b/dist/commonjs/resources/ux-dialog-header.js @@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; Object.defineProperty(exports, "__esModule", { value: true }); var aurelia_templating_1 = require("aurelia-templating"); -var dialog_controller_1 = require("./dialog-controller"); +var dialog_controller_1 = require("../dialog-controller"); var UxDialogHeader = /** @class */ (function () { function UxDialogHeader(controller) { this.controller = controller; @@ -31,4 +31,4 @@ var UxDialogHeader = /** @class */ (function () { ], UxDialogHeader); return UxDialogHeader; }()); -exports.UxDialogHeader = UxDialogHeader; +exports.default = UxDialogHeader; diff --git a/dist/commonjs/resources/ux-dialog.d.ts b/dist/commonjs/resources/ux-dialog.d.ts new file mode 100644 index 0000000..318732a --- /dev/null +++ b/dist/commonjs/resources/ux-dialog.d.ts @@ -0,0 +1,2 @@ +export default class UxDialog { +} diff --git a/dist/commonjs/ux-dialog.js b/dist/commonjs/resources/ux-dialog.js similarity index 97% rename from dist/commonjs/ux-dialog.js rename to dist/commonjs/resources/ux-dialog.js index 2473a50..d3b5fb1 100644 --- a/dist/commonjs/ux-dialog.js +++ b/dist/commonjs/resources/ux-dialog.js @@ -16,4 +16,4 @@ var UxDialog = /** @class */ (function () { ], UxDialog); return UxDialog; }()); -exports.UxDialog = UxDialog; +exports.default = UxDialog; diff --git a/dist/commonjs/ux-dialog-body.d.ts b/dist/commonjs/ux-dialog-body.d.ts deleted file mode 100644 index 913aa89..0000000 --- a/dist/commonjs/ux-dialog-body.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialogBody { -} diff --git a/dist/commonjs/ux-dialog.d.ts b/dist/commonjs/ux-dialog.d.ts deleted file mode 100644 index 66dc80e..0000000 --- a/dist/commonjs/ux-dialog.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialog { -} diff --git a/dist/es2015/aurelia-dialog.d.ts b/dist/es2015/aurelia-dialog.d.ts index 7d7d580..9d72aca 100644 --- a/dist/es2015/aurelia-dialog.d.ts +++ b/dist/es2015/aurelia-dialog.d.ts @@ -1,11 +1,6 @@ import { FrameworkConfiguration } from 'aurelia-framework'; import { DialogConfiguration } from './dialog-configuration'; -export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void; -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; +export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void | Promise; export * from './interfaces'; export * from './dialog-settings'; export * from './dialog-configuration'; diff --git a/dist/es2015/aurelia-dialog.js b/dist/es2015/aurelia-dialog.js index 69cfd58..e444f79 100644 --- a/dist/es2015/aurelia-dialog.js +++ b/dist/es2015/aurelia-dialog.js @@ -8,13 +8,8 @@ export function configure(frameworkConfig, callback) { else { config.useDefaults(); } - applyConfig(); + return applyConfig(); } -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; export * from './dialog-settings'; export * from './dialog-configuration'; export * from './renderer'; diff --git a/dist/es2015/dialog-configuration.d.ts b/dist/es2015/dialog-configuration.d.ts index 2a741e1..705a45e 100644 --- a/dist/es2015/dialog-configuration.d.ts +++ b/dist/es2015/dialog-configuration.d.ts @@ -14,8 +14,8 @@ export declare class DialogConfiguration { * The global configuration settings. */ settings: DialogSettings; - constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void) => void); - private _apply(); + constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void | Promise) => void); + private _apply; /** * Selects the Aurelia conventional defaults for the dialog plugin. * @return This instance. diff --git a/dist/es2015/dialog-configuration.js b/dist/es2015/dialog-configuration.js index 8344194..a1ae28b 100644 --- a/dist/es2015/dialog-configuration.js +++ b/dist/es2015/dialog-configuration.js @@ -1,14 +1,14 @@ import { Renderer } from './renderer'; import { DefaultDialogSettings } from './dialog-settings'; import { DialogRenderer } from './dialog-renderer'; -import { DOM, PLATFORM } from 'aurelia-pal'; +import { DOM } from 'aurelia-pal'; const defaultRenderer = DialogRenderer; const resources = { - 'ux-dialog': PLATFORM.moduleName('./ux-dialog'), - 'ux-dialog-header': PLATFORM.moduleName('./ux-dialog-header'), - 'ux-dialog-body': PLATFORM.moduleName('./ux-dialog-body'), - 'ux-dialog-footer': PLATFORM.moduleName('./ux-dialog-footer'), - 'attach-focus': PLATFORM.moduleName('./attach-focus') + 'ux-dialog': () => import('./resources/ux-dialog'), + 'ux-dialog-header': () => import('./resources/ux-dialog-header'), + 'ux-dialog-body': () => import('./resources/ux-dialog-body'), + 'ux-dialog-footer': () => import('./resources/ux-dialog-footer'), + 'attach-focus': () => import('./resources/attach-focus') }; // tslint:disable-next-line:max-line-length const defaultCSSText = `ux-dialog-container,ux-dialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}ux-dialog-overlay{opacity:0}ux-dialog-overlay.active{opacity:1}ux-dialog-container{display:block;transition:opacity .2s linear;opacity:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}ux-dialog-container.active{opacity:1}ux-dialog-container>div{padding:30px}ux-dialog-container>div>div{display:block;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto}ux-dialog-container,ux-dialog-container>div,ux-dialog-container>div>div{outline:0}ux-dialog{display:table;box-shadow:0 5px 15px rgba(0,0,0,.5);border:1px solid rgba(0,0,0,.2);border-radius:5px;padding:3px;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border-image-source:initial;border-image-slice:initial;border-image-width:initial;border-image-outset:initial;border-image-repeat:initial;background:#fff}ux-dialog>ux-dialog-header{display:block;padding:16px;border-bottom:1px solid #e5e5e5}ux-dialog>ux-dialog-header>button{float:right;border:none;display:block;width:32px;height:32px;background:0 0;font-size:22px;line-height:16px;margin:-14px -16px 0 0;padding:0;cursor:pointer}ux-dialog>ux-dialog-body{display:block;padding:16px}ux-dialog>ux-dialog-footer{display:block;padding:6px;border-top:1px solid #e5e5e5;text-align:right}ux-dialog>ux-dialog-footer button{color:#333;background-color:#fff;padding:6px 12px;font-size:14px;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid #ccc;border-radius:4px;margin:5px 0 5px 5px}ux-dialog>ux-dialog-footer button:disabled{cursor:default;opacity:.45}ux-dialog>ux-dialog-footer button:hover:enabled{color:#333;background-color:#e6e6e6;border-color:#adadad}.ux-dialog-open{overflow:hidden}`; @@ -26,10 +26,15 @@ export class DialogConfiguration { } _apply() { this.fwConfig.transient(Renderer, this.renderer); - this.resources.forEach(resourceName => this.fwConfig.globalResources(resources[resourceName])); if (this.cssText) { DOM.injectStyles(this.cssText); } + if (this.resources.length) { + return Promise.all(this.resources.map(name => resources[name]())) + .then(modules => { + this.fwConfig.globalResources(modules.map(m => m.default)); + }); + } } /** * Selects the Aurelia conventional defaults for the dialog plugin. diff --git a/dist/es2015/dialog-renderer.d.ts b/dist/es2015/dialog-renderer.d.ts index e7ef185..9533b1d 100644 --- a/dist/es2015/dialog-renderer.d.ts +++ b/dist/es2015/dialog-renderer.d.ts @@ -13,15 +13,15 @@ export declare class DialogRenderer implements Renderer { dialogOverlay: HTMLElement; host: Element; anchor: Element; - private getOwnElements(parent, selector); - private attach(dialogController); - private detach(dialogController); - private setAsActive(); - private setAsInactive(); - private setupClickHandling(dialogController); - private clearClickHandling(); - private centerDialog(); - private awaitTransition(setActiveInactive, ignore); + private getOwnElements; + private attach; + private detach; + private setAsActive; + private setAsInactive; + private setupClickHandling; + private clearClickHandling; + private centerDialog; + private awaitTransition; getDialogContainer(): Element; showDialog(dialogController: DialogController): Promise; hideDialog(dialogController: DialogController): Promise; diff --git a/dist/es2015/dialog-renderer.js b/dist/es2015/dialog-renderer.js index 81e551e..b29135b 100644 --- a/dist/es2015/dialog-renderer.js +++ b/dist/es2015/dialog-renderer.js @@ -4,6 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +var DialogRenderer_1; import { DOM } from 'aurelia-pal'; import { transient } from 'aurelia-dependency-injection'; const containerTagName = 'ux-dialog-container'; @@ -21,7 +22,7 @@ export const transitionEvent = (() => { MozTransition: 'transitionend', WebkitTransition: 'webkitTransitionEnd' }; - for (let t in transitions) { + for (let t in transitions) { // tslint:disable-line:prefer-const if (el.style[t] !== undefined) { transition = transitions[t]; return transition; @@ -221,4 +222,3 @@ DialogRenderer = DialogRenderer_1 = __decorate([ transient() ], DialogRenderer); export { DialogRenderer }; -var DialogRenderer_1; diff --git a/dist/es2015/dialog-service.d.ts b/dist/es2015/dialog-service.d.ts index 093294b..9f9abdf 100644 --- a/dist/es2015/dialog-service.d.ts +++ b/dist/es2015/dialog-service.d.ts @@ -27,11 +27,11 @@ export declare class DialogService { hasOpenDialog: boolean; hasActiveDialog: boolean; constructor(container: Container, compositionEngine: CompositionEngine, defaultSettings: DialogSettings); - private validateSettings(settings); - private createCompositionContext(childContainer, host, settings); - private ensureViewModel(compositionContext); - private _cancelOperation(rejectOnCancel); - private composeAndShowDialog(compositionContext, dialogController); + private validateSettings; + private createCompositionContext; + private ensureViewModel; + private _cancelOperation; + private composeAndShowDialog; /** * Opens a new dialog. * @param settings Dialog settings for this dialog instance. diff --git a/dist/es2015/dialog-service.js b/dist/es2015/dialog-service.js index b0b3324..75faa92 100644 --- a/dist/es2015/dialog-service.js +++ b/dist/es2015/dialog-service.js @@ -1,5 +1,4 @@ import { Container } from 'aurelia-dependency-injection'; -import { Origin } from 'aurelia-metadata'; import { CompositionEngine, ViewSlot } from 'aurelia-templating'; import { DefaultDialogSettings } from './dialog-settings'; import { createDialogCancelError } from './dialog-cancel-error'; @@ -51,17 +50,10 @@ export class DialogService { }; } ensureViewModel(compositionContext) { - if (typeof compositionContext.viewModel === 'function') { - const moduleId = Origin.get(compositionContext.viewModel).moduleId; - if (!moduleId) { - return Promise.reject(new Error(`Can not resolve "moduleId" of "${compositionContext.viewModel.name}".`)); - } - compositionContext.viewModel = moduleId; - } - if (typeof compositionContext.viewModel === 'string') { - return this.compositionEngine.ensureViewModel(compositionContext); + if (typeof compositionContext.viewModel === 'object') { + return Promise.resolve(compositionContext); } - return Promise.resolve(compositionContext); + return this.compositionEngine.ensureViewModel(compositionContext); } _cancelOperation(rejectOnCancel) { if (!rejectOnCancel) { diff --git a/dist/native-modules/attach-focus.d.ts b/dist/es2015/resources/attach-focus.d.ts similarity index 84% rename from dist/native-modules/attach-focus.d.ts rename to dist/es2015/resources/attach-focus.d.ts index 8e8835c..4739274 100644 --- a/dist/native-modules/attach-focus.d.ts +++ b/dist/es2015/resources/attach-focus.d.ts @@ -4,5 +4,4 @@ export declare class AttachFocus implements ComponentAttached { value: boolean | string; constructor(element: HTMLElement); attached(): void; - valueChanged(newValue: string): void; } diff --git a/dist/es2015/attach-focus.js b/dist/es2015/resources/attach-focus.js similarity index 76% rename from dist/es2015/attach-focus.js rename to dist/es2015/resources/attach-focus.js index 4545ff9..c4bd6b6 100644 --- a/dist/es2015/attach-focus.js +++ b/dist/es2015/resources/attach-focus.js @@ -4,6 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +import { bindingMode } from 'aurelia-binding'; import { customAttribute } from 'aurelia-templating'; import { DOM } from 'aurelia-pal'; let AttachFocus = class AttachFocus { @@ -11,21 +12,18 @@ let AttachFocus = class AttachFocus { this.element = element; this.value = true; } - /** - * @internal - */ - // tslint:disable-next-line:member-ordering - static inject() { return [DOM.Element]; } attached() { - if (this.value && this.value !== 'false') { + if (this.value === '' || (this.value && this.value !== 'false')) { this.element.focus(); } } - valueChanged(newValue) { - this.value = newValue; - } }; +/** + * @internal + */ +// tslint:disable-next-line:member-ordering +AttachFocus.inject = [DOM.Element]; AttachFocus = __decorate([ - customAttribute('attach-focus') + customAttribute('attach-focus', bindingMode.oneTime) ], AttachFocus); export { AttachFocus }; diff --git a/dist/es2015/resources/ux-dialog-body.d.ts b/dist/es2015/resources/ux-dialog-body.d.ts new file mode 100644 index 0000000..87413a7 --- /dev/null +++ b/dist/es2015/resources/ux-dialog-body.d.ts @@ -0,0 +1,2 @@ +export default class UxDialogBody { +} diff --git a/dist/es2015/ux-dialog-body.js b/dist/es2015/resources/ux-dialog-body.js similarity index 96% rename from dist/es2015/ux-dialog-body.js rename to dist/es2015/resources/ux-dialog-body.js index a2fde04..fc201f6 100644 --- a/dist/es2015/ux-dialog-body.js +++ b/dist/es2015/resources/ux-dialog-body.js @@ -15,4 +15,4 @@ UxDialogBody = __decorate([ `) ], UxDialogBody); -export { UxDialogBody }; +export default UxDialogBody; diff --git a/dist/es2015/ux-dialog-footer.d.ts b/dist/es2015/resources/ux-dialog-footer.d.ts similarity index 77% rename from dist/es2015/ux-dialog-footer.d.ts rename to dist/es2015/resources/ux-dialog-footer.d.ts index 136e1bc..4b62e9f 100644 --- a/dist/es2015/ux-dialog-footer.d.ts +++ b/dist/es2015/resources/ux-dialog-footer.d.ts @@ -1,8 +1,8 @@ -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ -export declare class UxDialogFooter { +export default class UxDialogFooter { controller: DialogController; static isCancelButton(value: string): boolean; buttons: any[]; diff --git a/dist/es2015/ux-dialog-footer.js b/dist/es2015/resources/ux-dialog-footer.js similarity index 95% rename from dist/es2015/ux-dialog-footer.js rename to dist/es2015/resources/ux-dialog-footer.js index df2e85a..c5a5b60 100644 --- a/dist/es2015/ux-dialog-footer.js +++ b/dist/es2015/resources/ux-dialog-footer.js @@ -4,8 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +var UxDialogFooter_1; import { customElement, bindable, inlineView } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ @@ -59,5 +60,4 @@ UxDialogFooter = UxDialogFooter_1 = __decorate([ `) ], UxDialogFooter); -export { UxDialogFooter }; -var UxDialogFooter_1; +export default UxDialogFooter; diff --git a/dist/amd/ux-dialog-header.d.ts b/dist/es2015/resources/ux-dialog-header.d.ts similarity index 61% rename from dist/amd/ux-dialog-header.d.ts rename to dist/es2015/resources/ux-dialog-header.d.ts index c8843dd..629f073 100644 --- a/dist/amd/ux-dialog-header.d.ts +++ b/dist/es2015/resources/ux-dialog-header.d.ts @@ -1,6 +1,6 @@ import { ComponentBind } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; -export declare class UxDialogHeader implements ComponentBind { +import { DialogController } from '../dialog-controller'; +export default class UxDialogHeader implements ComponentBind { controller: DialogController; showCloseButton: boolean | undefined; constructor(controller: DialogController); diff --git a/dist/es2015/ux-dialog-header.js b/dist/es2015/resources/ux-dialog-header.js similarity index 94% rename from dist/es2015/ux-dialog-header.js rename to dist/es2015/resources/ux-dialog-header.js index 8f14d3f..31e7fcd 100644 --- a/dist/es2015/ux-dialog-header.js +++ b/dist/es2015/resources/ux-dialog-header.js @@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; import { customElement, bindable, inlineView } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; let UxDialogHeader = class UxDialogHeader { constructor(controller) { this.controller = controller; @@ -43,4 +43,4 @@ UxDialogHeader = __decorate([ `) ], UxDialogHeader); -export { UxDialogHeader }; +export default UxDialogHeader; diff --git a/dist/es2015/resources/ux-dialog.d.ts b/dist/es2015/resources/ux-dialog.d.ts new file mode 100644 index 0000000..318732a --- /dev/null +++ b/dist/es2015/resources/ux-dialog.d.ts @@ -0,0 +1,2 @@ +export default class UxDialog { +} diff --git a/dist/es2015/ux-dialog.js b/dist/es2015/resources/ux-dialog.js similarity index 96% rename from dist/es2015/ux-dialog.js rename to dist/es2015/resources/ux-dialog.js index 09e5975..df59bc9 100644 --- a/dist/es2015/ux-dialog.js +++ b/dist/es2015/resources/ux-dialog.js @@ -15,4 +15,4 @@ UxDialog = __decorate([ `) ], UxDialog); -export { UxDialog }; +export default UxDialog; diff --git a/dist/es2015/ux-dialog-body.d.ts b/dist/es2015/ux-dialog-body.d.ts deleted file mode 100644 index 913aa89..0000000 --- a/dist/es2015/ux-dialog-body.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialogBody { -} diff --git a/dist/es2015/ux-dialog.d.ts b/dist/es2015/ux-dialog.d.ts deleted file mode 100644 index 66dc80e..0000000 --- a/dist/es2015/ux-dialog.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialog { -} diff --git a/dist/native-modules/aurelia-dialog.d.ts b/dist/native-modules/aurelia-dialog.d.ts index 7d7d580..9d72aca 100644 --- a/dist/native-modules/aurelia-dialog.d.ts +++ b/dist/native-modules/aurelia-dialog.d.ts @@ -1,11 +1,6 @@ import { FrameworkConfiguration } from 'aurelia-framework'; import { DialogConfiguration } from './dialog-configuration'; -export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void; -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; +export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void | Promise; export * from './interfaces'; export * from './dialog-settings'; export * from './dialog-configuration'; diff --git a/dist/native-modules/aurelia-dialog.js b/dist/native-modules/aurelia-dialog.js index e130534..d8e0054 100644 --- a/dist/native-modules/aurelia-dialog.js +++ b/dist/native-modules/aurelia-dialog.js @@ -8,13 +8,8 @@ export function configure(frameworkConfig, callback) { else { config.useDefaults(); } - applyConfig(); + return applyConfig(); } -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; export * from './dialog-settings'; export * from './dialog-configuration'; export * from './renderer'; diff --git a/dist/native-modules/dialog-configuration.d.ts b/dist/native-modules/dialog-configuration.d.ts index 2a741e1..705a45e 100644 --- a/dist/native-modules/dialog-configuration.d.ts +++ b/dist/native-modules/dialog-configuration.d.ts @@ -14,8 +14,8 @@ export declare class DialogConfiguration { * The global configuration settings. */ settings: DialogSettings; - constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void) => void); - private _apply(); + constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void | Promise) => void); + private _apply; /** * Selects the Aurelia conventional defaults for the dialog plugin. * @return This instance. diff --git a/dist/native-modules/dialog-configuration.js b/dist/native-modules/dialog-configuration.js index df7b54b..db19a6e 100644 --- a/dist/native-modules/dialog-configuration.js +++ b/dist/native-modules/dialog-configuration.js @@ -1,14 +1,14 @@ import { Renderer } from './renderer'; import { DefaultDialogSettings } from './dialog-settings'; import { DialogRenderer } from './dialog-renderer'; -import { DOM, PLATFORM } from 'aurelia-pal'; +import { DOM } from 'aurelia-pal'; var defaultRenderer = DialogRenderer; var resources = { - 'ux-dialog': PLATFORM.moduleName('./ux-dialog'), - 'ux-dialog-header': PLATFORM.moduleName('./ux-dialog-header'), - 'ux-dialog-body': PLATFORM.moduleName('./ux-dialog-body'), - 'ux-dialog-footer': PLATFORM.moduleName('./ux-dialog-footer'), - 'attach-focus': PLATFORM.moduleName('./attach-focus') + 'ux-dialog': function () { return import('./resources/ux-dialog'); }, + 'ux-dialog-header': function () { return import('./resources/ux-dialog-header'); }, + 'ux-dialog-body': function () { return import('./resources/ux-dialog-body'); }, + 'ux-dialog-footer': function () { return import('./resources/ux-dialog-footer'); }, + 'attach-focus': function () { return import('./resources/attach-focus'); } }; // tslint:disable-next-line:max-line-length var defaultCSSText = "ux-dialog-container,ux-dialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}ux-dialog-overlay{opacity:0}ux-dialog-overlay.active{opacity:1}ux-dialog-container{display:block;transition:opacity .2s linear;opacity:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}ux-dialog-container.active{opacity:1}ux-dialog-container>div{padding:30px}ux-dialog-container>div>div{display:block;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto}ux-dialog-container,ux-dialog-container>div,ux-dialog-container>div>div{outline:0}ux-dialog{display:table;box-shadow:0 5px 15px rgba(0,0,0,.5);border:1px solid rgba(0,0,0,.2);border-radius:5px;padding:3px;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border-image-source:initial;border-image-slice:initial;border-image-width:initial;border-image-outset:initial;border-image-repeat:initial;background:#fff}ux-dialog>ux-dialog-header{display:block;padding:16px;border-bottom:1px solid #e5e5e5}ux-dialog>ux-dialog-header>button{float:right;border:none;display:block;width:32px;height:32px;background:0 0;font-size:22px;line-height:16px;margin:-14px -16px 0 0;padding:0;cursor:pointer}ux-dialog>ux-dialog-body{display:block;padding:16px}ux-dialog>ux-dialog-footer{display:block;padding:6px;border-top:1px solid #e5e5e5;text-align:right}ux-dialog>ux-dialog-footer button{color:#333;background-color:#fff;padding:6px 12px;font-size:14px;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid #ccc;border-radius:4px;margin:5px 0 5px 5px}ux-dialog>ux-dialog-footer button:disabled{cursor:default;opacity:.45}ux-dialog>ux-dialog-footer button:hover:enabled{color:#333;background-color:#e6e6e6;border-color:#adadad}.ux-dialog-open{overflow:hidden}"; @@ -28,10 +28,15 @@ var DialogConfiguration = /** @class */ (function () { DialogConfiguration.prototype._apply = function () { var _this = this; this.fwConfig.transient(Renderer, this.renderer); - this.resources.forEach(function (resourceName) { return _this.fwConfig.globalResources(resources[resourceName]); }); if (this.cssText) { DOM.injectStyles(this.cssText); } + if (this.resources.length) { + return Promise.all(this.resources.map(function (name) { return resources[name](); })) + .then(function (modules) { + _this.fwConfig.globalResources(modules.map(function (m) { return m.default; })); + }); + } }; /** * Selects the Aurelia conventional defaults for the dialog plugin. diff --git a/dist/native-modules/dialog-renderer.d.ts b/dist/native-modules/dialog-renderer.d.ts index e7ef185..9533b1d 100644 --- a/dist/native-modules/dialog-renderer.d.ts +++ b/dist/native-modules/dialog-renderer.d.ts @@ -13,15 +13,15 @@ export declare class DialogRenderer implements Renderer { dialogOverlay: HTMLElement; host: Element; anchor: Element; - private getOwnElements(parent, selector); - private attach(dialogController); - private detach(dialogController); - private setAsActive(); - private setAsInactive(); - private setupClickHandling(dialogController); - private clearClickHandling(); - private centerDialog(); - private awaitTransition(setActiveInactive, ignore); + private getOwnElements; + private attach; + private detach; + private setAsActive; + private setAsInactive; + private setupClickHandling; + private clearClickHandling; + private centerDialog; + private awaitTransition; getDialogContainer(): Element; showDialog(dialogController: DialogController): Promise; hideDialog(dialogController: DialogController): Promise; diff --git a/dist/native-modules/dialog-renderer.js b/dist/native-modules/dialog-renderer.js index 1f38083..5b4a37d 100644 --- a/dist/native-modules/dialog-renderer.js +++ b/dist/native-modules/dialog-renderer.js @@ -21,7 +21,7 @@ export var transitionEvent = (function () { MozTransition: 'transitionend', WebkitTransition: 'webkitTransitionEnd' }; - for (var t in transitions) { + for (var t in transitions) { // tslint:disable-line:prefer-const if (el.style[t] !== undefined) { transition = transitions[t]; return transition; @@ -221,11 +221,11 @@ var DialogRenderer = /** @class */ (function () { return this.awaitTransition(function () { return _this.setAsInactive(); }, dialogController.settings.ignoreTransitions) .then(function () { _this.detach(dialogController); }); }; + var DialogRenderer_1; DialogRenderer.dialogControllers = []; DialogRenderer = DialogRenderer_1 = __decorate([ transient() ], DialogRenderer); return DialogRenderer; - var DialogRenderer_1; }()); export { DialogRenderer }; diff --git a/dist/native-modules/dialog-service.d.ts b/dist/native-modules/dialog-service.d.ts index 093294b..9f9abdf 100644 --- a/dist/native-modules/dialog-service.d.ts +++ b/dist/native-modules/dialog-service.d.ts @@ -27,11 +27,11 @@ export declare class DialogService { hasOpenDialog: boolean; hasActiveDialog: boolean; constructor(container: Container, compositionEngine: CompositionEngine, defaultSettings: DialogSettings); - private validateSettings(settings); - private createCompositionContext(childContainer, host, settings); - private ensureViewModel(compositionContext); - private _cancelOperation(rejectOnCancel); - private composeAndShowDialog(compositionContext, dialogController); + private validateSettings; + private createCompositionContext; + private ensureViewModel; + private _cancelOperation; + private composeAndShowDialog; /** * Opens a new dialog. * @param settings Dialog settings for this dialog instance. diff --git a/dist/native-modules/dialog-service.js b/dist/native-modules/dialog-service.js index 0b012c5..9a9dcee 100644 --- a/dist/native-modules/dialog-service.js +++ b/dist/native-modules/dialog-service.js @@ -1,5 +1,4 @@ import { Container } from 'aurelia-dependency-injection'; -import { Origin } from 'aurelia-metadata'; import { CompositionEngine, ViewSlot } from 'aurelia-templating'; import { DefaultDialogSettings } from './dialog-settings'; import { createDialogCancelError } from './dialog-cancel-error'; @@ -51,17 +50,10 @@ var DialogService = /** @class */ (function () { }; }; DialogService.prototype.ensureViewModel = function (compositionContext) { - if (typeof compositionContext.viewModel === 'function') { - var moduleId = Origin.get(compositionContext.viewModel).moduleId; - if (!moduleId) { - return Promise.reject(new Error("Can not resolve \"moduleId\" of \"" + compositionContext.viewModel.name + "\".")); - } - compositionContext.viewModel = moduleId; - } - if (typeof compositionContext.viewModel === 'string') { - return this.compositionEngine.ensureViewModel(compositionContext); + if (typeof compositionContext.viewModel === 'object') { + return Promise.resolve(compositionContext); } - return Promise.resolve(compositionContext); + return this.compositionEngine.ensureViewModel(compositionContext); }; DialogService.prototype._cancelOperation = function (rejectOnCancel) { if (!rejectOnCancel) { diff --git a/dist/commonjs/attach-focus.d.ts b/dist/native-modules/resources/attach-focus.d.ts similarity index 84% rename from dist/commonjs/attach-focus.d.ts rename to dist/native-modules/resources/attach-focus.d.ts index 8e8835c..4739274 100644 --- a/dist/commonjs/attach-focus.d.ts +++ b/dist/native-modules/resources/attach-focus.d.ts @@ -4,5 +4,4 @@ export declare class AttachFocus implements ComponentAttached { value: boolean | string; constructor(element: HTMLElement); attached(): void; - valueChanged(newValue: string): void; } diff --git a/dist/native-modules/attach-focus.js b/dist/native-modules/resources/attach-focus.js similarity index 81% rename from dist/native-modules/attach-focus.js rename to dist/native-modules/resources/attach-focus.js index 0c6aaa2..2d16af8 100644 --- a/dist/native-modules/attach-focus.js +++ b/dist/native-modules/resources/attach-focus.js @@ -4,6 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +import { bindingMode } from 'aurelia-binding'; import { customAttribute } from 'aurelia-templating'; import { DOM } from 'aurelia-pal'; var AttachFocus = /** @class */ (function () { @@ -11,21 +12,18 @@ var AttachFocus = /** @class */ (function () { this.element = element; this.value = true; } - /** - * @internal - */ - // tslint:disable-next-line:member-ordering - AttachFocus.inject = function () { return [DOM.Element]; }; AttachFocus.prototype.attached = function () { - if (this.value && this.value !== 'false') { + if (this.value === '' || (this.value && this.value !== 'false')) { this.element.focus(); } }; - AttachFocus.prototype.valueChanged = function (newValue) { - this.value = newValue; - }; + /** + * @internal + */ + // tslint:disable-next-line:member-ordering + AttachFocus.inject = [DOM.Element]; AttachFocus = __decorate([ - customAttribute('attach-focus') + customAttribute('attach-focus', bindingMode.oneTime) ], AttachFocus); return AttachFocus; }()); diff --git a/dist/native-modules/resources/ux-dialog-body.d.ts b/dist/native-modules/resources/ux-dialog-body.d.ts new file mode 100644 index 0000000..87413a7 --- /dev/null +++ b/dist/native-modules/resources/ux-dialog-body.d.ts @@ -0,0 +1,2 @@ +export default class UxDialogBody { +} diff --git a/dist/native-modules/ux-dialog-body.js b/dist/native-modules/resources/ux-dialog-body.js similarity index 96% rename from dist/native-modules/ux-dialog-body.js rename to dist/native-modules/resources/ux-dialog-body.js index 67fb7ee..c25044c 100644 --- a/dist/native-modules/ux-dialog-body.js +++ b/dist/native-modules/resources/ux-dialog-body.js @@ -14,4 +14,4 @@ var UxDialogBody = /** @class */ (function () { ], UxDialogBody); return UxDialogBody; }()); -export { UxDialogBody }; +export default UxDialogBody; diff --git a/dist/native-modules/ux-dialog-footer.d.ts b/dist/native-modules/resources/ux-dialog-footer.d.ts similarity index 77% rename from dist/native-modules/ux-dialog-footer.d.ts rename to dist/native-modules/resources/ux-dialog-footer.d.ts index 136e1bc..4b62e9f 100644 --- a/dist/native-modules/ux-dialog-footer.d.ts +++ b/dist/native-modules/resources/ux-dialog-footer.d.ts @@ -1,8 +1,8 @@ -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ -export declare class UxDialogFooter { +export default class UxDialogFooter { controller: DialogController; static isCancelButton(value: string): boolean; buttons: any[]; diff --git a/dist/native-modules/ux-dialog-footer.js b/dist/native-modules/resources/ux-dialog-footer.js similarity index 96% rename from dist/native-modules/ux-dialog-footer.js rename to dist/native-modules/resources/ux-dialog-footer.js index 37e9839..ecaa05d 100644 --- a/dist/native-modules/ux-dialog-footer.js +++ b/dist/native-modules/resources/ux-dialog-footer.js @@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; import { customElement, bindable, inlineView } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; /** * View-model for footer of Dialog. */ @@ -32,6 +32,7 @@ var UxDialogFooter = /** @class */ (function () { this.buttons = ['Cancel', 'Ok']; } }; + var UxDialogFooter_1; /** * @internal */ @@ -48,6 +49,5 @@ var UxDialogFooter = /** @class */ (function () { inlineView("\n \n") ], UxDialogFooter); return UxDialogFooter; - var UxDialogFooter_1; }()); -export { UxDialogFooter }; +export default UxDialogFooter; diff --git a/dist/commonjs/ux-dialog-header.d.ts b/dist/native-modules/resources/ux-dialog-header.d.ts similarity index 61% rename from dist/commonjs/ux-dialog-header.d.ts rename to dist/native-modules/resources/ux-dialog-header.d.ts index c8843dd..629f073 100644 --- a/dist/commonjs/ux-dialog-header.d.ts +++ b/dist/native-modules/resources/ux-dialog-header.d.ts @@ -1,6 +1,6 @@ import { ComponentBind } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; -export declare class UxDialogHeader implements ComponentBind { +import { DialogController } from '../dialog-controller'; +export default class UxDialogHeader implements ComponentBind { controller: DialogController; showCloseButton: boolean | undefined; constructor(controller: DialogController); diff --git a/dist/native-modules/ux-dialog-header.js b/dist/native-modules/resources/ux-dialog-header.js similarity index 95% rename from dist/native-modules/ux-dialog-header.js rename to dist/native-modules/resources/ux-dialog-header.js index 327da9a..c6e9354 100644 --- a/dist/native-modules/ux-dialog-header.js +++ b/dist/native-modules/resources/ux-dialog-header.js @@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; import { customElement, bindable, inlineView } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; +import { DialogController } from '../dialog-controller'; var UxDialogHeader = /** @class */ (function () { function UxDialogHeader(controller) { this.controller = controller; @@ -29,4 +29,4 @@ var UxDialogHeader = /** @class */ (function () { ], UxDialogHeader); return UxDialogHeader; }()); -export { UxDialogHeader }; +export default UxDialogHeader; diff --git a/dist/native-modules/resources/ux-dialog.d.ts b/dist/native-modules/resources/ux-dialog.d.ts new file mode 100644 index 0000000..318732a --- /dev/null +++ b/dist/native-modules/resources/ux-dialog.d.ts @@ -0,0 +1,2 @@ +export default class UxDialog { +} diff --git a/dist/native-modules/ux-dialog.js b/dist/native-modules/resources/ux-dialog.js similarity index 97% rename from dist/native-modules/ux-dialog.js rename to dist/native-modules/resources/ux-dialog.js index 428762e..f90fe78 100644 --- a/dist/native-modules/ux-dialog.js +++ b/dist/native-modules/resources/ux-dialog.js @@ -14,4 +14,4 @@ var UxDialog = /** @class */ (function () { ], UxDialog); return UxDialog; }()); -export { UxDialog }; +export default UxDialog; diff --git a/dist/native-modules/ux-dialog-body.d.ts b/dist/native-modules/ux-dialog-body.d.ts deleted file mode 100644 index 913aa89..0000000 --- a/dist/native-modules/ux-dialog-body.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialogBody { -} diff --git a/dist/native-modules/ux-dialog.d.ts b/dist/native-modules/ux-dialog.d.ts deleted file mode 100644 index 66dc80e..0000000 --- a/dist/native-modules/ux-dialog.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialog { -} diff --git a/dist/system/attach-focus.d.ts b/dist/system/attach-focus.d.ts deleted file mode 100644 index 8e8835c..0000000 --- a/dist/system/attach-focus.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ComponentAttached } from 'aurelia-templating'; -export declare class AttachFocus implements ComponentAttached { - private element; - value: boolean | string; - constructor(element: HTMLElement); - attached(): void; - valueChanged(newValue: string): void; -} diff --git a/dist/system/aurelia-dialog.d.ts b/dist/system/aurelia-dialog.d.ts index 7d7d580..9d72aca 100644 --- a/dist/system/aurelia-dialog.d.ts +++ b/dist/system/aurelia-dialog.d.ts @@ -1,11 +1,6 @@ import { FrameworkConfiguration } from 'aurelia-framework'; import { DialogConfiguration } from './dialog-configuration'; -export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void; -export * from './ux-dialog'; -export * from './ux-dialog-header'; -export * from './ux-dialog-body'; -export * from './ux-dialog-footer'; -export * from './attach-focus'; +export declare function configure(frameworkConfig: FrameworkConfiguration, callback?: (config: DialogConfiguration) => void): void | Promise; export * from './interfaces'; export * from './dialog-settings'; export * from './dialog-configuration'; diff --git a/dist/system/aurelia-dialog.js b/dist/system/aurelia-dialog.js index d2f436b..d897f8a 100644 --- a/dist/system/aurelia-dialog.js +++ b/dist/system/aurelia-dialog.js @@ -1,5 +1,6 @@ -System.register(["./dialog-configuration", "./ux-dialog", "./ux-dialog-header", "./ux-dialog-body", "./ux-dialog-footer", "./attach-focus", "./dialog-settings", "./renderer", "./dialog-cancel-error", "./dialog-service", "./dialog-controller"], function (exports_1, context_1) { +System.register(["./dialog-configuration", "./dialog-settings", "./renderer", "./dialog-cancel-error", "./dialog-service", "./dialog-controller"], function (exports_1, context_1) { "use strict"; + var dialog_configuration_1; var __moduleName = context_1 && context_1.id; function configure(frameworkConfig, callback) { var applyConfig = null; @@ -10,10 +11,9 @@ System.register(["./dialog-configuration", "./ux-dialog", "./ux-dialog-header", else { config.useDefaults(); } - applyConfig(); + return applyConfig(); } exports_1("configure", configure); - var dialog_configuration_1; var exportedNames_1 = { "configure": true }; @@ -30,21 +30,6 @@ System.register(["./dialog-configuration", "./ux-dialog", "./ux-dialog-header", dialog_configuration_1 = dialog_configuration_1_1; exportStar_1(dialog_configuration_1_1); }, - function (ux_dialog_1_1) { - exportStar_1(ux_dialog_1_1); - }, - function (ux_dialog_header_1_1) { - exportStar_1(ux_dialog_header_1_1); - }, - function (ux_dialog_body_1_1) { - exportStar_1(ux_dialog_body_1_1); - }, - function (ux_dialog_footer_1_1) { - exportStar_1(ux_dialog_footer_1_1); - }, - function (attach_focus_1_1) { - exportStar_1(attach_focus_1_1); - }, function (dialog_settings_1_1) { exportStar_1(dialog_settings_1_1); }, diff --git a/dist/system/dialog-configuration.d.ts b/dist/system/dialog-configuration.d.ts index 2a741e1..705a45e 100644 --- a/dist/system/dialog-configuration.d.ts +++ b/dist/system/dialog-configuration.d.ts @@ -14,8 +14,8 @@ export declare class DialogConfiguration { * The global configuration settings. */ settings: DialogSettings; - constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void) => void); - private _apply(); + constructor(frameworkConfiguration: FrameworkConfiguration, applySetter: (apply: () => void | Promise) => void); + private _apply; /** * Selects the Aurelia conventional defaults for the dialog plugin. * @return This instance. diff --git a/dist/system/dialog-configuration.js b/dist/system/dialog-configuration.js index 70b4df0..b050ee3 100644 --- a/dist/system/dialog-configuration.js +++ b/dist/system/dialog-configuration.js @@ -1,7 +1,7 @@ System.register(["./renderer", "./dialog-settings", "./dialog-renderer", "aurelia-pal"], function (exports_1, context_1) { "use strict"; - var __moduleName = context_1 && context_1.id; var renderer_1, dialog_settings_1, dialog_renderer_1, aurelia_pal_1, defaultRenderer, resources, defaultCSSText, DialogConfiguration; + var __moduleName = context_1 && context_1.id; return { setters: [ function (renderer_1_1) { @@ -20,11 +20,11 @@ System.register(["./renderer", "./dialog-settings", "./dialog-renderer", "aureli execute: function () { defaultRenderer = dialog_renderer_1.DialogRenderer; resources = { - 'ux-dialog': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog'), - 'ux-dialog-header': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-header'), - 'ux-dialog-body': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-body'), - 'ux-dialog-footer': aurelia_pal_1.PLATFORM.moduleName('./ux-dialog-footer'), - 'attach-focus': aurelia_pal_1.PLATFORM.moduleName('./attach-focus') + 'ux-dialog': function () { return context_1.import('./resources/ux-dialog'); }, + 'ux-dialog-header': function () { return context_1.import('./resources/ux-dialog-header'); }, + 'ux-dialog-body': function () { return context_1.import('./resources/ux-dialog-body'); }, + 'ux-dialog-footer': function () { return context_1.import('./resources/ux-dialog-footer'); }, + 'attach-focus': function () { return context_1.import('./resources/attach-focus'); } }; // tslint:disable-next-line:max-line-length defaultCSSText = "ux-dialog-container,ux-dialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}ux-dialog-overlay{opacity:0}ux-dialog-overlay.active{opacity:1}ux-dialog-container{display:block;transition:opacity .2s linear;opacity:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}ux-dialog-container.active{opacity:1}ux-dialog-container>div{padding:30px}ux-dialog-container>div>div{display:block;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto}ux-dialog-container,ux-dialog-container>div,ux-dialog-container>div>div{outline:0}ux-dialog{display:table;box-shadow:0 5px 15px rgba(0,0,0,.5);border:1px solid rgba(0,0,0,.2);border-radius:5px;padding:3px;min-width:300px;width:-moz-fit-content;width:-webkit-fit-content;width:fit-content;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border-image-source:initial;border-image-slice:initial;border-image-width:initial;border-image-outset:initial;border-image-repeat:initial;background:#fff}ux-dialog>ux-dialog-header{display:block;padding:16px;border-bottom:1px solid #e5e5e5}ux-dialog>ux-dialog-header>button{float:right;border:none;display:block;width:32px;height:32px;background:0 0;font-size:22px;line-height:16px;margin:-14px -16px 0 0;padding:0;cursor:pointer}ux-dialog>ux-dialog-body{display:block;padding:16px}ux-dialog>ux-dialog-footer{display:block;padding:6px;border-top:1px solid #e5e5e5;text-align:right}ux-dialog>ux-dialog-footer button{color:#333;background-color:#fff;padding:6px 12px;font-size:14px;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid #ccc;border-radius:4px;margin:5px 0 5px 5px}ux-dialog>ux-dialog-footer button:disabled{cursor:default;opacity:.45}ux-dialog>ux-dialog-footer button:hover:enabled{color:#333;background-color:#e6e6e6;border-color:#adadad}.ux-dialog-open{overflow:hidden}"; @@ -44,10 +44,15 @@ System.register(["./renderer", "./dialog-settings", "./dialog-renderer", "aureli DialogConfiguration.prototype._apply = function () { var _this = this; this.fwConfig.transient(renderer_1.Renderer, this.renderer); - this.resources.forEach(function (resourceName) { return _this.fwConfig.globalResources(resources[resourceName]); }); if (this.cssText) { aurelia_pal_1.DOM.injectStyles(this.cssText); } + if (this.resources.length) { + return Promise.all(this.resources.map(function (name) { return resources[name](); })) + .then(function (modules) { + _this.fwConfig.globalResources(modules.map(function (m) { return m.default; })); + }); + } }; /** * Selects the Aurelia conventional defaults for the dialog plugin. diff --git a/dist/system/dialog-controller.js b/dist/system/dialog-controller.js index 2887a57..53dc4a3 100644 --- a/dist/system/dialog-controller.js +++ b/dist/system/dialog-controller.js @@ -1,7 +1,7 @@ System.register(["./renderer", "./lifecycle", "./dialog-close-error", "./dialog-cancel-error"], function (exports_1, context_1) { "use strict"; - var __moduleName = context_1 && context_1.id; var renderer_1, lifecycle_1, dialog_close_error_1, dialog_cancel_error_1, DialogController; + var __moduleName = context_1 && context_1.id; return { setters: [ function (renderer_1_1) { diff --git a/dist/system/dialog-renderer.d.ts b/dist/system/dialog-renderer.d.ts index e7ef185..9533b1d 100644 --- a/dist/system/dialog-renderer.d.ts +++ b/dist/system/dialog-renderer.d.ts @@ -13,15 +13,15 @@ export declare class DialogRenderer implements Renderer { dialogOverlay: HTMLElement; host: Element; anchor: Element; - private getOwnElements(parent, selector); - private attach(dialogController); - private detach(dialogController); - private setAsActive(); - private setAsInactive(); - private setupClickHandling(dialogController); - private clearClickHandling(); - private centerDialog(); - private awaitTransition(setActiveInactive, ignore); + private getOwnElements; + private attach; + private detach; + private setAsActive; + private setAsInactive; + private setupClickHandling; + private clearClickHandling; + private centerDialog; + private awaitTransition; getDialogContainer(): Element; showDialog(dialogController: DialogController): Promise; hideDialog(dialogController: DialogController): Promise; diff --git a/dist/system/dialog-renderer.js b/dist/system/dialog-renderer.js index 7adb344..64745f9 100644 --- a/dist/system/dialog-renderer.js +++ b/dist/system/dialog-renderer.js @@ -6,6 +6,7 @@ System.register(["aurelia-pal", "aurelia-dependency-injection"], function (expor else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; + var aurelia_pal_1, aurelia_dependency_injection_1, containerTagName, overlayTagName, transitionEvent, hasTransition, body, DialogRenderer; var __moduleName = context_1 && context_1.id; function getActionKey(e) { if ((e.code || e.key) === 'Escape' || e.keyCode === 27) { @@ -16,7 +17,6 @@ System.register(["aurelia-pal", "aurelia-dependency-injection"], function (expor } return undefined; } - var aurelia_pal_1, aurelia_dependency_injection_1, containerTagName, overlayTagName, transitionEvent, hasTransition, body, DialogRenderer; return { setters: [ function (aurelia_pal_1_1) { @@ -42,7 +42,7 @@ System.register(["aurelia-pal", "aurelia-dependency-injection"], function (expor MozTransition: 'transitionend', WebkitTransition: 'webkitTransitionEnd' }; - for (var t in transitions) { + for (var t in transitions) { // tslint:disable-line:prefer-const if (el.style[t] !== undefined) { transition = transitions[t]; return transition; @@ -232,12 +232,12 @@ System.register(["aurelia-pal", "aurelia-dependency-injection"], function (expor return this.awaitTransition(function () { return _this.setAsInactive(); }, dialogController.settings.ignoreTransitions) .then(function () { _this.detach(dialogController); }); }; + var DialogRenderer_1; DialogRenderer.dialogControllers = []; DialogRenderer = DialogRenderer_1 = __decorate([ aurelia_dependency_injection_1.transient() ], DialogRenderer); return DialogRenderer; - var DialogRenderer_1; }()); exports_1("DialogRenderer", DialogRenderer); } diff --git a/dist/system/dialog-service.d.ts b/dist/system/dialog-service.d.ts index 093294b..9f9abdf 100644 --- a/dist/system/dialog-service.d.ts +++ b/dist/system/dialog-service.d.ts @@ -27,11 +27,11 @@ export declare class DialogService { hasOpenDialog: boolean; hasActiveDialog: boolean; constructor(container: Container, compositionEngine: CompositionEngine, defaultSettings: DialogSettings); - private validateSettings(settings); - private createCompositionContext(childContainer, host, settings); - private ensureViewModel(compositionContext); - private _cancelOperation(rejectOnCancel); - private composeAndShowDialog(compositionContext, dialogController); + private validateSettings; + private createCompositionContext; + private ensureViewModel; + private _cancelOperation; + private composeAndShowDialog; /** * Opens a new dialog. * @param settings Dialog settings for this dialog instance. diff --git a/dist/system/dialog-service.js b/dist/system/dialog-service.js index c1748c2..5e3102f 100644 --- a/dist/system/dialog-service.js +++ b/dist/system/dialog-service.js @@ -1,5 +1,6 @@ -System.register(["aurelia-dependency-injection", "aurelia-metadata", "aurelia-templating", "./dialog-settings", "./dialog-cancel-error", "./lifecycle", "./dialog-controller"], function (exports_1, context_1) { +System.register(["aurelia-dependency-injection", "aurelia-templating", "./dialog-settings", "./dialog-cancel-error", "./lifecycle", "./dialog-controller"], function (exports_1, context_1) { "use strict"; + var aurelia_dependency_injection_1, aurelia_templating_1, dialog_settings_1, dialog_cancel_error_1, lifecycle_1, dialog_controller_1, DialogService; var __moduleName = context_1 && context_1.id; /* tslint:enable:max-line-length */ function whenClosed(onfulfilled, onrejected) { @@ -16,15 +17,11 @@ System.register(["aurelia-dependency-injection", "aurelia-metadata", "aurelia-te service.hasActiveDialog = service.hasOpenDialog = !!service.controllers.length; } } - var aurelia_dependency_injection_1, aurelia_metadata_1, aurelia_templating_1, dialog_settings_1, dialog_cancel_error_1, lifecycle_1, dialog_controller_1, DialogService; return { setters: [ function (aurelia_dependency_injection_1_1) { aurelia_dependency_injection_1 = aurelia_dependency_injection_1_1; }, - function (aurelia_metadata_1_1) { - aurelia_metadata_1 = aurelia_metadata_1_1; - }, function (aurelia_templating_1_1) { aurelia_templating_1 = aurelia_templating_1_1; }, @@ -77,17 +74,10 @@ System.register(["aurelia-dependency-injection", "aurelia-metadata", "aurelia-te }; }; DialogService.prototype.ensureViewModel = function (compositionContext) { - if (typeof compositionContext.viewModel === 'function') { - var moduleId = aurelia_metadata_1.Origin.get(compositionContext.viewModel).moduleId; - if (!moduleId) { - return Promise.reject(new Error("Can not resolve \"moduleId\" of \"" + compositionContext.viewModel.name + "\".")); - } - compositionContext.viewModel = moduleId; - } - if (typeof compositionContext.viewModel === 'string') { - return this.compositionEngine.ensureViewModel(compositionContext); + if (typeof compositionContext.viewModel === 'object') { + return Promise.resolve(compositionContext); } - return Promise.resolve(compositionContext); + return this.compositionEngine.ensureViewModel(compositionContext); }; DialogService.prototype._cancelOperation = function (rejectOnCancel) { if (!rejectOnCancel) { diff --git a/dist/system/dialog-settings.js b/dist/system/dialog-settings.js index c32e3a0..0b8a27d 100644 --- a/dist/system/dialog-settings.js +++ b/dist/system/dialog-settings.js @@ -1,7 +1,7 @@ System.register([], function (exports_1, context_1) { "use strict"; - var __moduleName = context_1 && context_1.id; var DefaultDialogSettings; + var __moduleName = context_1 && context_1.id; return { setters: [], execute: function () { diff --git a/dist/system/renderer.js b/dist/system/renderer.js index 17d0a40..407b27e 100644 --- a/dist/system/renderer.js +++ b/dist/system/renderer.js @@ -1,7 +1,7 @@ System.register([], function (exports_1, context_1) { "use strict"; - var __moduleName = context_1 && context_1.id; var Renderer; + var __moduleName = context_1 && context_1.id; return { setters: [], execute: function () { diff --git a/dist/system/resources/attach-focus.d.ts b/dist/system/resources/attach-focus.d.ts new file mode 100644 index 0000000..4739274 --- /dev/null +++ b/dist/system/resources/attach-focus.d.ts @@ -0,0 +1,7 @@ +import { ComponentAttached } from 'aurelia-templating'; +export declare class AttachFocus implements ComponentAttached { + private element; + value: boolean | string; + constructor(element: HTMLElement); + attached(): void; +} diff --git a/dist/system/attach-focus.js b/dist/system/resources/attach-focus.js similarity index 77% rename from dist/system/attach-focus.js rename to dist/system/resources/attach-focus.js index ae83f29..a84993e 100644 --- a/dist/system/attach-focus.js +++ b/dist/system/resources/attach-focus.js @@ -1,4 +1,4 @@ -System.register(["aurelia-templating", "aurelia-pal"], function (exports_1, context_1) { +System.register(["aurelia-binding", "aurelia-templating", "aurelia-pal"], function (exports_1, context_1) { "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; @@ -6,10 +6,13 @@ System.register(["aurelia-templating", "aurelia-pal"], function (exports_1, cont else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; + var aurelia_binding_1, aurelia_templating_1, aurelia_pal_1, AttachFocus; var __moduleName = context_1 && context_1.id; - var aurelia_templating_1, aurelia_pal_1, AttachFocus; return { setters: [ + function (aurelia_binding_1_1) { + aurelia_binding_1 = aurelia_binding_1_1; + }, function (aurelia_templating_1_1) { aurelia_templating_1 = aurelia_templating_1_1; }, @@ -23,21 +26,18 @@ System.register(["aurelia-templating", "aurelia-pal"], function (exports_1, cont this.element = element; this.value = true; } - /** - * @internal - */ - // tslint:disable-next-line:member-ordering - AttachFocus.inject = function () { return [aurelia_pal_1.DOM.Element]; }; AttachFocus.prototype.attached = function () { - if (this.value && this.value !== 'false') { + if (this.value === '' || (this.value && this.value !== 'false')) { this.element.focus(); } }; - AttachFocus.prototype.valueChanged = function (newValue) { - this.value = newValue; - }; + /** + * @internal + */ + // tslint:disable-next-line:member-ordering + AttachFocus.inject = [aurelia_pal_1.DOM.Element]; AttachFocus = __decorate([ - aurelia_templating_1.customAttribute('attach-focus') + aurelia_templating_1.customAttribute('attach-focus', aurelia_binding_1.bindingMode.oneTime) ], AttachFocus); return AttachFocus; }()); diff --git a/dist/system/resources/ux-dialog-body.d.ts b/dist/system/resources/ux-dialog-body.d.ts new file mode 100644 index 0000000..87413a7 --- /dev/null +++ b/dist/system/resources/ux-dialog-body.d.ts @@ -0,0 +1,2 @@ +export default class UxDialogBody { +} diff --git a/dist/system/ux-dialog-body.js b/dist/system/resources/ux-dialog-body.js similarity index 96% rename from dist/system/ux-dialog-body.js rename to dist/system/resources/ux-dialog-body.js index e351fe7..a086ee7 100644 --- a/dist/system/ux-dialog-body.js +++ b/dist/system/resources/ux-dialog-body.js @@ -6,8 +6,8 @@ System.register(["aurelia-templating"], function (exports_1, context_1) { else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; - var __moduleName = context_1 && context_1.id; var aurelia_templating_1, UxDialogBody; + var __moduleName = context_1 && context_1.id; return { setters: [ function (aurelia_templating_1_1) { @@ -24,7 +24,7 @@ System.register(["aurelia-templating"], function (exports_1, context_1) { ], UxDialogBody); return UxDialogBody; }()); - exports_1("UxDialogBody", UxDialogBody); + exports_1("default", UxDialogBody); } }; }); diff --git a/dist/system/resources/ux-dialog-footer.d.ts b/dist/system/resources/ux-dialog-footer.d.ts new file mode 100644 index 0000000..4b62e9f --- /dev/null +++ b/dist/system/resources/ux-dialog-footer.d.ts @@ -0,0 +1,13 @@ +import { DialogController } from '../dialog-controller'; +/** + * View-model for footer of Dialog. + */ +export default class UxDialogFooter { + controller: DialogController; + static isCancelButton(value: string): boolean; + buttons: any[]; + useDefaultButtons: boolean; + constructor(controller: DialogController); + close(buttonValue: string): void; + useDefaultButtonsChanged(newValue: boolean): void; +} diff --git a/dist/system/ux-dialog-footer.js b/dist/system/resources/ux-dialog-footer.js similarity index 95% rename from dist/system/ux-dialog-footer.js rename to dist/system/resources/ux-dialog-footer.js index fb9aa29..a325e70 100644 --- a/dist/system/ux-dialog-footer.js +++ b/dist/system/resources/ux-dialog-footer.js @@ -1,4 +1,4 @@ -System.register(["aurelia-templating", "./dialog-controller"], function (exports_1, context_1) { +System.register(["aurelia-templating", "../dialog-controller"], function (exports_1, context_1) { "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; @@ -6,8 +6,8 @@ System.register(["aurelia-templating", "./dialog-controller"], function (exports else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; - var __moduleName = context_1 && context_1.id; var aurelia_templating_1, dialog_controller_1, UxDialogFooter; + var __moduleName = context_1 && context_1.id; return { setters: [ function (aurelia_templating_1_1) { @@ -41,6 +41,7 @@ System.register(["aurelia-templating", "./dialog-controller"], function (exports this.buttons = ['Cancel', 'Ok']; } }; + var UxDialogFooter_1; /** * @internal */ @@ -57,9 +58,8 @@ System.register(["aurelia-templating", "./dialog-controller"], function (exports aurelia_templating_1.inlineView("\n \n") ], UxDialogFooter); return UxDialogFooter; - var UxDialogFooter_1; }()); - exports_1("UxDialogFooter", UxDialogFooter); + exports_1("default", UxDialogFooter); } }; }); diff --git a/dist/system/resources/ux-dialog-header.d.ts b/dist/system/resources/ux-dialog-header.d.ts new file mode 100644 index 0000000..629f073 --- /dev/null +++ b/dist/system/resources/ux-dialog-header.d.ts @@ -0,0 +1,8 @@ +import { ComponentBind } from 'aurelia-templating'; +import { DialogController } from '../dialog-controller'; +export default class UxDialogHeader implements ComponentBind { + controller: DialogController; + showCloseButton: boolean | undefined; + constructor(controller: DialogController); + bind(): void; +} diff --git a/dist/system/ux-dialog-header.js b/dist/system/resources/ux-dialog-header.js similarity index 94% rename from dist/system/ux-dialog-header.js rename to dist/system/resources/ux-dialog-header.js index 3bb89f4..53d417e 100644 --- a/dist/system/ux-dialog-header.js +++ b/dist/system/resources/ux-dialog-header.js @@ -1,4 +1,4 @@ -System.register(["aurelia-templating", "./dialog-controller"], function (exports_1, context_1) { +System.register(["aurelia-templating", "../dialog-controller"], function (exports_1, context_1) { "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; @@ -6,8 +6,8 @@ System.register(["aurelia-templating", "./dialog-controller"], function (exports else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; - var __moduleName = context_1 && context_1.id; var aurelia_templating_1, dialog_controller_1, UxDialogHeader; + var __moduleName = context_1 && context_1.id; return { setters: [ function (aurelia_templating_1_1) { @@ -41,7 +41,7 @@ System.register(["aurelia-templating", "./dialog-controller"], function (exports ], UxDialogHeader); return UxDialogHeader; }()); - exports_1("UxDialogHeader", UxDialogHeader); + exports_1("default", UxDialogHeader); } }; }); diff --git a/dist/system/resources/ux-dialog.d.ts b/dist/system/resources/ux-dialog.d.ts new file mode 100644 index 0000000..318732a --- /dev/null +++ b/dist/system/resources/ux-dialog.d.ts @@ -0,0 +1,2 @@ +export default class UxDialog { +} diff --git a/dist/system/ux-dialog.js b/dist/system/resources/ux-dialog.js similarity index 96% rename from dist/system/ux-dialog.js rename to dist/system/resources/ux-dialog.js index e5ff956..e17cc62 100644 --- a/dist/system/ux-dialog.js +++ b/dist/system/resources/ux-dialog.js @@ -6,8 +6,8 @@ System.register(["aurelia-templating"], function (exports_1, context_1) { else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; - var __moduleName = context_1 && context_1.id; var aurelia_templating_1, UxDialog; + var __moduleName = context_1 && context_1.id; return { setters: [ function (aurelia_templating_1_1) { @@ -24,7 +24,7 @@ System.register(["aurelia-templating"], function (exports_1, context_1) { ], UxDialog); return UxDialog; }()); - exports_1("UxDialog", UxDialog); + exports_1("default", UxDialog); } }; }); diff --git a/dist/system/ux-dialog-body.d.ts b/dist/system/ux-dialog-body.d.ts deleted file mode 100644 index 913aa89..0000000 --- a/dist/system/ux-dialog-body.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialogBody { -} diff --git a/dist/system/ux-dialog-footer.d.ts b/dist/system/ux-dialog-footer.d.ts deleted file mode 100644 index 136e1bc..0000000 --- a/dist/system/ux-dialog-footer.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { DialogController } from './dialog-controller'; -/** - * View-model for footer of Dialog. - */ -export declare class UxDialogFooter { - controller: DialogController; - static isCancelButton(value: string): boolean; - buttons: any[]; - useDefaultButtons: boolean; - constructor(controller: DialogController); - close(buttonValue: string): void; - useDefaultButtonsChanged(newValue: boolean): void; -} diff --git a/dist/system/ux-dialog-header.d.ts b/dist/system/ux-dialog-header.d.ts deleted file mode 100644 index c8843dd..0000000 --- a/dist/system/ux-dialog-header.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ComponentBind } from 'aurelia-templating'; -import { DialogController } from './dialog-controller'; -export declare class UxDialogHeader implements ComponentBind { - controller: DialogController; - showCloseButton: boolean | undefined; - constructor(controller: DialogController); - bind(): void; -} diff --git a/dist/system/ux-dialog.d.ts b/dist/system/ux-dialog.d.ts deleted file mode 100644 index 66dc80e..0000000 --- a/dist/system/ux-dialog.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare class UxDialog { -} diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 8be4578..9afc1cb 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,25 @@ + +# [2.0.0-rc.1](https://github.com/aurelia/dialog/compare/1.0.0...2.0.0-rc.1) (2018-08-21) + + +### Bug Fixes + +* **css:** update styles to use ux- prefix instead of ai- ([f29d8cb](https://github.com/aurelia/dialog/commit/f29d8cb)), closes [#306](https://github.com/aurelia/dialog/issues/306) +* **package.json:** add missing dependency ([ed9c5df](https://github.com/aurelia/dialog/commit/ed9c5df)) + + +### Features + +* **attach-focus:** make work as boolean attr ([f75abb4](https://github.com/aurelia/dialog/commit/f75abb4)), closes [#349](https://github.com/aurelia/dialog/issues/349) +* **resources:** register resources by class ([#354](https://github.com/aurelia/dialog/issues/354)) ([ff55c80](https://github.com/aurelia/dialog/commit/ff55c80)) + + +### BREAKING CHANGES + +* **resources:** - default resources are no longer reexported, need to be explicitly included when bundling + + + # [1.0.0](https://github.com/aurelia/dialog/compare/1.0.0-rc.2.0.0...1.0.0) (2018-07-23) diff --git a/package-lock.json b/package-lock.json index ed81db4..fcec8d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "integrity": "sha512-Z5nu9Pbxj9yNeXIK3UwGlRdJth4cZ5sCq05nI7FaI6B0oz28nxkOtp6Lsz0ZnmLHJGvOJfB/VHxSTbVq/i6ujA==", "dev": true, "requires": { - "@types/node": "10.5.8" + "@types/node": "*" } }, "@types/glob": { @@ -25,9 +25,9 @@ "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==", "dev": true, "requires": { - "@types/events": "1.2.0", - "@types/minimatch": "2.0.29", - "@types/node": "10.5.8" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/handlebars": { @@ -78,8 +78,8 @@ "integrity": "sha512-GwfXBWx+JgH+mrf35NnNFPFl6kQZgDQqZBUdWrHB1phulBbVpOwedZun7hZRyfTOxlicwo4ftsC1fpUZZIiN5w==", "dev": true, "requires": { - "@types/glob": "5.0.35", - "@types/node": "10.5.8" + "@types/glob": "*", + "@types/node": "*" } }, "JSONStream": { @@ -88,8 +88,8 @@ "integrity": "sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==", "dev": true, "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, "accepts": { @@ -98,7 +98,7 @@ "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", "dev": true, "requires": { - "mime-types": "2.1.19", + "mime-types": "~2.1.11", "negotiator": "0.6.1" } }, @@ -120,9 +120,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -143,17 +143,17 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.2" + "color-convert": "^1.9.0" } }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "arr-diff": { @@ -162,13 +162,13 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-find-index": { @@ -224,10 +224,10 @@ "resolved": "https://registry.npmjs.org/aurelia-binding/-/aurelia-binding-2.1.4.tgz", "integrity": "sha512-jtMrm2We92ge09G3ZoCfxCUjNsw59wpgaMG0+p1UyPyKuT25oBmowC+E1z1dy3l+2Ouf4IWKEecpXV03PoZd6Q==", "requires": { - "aurelia-logging": "1.5.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0", - "aurelia-task-queue": "1.3.1" + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-task-queue": "^1.0.0" } }, "aurelia-bootstrapper": { @@ -236,20 +236,20 @@ "integrity": "sha512-JQ0yo5EbdoMPGQkeeNr2COMeOniZErb7cqLSKKjOdJ9SxYAfQDfbN4cF60NlOW6dJ3nR94ZpKXKjed2yF6nTVQ==", "dev": true, "requires": { - "aurelia-event-aggregator": "1.0.1", - "aurelia-framework": "1.3.0", - "aurelia-history": "1.1.0", - "aurelia-history-browser": "1.2.0", - "aurelia-loader-default": "1.0.4", - "aurelia-logging-console": "1.0.0", - "aurelia-pal": "1.8.0", - "aurelia-pal-browser": "1.8.0", - "aurelia-polyfills": "1.3.0", - "aurelia-router": "1.6.2", - "aurelia-templating": "1.8.2", - "aurelia-templating-binding": "1.4.3", - "aurelia-templating-resources": "1.7.1", - "aurelia-templating-router": "1.3.2" + "aurelia-event-aggregator": "^1.0.0", + "aurelia-framework": "^1.3.0", + "aurelia-history": "^1.1.0", + "aurelia-history-browser": "^1.1.0", + "aurelia-loader-default": "^1.0.0", + "aurelia-logging-console": "^1.0.0", + "aurelia-pal": "^1.3.0", + "aurelia-pal-browser": "^1.0.0", + "aurelia-polyfills": "^1.0.0", + "aurelia-router": "^1.5.0", + "aurelia-templating": "^1.8.1", + "aurelia-templating-binding": "^1.0.0", + "aurelia-templating-resources": "^1.7.0", + "aurelia-templating-router": "^1.0.0" } }, "aurelia-dependency-injection": { @@ -257,8 +257,8 @@ "resolved": "https://registry.npmjs.org/aurelia-dependency-injection/-/aurelia-dependency-injection-1.4.1.tgz", "integrity": "sha512-NexdxbXQKVhg8ywHosauccKbnn3vAeLyNg3oPa0l+z1fgOMf3/jvVYpcdmWelJP5yfBmYNyTYVBffCKeaS2m0w==", "requires": { - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0" + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0" } }, "aurelia-event-aggregator": { @@ -267,7 +267,7 @@ "integrity": "sha1-nXx8Hh7+HvOnh4Xnar6AYB4tNMg=", "dev": true, "requires": { - "aurelia-logging": "1.5.0" + "aurelia-logging": "^1.0.0" } }, "aurelia-framework": { @@ -275,15 +275,15 @@ "resolved": "https://registry.npmjs.org/aurelia-framework/-/aurelia-framework-1.3.0.tgz", "integrity": "sha512-yuKdy3LQx0tN/2CMKM8KTBcVLCeAcmcjXyEgWmRUlxJHCBAIT63ECrjkRWYkUzRNz8EQ0qnuH4jLUaWykXgJwg==", "requires": { - "aurelia-binding": "2.1.4", - "aurelia-dependency-injection": "1.4.1", - "aurelia-loader": "1.0.0", - "aurelia-logging": "1.5.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0", - "aurelia-path": "1.1.1", - "aurelia-task-queue": "1.3.1", - "aurelia-templating": "1.8.2" + "aurelia-binding": "^2.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-loader": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-path": "^1.0.0", + "aurelia-task-queue": "^1.0.0", + "aurelia-templating": "^1.8.1" } }, "aurelia-history": { @@ -298,8 +298,8 @@ "integrity": "sha512-3sAHq1xVX3fx8tyDb1LookueTRddB+hPVyfCVFR5Az2MbAfiovxXTzU6EX4VsOcuMweuER26NW4FTCgTA+sTuQ==", "dev": true, "requires": { - "aurelia-history": "1.1.0", - "aurelia-pal": "1.8.0" + "aurelia-history": "^1.0.0", + "aurelia-pal": "^1.0.0" } }, "aurelia-loader": { @@ -307,8 +307,8 @@ "resolved": "https://registry.npmjs.org/aurelia-loader/-/aurelia-loader-1.0.0.tgz", "integrity": "sha1-t4wqKBOqjkQSRyN91m/WLl1OGeo=", "requires": { - "aurelia-metadata": "1.0.4", - "aurelia-path": "1.1.1" + "aurelia-metadata": "^1.0.0", + "aurelia-path": "^1.0.0" } }, "aurelia-loader-default": { @@ -317,9 +317,9 @@ "integrity": "sha512-xHo8Qb/xpl/ncKJcPGN3h2WHVwjNtNEqZZn7APc+AT/AZMSr9zubWorPmYBp3b3mZp27lEhcIttL0NKJnHcYSg==", "dev": true, "requires": { - "aurelia-loader": "1.0.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0" + "aurelia-loader": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0" } }, "aurelia-logging": { @@ -333,7 +333,7 @@ "integrity": "sha1-7fdQepf8aLQFE6F8Z31wQUEBrbQ=", "dev": true, "requires": { - "aurelia-logging": "1.5.0" + "aurelia-logging": "^1.0.0" } }, "aurelia-metadata": { @@ -341,7 +341,7 @@ "resolved": "https://registry.npmjs.org/aurelia-metadata/-/aurelia-metadata-1.0.4.tgz", "integrity": "sha512-9CgVH+kgrMIqWPAtdhhEJLoEPRMFz4RMsaLkYfYnK7LUCcOtZtPrOrAHCaU7jVa67JjGcsXkEqoN+xaTs0NL3g==", "requires": { - "aurelia-pal": "1.8.0" + "aurelia-pal": "^1.0.0" } }, "aurelia-pal": { @@ -355,7 +355,7 @@ "integrity": "sha512-YcJyzMJ9I2NvUwac1Dcct5ZTL4NsNlB2MvLMKK5onTIlMI+azg8PSjM8OPRgms/h6cxUlKtzIiraq+KEmSqCuw==", "dev": true, "requires": { - "aurelia-pal": "1.8.0" + "aurelia-pal": "^1.4.0" } }, "aurelia-path": { @@ -369,7 +369,7 @@ "integrity": "sha1-iZ7ABR92qXHDFpNBJ57WLH859wc=", "dev": true, "requires": { - "aurelia-pal": "1.8.0" + "aurelia-pal": "^1.0.0" } }, "aurelia-route-recognizer": { @@ -378,7 +378,7 @@ "integrity": "sha512-ABpfGBNclwWJik/DRSwJ5pUXAjMoD5mqGLMFbovroeWjdPQKonLh1G0BByngaWOdsIi3KrOglmktCFXqLn2jxg==", "dev": true, "requires": { - "aurelia-path": "1.1.1" + "aurelia-path": "^1.0.0" } }, "aurelia-router": { @@ -387,12 +387,12 @@ "integrity": "sha512-UGi5ipJfcu2dg/BTmsi25Za5sj3li3lr8IZy/xbzeK9XHz8Y7NZU2uRrl/VRIQUGqc5/rwgW1jVKcvvMW/9keA==", "dev": true, "requires": { - "aurelia-dependency-injection": "1.4.1", - "aurelia-event-aggregator": "1.0.1", - "aurelia-history": "1.1.0", - "aurelia-logging": "1.5.0", - "aurelia-path": "1.1.1", - "aurelia-route-recognizer": "1.2.0" + "aurelia-dependency-injection": "^1.0.0", + "aurelia-event-aggregator": "^1.0.0", + "aurelia-history": "^1.1.0", + "aurelia-logging": "^1.0.0", + "aurelia-path": "^1.0.0", + "aurelia-route-recognizer": "^1.2.0" } }, "aurelia-task-queue": { @@ -400,7 +400,7 @@ "resolved": "https://registry.npmjs.org/aurelia-task-queue/-/aurelia-task-queue-1.3.1.tgz", "integrity": "sha512-Eyto+EVcezwrY3qHZwBvueKb3j+e/lgKp2nNbX1y6KVJmoO9XzK/KctViprpn7ZFl9YGYjJ9s+zJM8nFlQUr1g==", "requires": { - "aurelia-pal": "1.8.0" + "aurelia-pal": "^1.0.0" } }, "aurelia-templating": { @@ -408,14 +408,14 @@ "resolved": "https://registry.npmjs.org/aurelia-templating/-/aurelia-templating-1.8.2.tgz", "integrity": "sha512-5suUaJzEhxfJ8yVhOysWJHRwZW54ZaNumAIGqu6Jtnx/5h/08s9aZw1Ev1PMS3lYyq/w4KucdXbG8NeXnJBUNA==", "requires": { - "aurelia-binding": "2.1.4", - "aurelia-dependency-injection": "1.4.1", - "aurelia-loader": "1.0.0", - "aurelia-logging": "1.5.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0", - "aurelia-path": "1.1.1", - "aurelia-task-queue": "1.3.1" + "aurelia-binding": "^2.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-loader": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-path": "^1.0.0", + "aurelia-task-queue": "^1.1.0" } }, "aurelia-templating-binding": { @@ -424,9 +424,9 @@ "integrity": "sha512-XmfR1GTFxw/nQp6jO/3XRDpPibAhQ1f/B47XrjMqRnR+zM0t3vhGem7HQ7Q9GKVccWz3eVXNxcUs6UH/6pe5pA==", "dev": true, "requires": { - "aurelia-binding": "2.1.4", - "aurelia-logging": "1.5.0", - "aurelia-templating": "1.8.2" + "aurelia-binding": "^2.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-templating": "^1.3.0" } }, "aurelia-templating-resources": { @@ -435,15 +435,15 @@ "integrity": "sha512-zLiy1a4ivnyzcnD9TPHY6jMF+pnoYpTC5riIWQXlRQOK/qsTBiojknhE64tgFAA9H/BxJfUkqCfqeWYVIartSA==", "dev": true, "requires": { - "aurelia-binding": "2.1.4", - "aurelia-dependency-injection": "1.4.1", - "aurelia-loader": "1.0.0", - "aurelia-logging": "1.5.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0", - "aurelia-path": "1.1.1", - "aurelia-task-queue": "1.3.1", - "aurelia-templating": "1.8.2" + "aurelia-binding": "^2.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-loader": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.3.0", + "aurelia-path": "^1.0.0", + "aurelia-task-queue": "^1.0.0", + "aurelia-templating": "^1.8.1" } }, "aurelia-templating-router": { @@ -452,14 +452,14 @@ "integrity": "sha512-2Jc7E2M99ya37pFyEnktXAPTcVyMPjMbNvHLFLBYAo8QLy6DiBHOhukbLJPA+RrrfBFFY++5W66J4GoRbOHDNA==", "dev": true, "requires": { - "aurelia-binding": "2.1.4", - "aurelia-dependency-injection": "1.4.1", - "aurelia-logging": "1.5.0", - "aurelia-metadata": "1.0.4", - "aurelia-pal": "1.8.0", - "aurelia-path": "1.1.1", - "aurelia-router": "1.6.2", - "aurelia-templating": "1.8.2" + "aurelia-binding": "^2.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.3.0", + "aurelia-path": "^1.0.0", + "aurelia-router": "^1.5.0", + "aurelia-templating": "^1.8.1" } }, "aurelia-testing": { @@ -468,11 +468,11 @@ "integrity": "sha1-iBTz7wq9F1RVo60iGVPjppbfV/A=", "dev": true, "requires": { - "aurelia-dependency-injection": "1.4.1", - "aurelia-framework": "1.3.0", - "aurelia-logging": "1.5.0", - "aurelia-pal": "1.8.0", - "aurelia-templating": "1.8.2" + "aurelia-dependency-injection": "^1.0.0", + "aurelia-framework": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-templating": "^1.0.0" } }, "babel-code-frame": { @@ -481,9 +481,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -498,11 +498,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -561,7 +561,7 @@ "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=", "dev": true }, "body-parser": { @@ -571,15 +571,15 @@ "dev": true, "requires": { "bytes": "3.0.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", + "depd": "~1.1.2", + "http-errors": "~1.6.3", "iconv-lite": "0.4.23", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.5.2", "raw-body": "2.3.3", - "type-is": "1.6.16" + "type-is": "~1.6.16" } }, "brace-expansion": { @@ -588,7 +588,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -598,9 +598,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "buffer-alloc": { @@ -609,8 +609,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -656,9 +656,9 @@ "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", "dev": true, "requires": { - "camelcase": "4.1.0", - "map-obj": "2.0.0", - "quick-lru": "1.1.0" + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" }, "dependencies": { "camelcase": { @@ -676,8 +676,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -686,9 +686,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "dependencies": { "supports-color": { @@ -697,7 +697,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -708,15 +708,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" } }, "cliui": { @@ -726,8 +726,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -767,7 +767,7 @@ "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.5.0" } }, "commander": { @@ -782,8 +782,8 @@ "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", "dev": true, "requires": { - "array-ify": "1.0.0", - "dot-prop": "3.0.0" + "array-ify": "^1.0.0", + "dot-prop": "^3.0.0" } }, "component-bind": { @@ -816,15 +816,15 @@ "integrity": "sha512-/+ugz+gwFSEfTGUxn0KHkY+19XPRTXR8+7oUK/HxgiN1n7FjeJmkrbSiXAJfyQ0zORgJYPaenmymwon51YXH9Q==", "dev": true, "requires": { - "chalk": "2.4.1", + "chalk": "^2.4.1", "commander": "2.6.0", - "date-fns": "1.29.0", - "lodash": "4.17.10", - "read-pkg": "3.0.0", + "date-fns": "^1.23.0", + "lodash": "^4.5.1", + "read-pkg": "^3.0.0", "rx": "2.3.24", - "spawn-command": "0.0.2-1", - "supports-color": "3.2.3", - "tree-kill": "1.2.0" + "spawn-command": "^0.0.2-1", + "supports-color": "^3.2.3", + "tree-kill": "^1.1.0" } }, "connect": { @@ -835,14 +835,14 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.0", - "parseurl": "1.3.2", + "parseurl": "~1.3.2", "utils-merge": "1.0.1" } }, "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "conventional-changelog": { @@ -851,17 +851,17 @@ "integrity": "sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==", "dev": true, "requires": { - "conventional-changelog-angular": "1.6.6", - "conventional-changelog-atom": "0.2.8", - "conventional-changelog-codemirror": "0.3.8", - "conventional-changelog-core": "2.0.11", - "conventional-changelog-ember": "0.3.12", - "conventional-changelog-eslint": "1.0.9", - "conventional-changelog-express": "0.3.6", - "conventional-changelog-jquery": "0.1.0", - "conventional-changelog-jscs": "0.1.0", - "conventional-changelog-jshint": "0.3.8", - "conventional-changelog-preset-loader": "1.1.8" + "conventional-changelog-angular": "^1.6.6", + "conventional-changelog-atom": "^0.2.8", + "conventional-changelog-codemirror": "^0.3.8", + "conventional-changelog-core": "^2.0.11", + "conventional-changelog-ember": "^0.3.12", + "conventional-changelog-eslint": "^1.0.9", + "conventional-changelog-express": "^0.3.6", + "conventional-changelog-jquery": "^0.1.0", + "conventional-changelog-jscs": "^0.1.0", + "conventional-changelog-jshint": "^0.3.8", + "conventional-changelog-preset-loader": "^1.1.8" } }, "conventional-changelog-angular": { @@ -870,8 +870,8 @@ "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==", "dev": true, "requires": { - "compare-func": "1.3.2", - "q": "1.5.1" + "compare-func": "^1.3.1", + "q": "^1.5.1" } }, "conventional-changelog-atom": { @@ -880,7 +880,7 @@ "integrity": "sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-cli": { @@ -889,11 +889,11 @@ "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==", "dev": true, "requires": { - "add-stream": "1.0.0", - "conventional-changelog": "1.1.24", - "lodash": "4.17.10", - "meow": "4.0.1", - "tempfile": "1.1.1" + "add-stream": "^1.0.0", + "conventional-changelog": "^1.1.24", + "lodash": "^4.2.1", + "meow": "^4.0.0", + "tempfile": "^1.1.1" } }, "conventional-changelog-codemirror": { @@ -902,7 +902,7 @@ "integrity": "sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-core": { @@ -911,19 +911,19 @@ "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==", "dev": true, "requires": { - "conventional-changelog-writer": "3.0.9", - "conventional-commits-parser": "2.1.7", - "dateformat": "3.0.3", - "get-pkg-repo": "1.4.0", - "git-raw-commits": "1.3.6", - "git-remote-origin-url": "2.0.0", - "git-semver-tags": "1.3.6", - "lodash": "4.17.10", - "normalize-package-data": "2.4.0", - "q": "1.5.1", - "read-pkg": "1.1.0", - "read-pkg-up": "1.0.1", - "through2": "2.0.3" + "conventional-changelog-writer": "^3.0.9", + "conventional-commits-parser": "^2.1.7", + "dateformat": "^3.0.0", + "get-pkg-repo": "^1.0.0", + "git-raw-commits": "^1.3.6", + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^1.3.6", + "lodash": "^4.2.1", + "normalize-package-data": "^2.3.5", + "q": "^1.5.1", + "read-pkg": "^1.1.0", + "read-pkg-up": "^1.0.1", + "through2": "^2.0.0" }, "dependencies": { "load-json-file": { @@ -932,11 +932,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "parse-json": { @@ -945,7 +945,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "path-type": { @@ -954,9 +954,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -971,9 +971,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "strip-bom": { @@ -982,7 +982,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -993,7 +993,7 @@ "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-eslint": { @@ -1002,7 +1002,7 @@ "integrity": "sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-express": { @@ -1011,7 +1011,7 @@ "integrity": "sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-jquery": { @@ -1020,7 +1020,7 @@ "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.4.1" } }, "conventional-changelog-jscs": { @@ -1029,7 +1029,7 @@ "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.4.1" } }, "conventional-changelog-jshint": { @@ -1038,8 +1038,8 @@ "integrity": "sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==", "dev": true, "requires": { - "compare-func": "1.3.2", - "q": "1.5.1" + "compare-func": "^1.3.1", + "q": "^1.5.1" } }, "conventional-changelog-preset-loader": { @@ -1054,16 +1054,16 @@ "integrity": "sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==", "dev": true, "requires": { - "compare-func": "1.3.2", - "conventional-commits-filter": "1.1.6", - "dateformat": "3.0.3", - "handlebars": "4.0.11", - "json-stringify-safe": "5.0.1", - "lodash": "4.17.10", - "meow": "4.0.1", - "semver": "5.5.0", - "split": "1.0.1", - "through2": "2.0.3" + "compare-func": "^1.3.1", + "conventional-commits-filter": "^1.1.6", + "dateformat": "^3.0.0", + "handlebars": "^4.0.2", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.2.1", + "meow": "^4.0.0", + "semver": "^5.5.0", + "split": "^1.0.0", + "through2": "^2.0.0" } }, "conventional-commits-filter": { @@ -1072,8 +1072,8 @@ "integrity": "sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==", "dev": true, "requires": { - "is-subset": "0.1.1", - "modify-values": "1.0.1" + "is-subset": "^0.1.1", + "modify-values": "^1.0.0" } }, "conventional-commits-parser": { @@ -1082,13 +1082,13 @@ "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==", "dev": true, "requires": { - "JSONStream": "1.3.4", - "is-text-path": "1.0.1", - "lodash": "4.17.10", - "meow": "4.0.1", - "split2": "2.2.0", - "through2": "2.0.3", - "trim-off-newlines": "1.0.1" + "JSONStream": "^1.0.4", + "is-text-path": "^1.0.0", + "lodash": "^4.2.1", + "meow": "^4.0.0", + "split2": "^2.0.0", + "through2": "^2.0.0", + "trim-off-newlines": "^1.0.0" } }, "cookie": { @@ -1103,12 +1103,12 @@ "integrity": "sha1-qNo6xBqiIgrim9PFi2mEKU8sWTw=", "dev": true, "requires": { - "glob": "7.1.2", - "ltcdr": "2.2.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", + "glob": "^7.0.5", + "ltcdr": "^2.2.1", + "minimatch": "^3.0.3", + "mkdirp": "^0.5.1", "noms": "0.0.0", - "through2": "2.0.3" + "through2": "^2.0.1" } }, "core-js": { @@ -1129,8 +1129,8 @@ "integrity": "sha1-ngWF8neGTtQhznVvgamA/w1piro=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "is-windows": "1.0.2" + "cross-spawn": "^5.1.0", + "is-windows": "^1.0.0" } }, "cross-spawn": { @@ -1139,9 +1139,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "currently-unhandled": { @@ -1150,7 +1150,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "custom-event": { @@ -1165,13 +1165,13 @@ "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "date-fns": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", - "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==", + "integrity": "sha1-EuYJzcuTUScxHQTTMzTilgoqVOY=", "dev": true }, "dateformat": { @@ -1183,7 +1183,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -1201,8 +1201,8 @@ "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", "dev": true, "requires": { - "decamelize": "1.2.0", - "map-obj": "1.0.1" + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" }, "dependencies": { "map-obj": { @@ -1237,10 +1237,10 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.2", - "void-elements": "2.0.1" + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" } }, "dot-prop": { @@ -1249,7 +1249,7 @@ "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", "dev": true, "requires": { - "is-obj": "1.0.1" + "is-obj": "^1.0.0" } }, "ee-first": { @@ -1364,7 +1364,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "escape-html": { @@ -1397,9 +1397,9 @@ "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" + "array-slice": "^0.2.3", + "array-unique": "^0.2.1", + "braces": "^0.1.2" }, "dependencies": { "braces": { @@ -1408,7 +1408,7 @@ "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { - "expand-range": "0.1.1" + "expand-range": "^0.1.0" } }, "expand-range": { @@ -1417,8 +1417,8 @@ "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" + "is-number": "^0.1.1", + "repeat-string": "^0.2.2" } }, "is-number": { @@ -1441,7 +1441,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -1450,7 +1450,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" } }, "extend": { @@ -1465,7 +1465,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "filename-regex": { @@ -1480,11 +1480,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.1.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "finalhandler": { @@ -1494,12 +1494,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" + "encodeurl": "~1.0.1", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.3.1", + "unpipe": "~1.0.0" }, "dependencies": { "statuses": { @@ -1516,7 +1516,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "follow-redirects": { @@ -1525,7 +1525,7 @@ "integrity": "sha512-GHjtHDlY/ehslqv0Gr5N0PUJppgg/q0rOBvX0na1s7y1A3LWxPqCYU76s3Z1bM4+UZB4QF0usaXLT5wFpof5PA==", "dev": true, "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -1551,7 +1551,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "fs-access": { @@ -1560,7 +1560,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "1.0.0" + "null-check": "^1.0.0" } }, "fs-extra": { @@ -1569,9 +1569,9 @@ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -1587,8 +1587,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -1614,8 +1614,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -1628,7 +1628,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1692,7 +1692,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -1707,14 +1707,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -1723,12 +1723,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -1743,7 +1743,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -1752,7 +1752,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -1761,8 +1761,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -1781,7 +1781,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -1795,7 +1795,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1808,8 +1808,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -1818,7 +1818,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -1841,9 +1841,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -1852,16 +1852,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -1870,8 +1870,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -1886,8 +1886,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -1896,10 +1896,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -1918,7 +1918,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -1939,8 +1939,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -1961,10 +1961,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -1981,13 +1981,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -1996,7 +1996,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -2039,9 +2039,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -2050,7 +2050,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -2058,7 +2058,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -2073,13 +2073,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -2094,7 +2094,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -2115,11 +2115,11 @@ "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "meow": "3.7.0", - "normalize-package-data": "2.4.0", - "parse-github-repo-url": "1.4.1", - "through2": "2.0.3" + "hosted-git-info": "^2.1.4", + "meow": "^3.3.0", + "normalize-package-data": "^2.3.0", + "parse-github-repo-url": "^1.3.0", + "through2": "^2.0.0" }, "dependencies": { "camelcase": { @@ -2134,8 +2134,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "indent-string": { @@ -2144,7 +2144,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "map-obj": { @@ -2159,16 +2159,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "minimist": { @@ -2183,8 +2183,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "strip-indent": { @@ -2193,7 +2193,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "trim-newlines": { @@ -2216,11 +2216,11 @@ "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==", "dev": true, "requires": { - "dargs": "4.1.0", - "lodash.template": "4.4.0", - "meow": "4.0.1", - "split2": "2.2.0", - "through2": "2.0.3" + "dargs": "^4.0.1", + "lodash.template": "^4.0.2", + "meow": "^4.0.0", + "split2": "^2.0.0", + "through2": "^2.0.0" } }, "git-remote-origin-url": { @@ -2229,8 +2229,8 @@ "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=", "dev": true, "requires": { - "gitconfiglocal": "1.0.0", - "pify": "2.3.0" + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" }, "dependencies": { "pify": { @@ -2247,8 +2247,8 @@ "integrity": "sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==", "dev": true, "requires": { - "meow": "4.0.1", - "semver": "5.5.0" + "meow": "^4.0.0", + "semver": "^5.5.0" } }, "gitconfiglocal": { @@ -2257,21 +2257,21 @@ "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=", "dev": true, "requires": { - "ini": "1.3.5" + "ini": "^1.3.2" } }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -2280,8 +2280,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -2290,7 +2290,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "graceful-fs": { @@ -2305,10 +2305,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" } }, "has-ansi": { @@ -2317,7 +2317,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary": { @@ -2367,10 +2367,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "http-proxy": { @@ -2379,9 +2379,9 @@ "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", "dev": true, "requires": { - "eventemitter3": "3.1.0", - "follow-redirects": "1.5.5", - "requires-port": "1.0.0" + "eventemitter3": "^3.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "iconv-lite": { @@ -2390,7 +2390,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "indent-string": { @@ -2411,8 +2411,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -2445,13 +2445,13 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", "dev": true }, "is-builtin-module": { @@ -2460,7 +2460,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-dotfile": { @@ -2475,7 +2475,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -2496,7 +2496,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -2505,7 +2505,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-number": { @@ -2514,7 +2514,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-obj": { @@ -2553,7 +2553,7 @@ "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=", "dev": true, "requires": { - "text-extensions": "1.7.0" + "text-extensions": "^1.0.0" } }, "is-utf8": { @@ -2580,7 +2580,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } }, "isexe": { @@ -2634,7 +2634,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsonparse": { @@ -2646,36 +2646,36 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.3", - "chokidar": "1.7.0", - "colors": "1.3.1", - "combine-lists": "1.0.1", - "connect": "3.6.6", - "core-js": "2.5.7", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "http-proxy": "1.17.0", - "isbinaryfile": "3.0.3", - "lodash": "3.10.1", - "log4js": "0.6.38", - "mime": "1.6.0", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.2.0", - "range-parser": "1.2.0", - "rimraf": "2.6.2", - "safe-buffer": "5.1.2", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", + "dev": true, + "requires": { + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "chokidar": "^1.4.1", + "colors": "^1.1.0", + "combine-lists": "^1.0.0", + "connect": "^3.6.0", + "core-js": "^2.2.0", + "di": "^0.0.1", + "dom-serialize": "^2.2.0", + "expand-braces": "^0.1.1", + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "http-proxy": "^1.13.0", + "isbinaryfile": "^3.0.0", + "lodash": "^3.8.0", + "log4js": "^0.6.31", + "mime": "^1.3.4", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", "socket.io": "1.7.3", - "source-map": "0.5.7", + "source-map": "^0.5.3", "tmp": "0.0.31", - "useragent": "2.3.0" + "useragent": "^2.1.12" }, "dependencies": { "lodash": { @@ -2695,11 +2695,11 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { - "fs-access": "1.0.1", - "which": "1.3.1" + "fs-access": "^1.0.0", + "which": "^1.2.1" } }, "karma-ie-launcher": { @@ -2708,7 +2708,7 @@ "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.6.1" } }, "karma-jasmine": { @@ -2729,7 +2729,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -2745,10 +2745,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" } }, "locate-path": { @@ -2757,8 +2757,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -2779,8 +2779,8 @@ "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.1.0" + "lodash._reinterpolate": "~3.0.0", + "lodash.templatesettings": "^4.0.0" } }, "lodash.templatesettings": { @@ -2789,7 +2789,7 @@ "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0" + "lodash._reinterpolate": "~3.0.0" } }, "log4js": { @@ -2798,8 +2798,8 @@ "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "semver": "4.3.6" + "readable-stream": "~1.0.2", + "semver": "~4.3.3" }, "dependencies": { "isarray": { @@ -2814,10 +2814,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "semver": { @@ -2846,8 +2846,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lru-cache": { @@ -2856,8 +2856,8 @@ "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "ltcdr": { @@ -2896,15 +2896,15 @@ "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", "dev": true, "requires": { - "camelcase-keys": "4.2.0", - "decamelize-keys": "1.1.0", - "loud-rejection": "1.6.0", - "minimist": "1.2.0", - "minimist-options": "3.0.2", - "normalize-package-data": "2.4.0", - "read-pkg-up": "3.0.0", - "redent": "2.0.0", - "trim-newlines": "2.0.0" + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist": "^1.1.3", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0" }, "dependencies": { "minimist": { @@ -2919,8 +2919,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "3.0.0" + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" } } } @@ -2931,19 +2931,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mime": { @@ -2964,16 +2964,16 @@ "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", "dev": true, "requires": { - "mime-db": "1.35.0" + "mime-db": "~1.35.0" } }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -2988,8 +2988,8 @@ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", "dev": true, "requires": { - "arrify": "1.0.1", - "is-plain-obj": "1.1.0" + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" } }, "mkdirp": { @@ -3040,8 +3040,8 @@ "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "1.0.34" + "inherits": "^2.0.1", + "readable-stream": "~1.0.31" }, "dependencies": { "isarray": { @@ -3056,10 +3056,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -3073,13 +3073,13 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -3088,7 +3088,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "null-check": { @@ -3121,8 +3121,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "on-finished": { @@ -3140,7 +3140,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -3149,8 +3149,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "options": { @@ -3171,7 +3171,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -3180,7 +3180,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-try": { @@ -3201,10 +3201,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-json": { @@ -3213,8 +3213,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "parsejson": { @@ -3223,7 +3223,7 @@ "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseqs": { @@ -3232,7 +3232,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -3241,7 +3241,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { @@ -3274,7 +3274,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "pify": { @@ -3295,7 +3295,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "preserve": { @@ -3352,9 +3352,9 @@ "integrity": "sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -3395,9 +3395,9 @@ "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "4.0.0", - "normalize-package-data": "2.4.0", - "path-type": "3.0.0" + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" } }, "read-pkg-up": { @@ -3406,8 +3406,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -3416,8 +3416,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "load-json-file": { @@ -3426,11 +3426,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "parse-json": { @@ -3439,7 +3439,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "path-exists": { @@ -3448,7 +3448,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -3457,9 +3457,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -3474,9 +3474,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "strip-bom": { @@ -3485,7 +3485,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -3496,13 +3496,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -3511,10 +3511,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "rechoir": { @@ -3523,7 +3523,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.8.1" + "resolve": "^1.1.6" } }, "redent": { @@ -3532,17 +3532,17 @@ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", "dev": true, "requires": { - "indent-string": "3.2.0", - "strip-indent": "2.0.0" + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" } }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { @@ -3569,13 +3569,13 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "requirejs": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz", - "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==", + "integrity": "sha1-YXuay7yzNlQO9JFNeQMjqNS4YbA=", "dev": true }, "requirejs-text": { @@ -3596,7 +3596,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.5" } }, "right-align": { @@ -3606,16 +3606,16 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "rx": { @@ -3660,7 +3660,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -3675,9 +3675,9 @@ "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", "dev": true, "requires": { - "glob": "7.1.2", - "interpret": "1.1.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "signal-exit": { @@ -3834,7 +3834,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "spawn-command": { @@ -3849,8 +3849,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -3865,8 +3865,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -3878,19 +3878,19 @@ "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=", "dev": true, "requires": { - "through": "2.3.8" + "through": "2" } }, "split2": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=", "dev": true, "requires": { - "through2": "2.0.3" + "through2": "^2.0.2" } }, "statuses": { @@ -3905,7 +3905,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -3914,7 +3914,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -3935,7 +3935,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" }, "dependencies": { "has-flag": { @@ -3952,14 +3952,14 @@ "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=", "dev": true, "requires": { - "os-tmpdir": "1.0.2", - "uuid": "2.0.3" + "os-tmpdir": "^1.0.0", + "uuid": "^2.0.1" } }, "text-extensions": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz", - "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==", + "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=", "dev": true }, "through": { @@ -3974,8 +3974,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "tmp": { @@ -3984,7 +3984,7 @@ "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.1" } }, "to-array": { @@ -3996,7 +3996,7 @@ "tree-kill": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", + "integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY=", "dev": true }, "trim-newlines": { @@ -4023,16 +4023,16 @@ "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "colors": "1.3.1", - "commander": "2.17.1", - "diff": "3.5.0", - "glob": "7.1.2", - "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.5.0", - "tslib": "1.9.3", - "tsutils": "2.29.0" + "babel-code-frame": "^6.22.0", + "colors": "^1.1.2", + "commander": "^2.9.0", + "diff": "^3.2.0", + "glob": "^7.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.7.1", + "tsutils": "^2.8.1" }, "dependencies": { "commander": { @@ -4049,7 +4049,7 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "tslib": "1.9.3" + "tslib": "^1.8.1" } }, "type-is": { @@ -4059,7 +4059,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.19" + "mime-types": "~2.1.18" } }, "typedoc": { @@ -4068,22 +4068,22 @@ "integrity": "sha1-1xcrxqKZZPRRt2CcAFvq2t7+I2E=", "dev": true, "requires": { - "@types/fs-extra": "4.0.8", - "@types/handlebars": "4.0.39", - "@types/highlight.js": "9.12.3", - "@types/lodash": "4.14.116", + "@types/fs-extra": "^4.0.0", + "@types/handlebars": "^4.0.31", + "@types/highlight.js": "^9.1.8", + "@types/lodash": "^4.14.37", "@types/marked": "0.0.28", - "@types/minimatch": "2.0.29", - "@types/shelljs": "0.7.9", - "fs-extra": "4.0.3", - "handlebars": "4.0.11", - "highlight.js": "9.12.0", - "lodash": "4.17.10", - "marked": "0.3.19", - "minimatch": "3.0.4", - "progress": "2.0.0", - "shelljs": "0.7.8", - "typedoc-default-themes": "0.5.0", + "@types/minimatch": "^2.0.29", + "@types/shelljs": "^0.7.0", + "fs-extra": "^4.0.0", + "handlebars": "^4.0.6", + "highlight.js": "^9.0.0", + "lodash": "^4.13.1", + "marked": "^0.3.5", + "minimatch": "^3.0.0", + "progress": "^2.0.0", + "shelljs": "^0.7.0", + "typedoc-default-themes": "^0.5.0", "typescript": "2.4.1" }, "dependencies": { @@ -4114,9 +4114,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "source-map": { @@ -4159,8 +4159,8 @@ "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { - "lru-cache": "4.1.3", - "tmp": "0.0.31" + "lru-cache": "4.1.x", + "tmp": "0.0.x" } }, "util-deprecate": { @@ -4187,8 +4187,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "void-elements": { @@ -4203,7 +4203,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "window-size": { @@ -4231,8 +4231,8 @@ "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", "dev": true, "requires": { - "options": "0.0.6", - "ultron": "1.0.2" + "options": ">=0.0.5", + "ultron": "1.0.x" } }, "wtf-8": { @@ -4266,9 +4266,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } }, diff --git a/package.json b/package.json index ba55eb7..d700b58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-dialog", - "version": "1.0.0", + "version": "2.0.0-rc.1", "description": "A dialog plugin for Aurelia.", "keywords": [ "aurelia", @@ -59,7 +59,9 @@ "dist": "dist/amd" }, "peerDependencies": { + "aurelia-binding": "^2.1.4", "aurelia-dependency-injection": "^1.0.0", + "aurelia-framework": "^1.0.0", "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", "aurelia-templating": "^1.8.2" @@ -67,9 +69,10 @@ "dependencies": { "aurelia-binding": "^2.1.4", "aurelia-dependency-injection": "^1.0.0", + "aurelia-framework": "^1.0.0", "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", - "aurelia-templating": "^1.0.0" + "aurelia-templating": "^1.8.2" }, "devDependencies": { "aurelia-bootstrapper": "^1.0.0",