From 3010570502cf1c1020e382850645cc5b4ae55874 Mon Sep 17 00:00:00 2001 From: Patrick Steele-Idem Date: Wed, 2 Nov 2016 16:12:13 -0600 Subject: [PATCH] Completed merge of marko-widgets and other cleanup --- .gitignore | 3 +- bin/markoc.js | 2 +- compiler/index.js | 1 + defineRenderer.js | 26 +- .../widgets}/additional-resources.md | 0 .../widgets}/component-lifecycle.md | 0 {widgets/docs => docs/widgets}/faq.md | 0 {widgets/docs => docs/widgets}/get-started.md | 0 .../docs => docs/widgets}/javascript-api.md | 0 {widgets/docs => docs/widgets}/overview.md | 0 {widgets/docs => docs/widgets}/taglib-api.md | 0 .../docs => docs/widgets}/upgrade-guide.md | 0 package.json | 31 +- test/.gitignore | 8 +- test/adjustIndent-test.js | 2 +- test/api-compiler-tests.js | 2 +- test/api-tests.js | 2 +- test/async-fragments-deprecated-test.js | 2 +- test/async-render-test.js | 2 +- test/autotests/api/defineRenderer/test.js | 2 +- .../api/require-hook-compiler-options/test.js | 2 +- .../async-fragment-data-providers/test.js | 14 +- .../test.js | 12 +- .../async-fragment-promise-error-q/test.js | 12 +- .../async-fragment-promise/test.js | 11 +- .../async-render/await-data-providers/test.js | 16 +- .../test.js | 14 +- .../await-promise-error-q/test.js | 12 +- .../async-render/await-promise/test.js | 11 +- .../forEachAttribute/expected.json | 16 +- .../taglib-lookup/forEachTag/expected.json | 14 +- .../taglib-lookup/getTagsSorted/expected.json | 14 +- .../transformers-core-only/test.js | 2 +- .../transformers-custom-node/expected.js | 1 - .../transformers-custom-node/test.js | 4 +- .../taglib-lookup/transformers/test.js | 8 +- .../widgets-browser}/autotests.tests | 0 .../preserve-dom-body-no-id/index.js | 2 +- .../preserve-dom-body-no-id/template.marko | 0 .../preserve-dom-body-no-id/test.js | 0 .../preserve-dom-body/index.js | 2 +- .../preserve-dom-body/template.marko | 0 .../preserve-dom-body/test.js | 0 .../preserve-dom-no-id/index.js | 2 +- .../preserve-dom-no-id/template.marko | 0 .../preserve-dom-no-id/test.js | 0 .../widgets-browser}/preserve-dom/index.js | 2 +- .../preserve-dom/template.marko | 0 .../widgets-browser}/preserve-dom/test.js | 0 .../sanity-check-template-entry/component.js | 0 .../sanity-check-template-entry/index.marko | 0 .../sanity-check-template-entry/test.js | 0 .../widgets-browser}/sanity-check/index.js | 2 +- .../sanity-check/template.marko | 0 .../widgets-browser}/sanity-check/test.js | 0 .../update-manager-batch-updates}/index.js | 2 +- .../template.marko | 0 .../update-manager-batch-updates/test.js | 2 +- .../update-manager-next-tick}/index.js | 2 +- .../update-manager-next-tick/template.marko | 0 .../update-manager-next-tick/test.js | 2 +- .../widgets-browser/widget-api/index.js | 7 + .../widget-api/template.marko | 0 .../widgets-browser}/widget-api/test.js | 0 .../widget-conditional/index.js | 2 +- .../widget-conditional/template.marko | 0 .../widget-conditional/test.js | 0 .../widget-config-attr/index.js | 2 +- .../widget-config-attr/renderer.js | 0 .../widget-config-attr/template.marko | 0 .../widget-config-attr/test.js | 0 .../widget-config-attr/widget.js | 0 .../widget-config-getWidgetConfig/index.js | 2 +- .../template.marko | 0 .../widget-config-getWidgetConfig/test.js | 0 .../widget-config-template-data/index.js | 2 +- .../widget-config-template-data/renderer.js | 0 .../template.marko | 0 .../widget-config-template-data/test.js | 0 .../widget-config-template-data/widget.js | 0 .../components/app-bar/index.js | 2 +- .../components/app-bar/renderer.js | 0 .../components/app-bar/template.marko | 0 .../components/app-bar/widget.js | 0 .../components/app-custom-events/index.js | 2 +- .../components/app-custom-events/renderer.js | 0 .../app-custom-events/template.marko | 0 .../components/app-custom-events/widget.js | 0 .../widget-custom-events-declarative/index.js | 2 +- .../marko.json | 0 .../renderer.js | 0 .../template.marko | 0 .../widget-custom-events-declarative/test.js | 0 .../widget.js | 0 .../components/app-bar/index.js | 3 + .../components/app-bar/renderer.js | 0 .../components/app-bar/template.marko | 0 .../components/app-bar/widget.js | 0 .../components/app-custom-events/index.js | 3 + .../components/app-custom-events/renderer.js | 0 .../app-custom-events/template.marko | 0 .../components/app-custom-events/widget.js | 0 .../widget-custom-events/index.js | 2 +- .../widget-custom-events/marko.json | 0 .../widget-custom-events/renderer.js | 0 .../widget-custom-events/template.marko | 0 .../widget-custom-events/test.js | 0 .../widget-custom-events/widget.js | 0 .../widget-destroy-detach/index.js | 3 + .../widget-destroy-detach/template.marko | 0 .../widget-destroy-detach/test.js | 0 .../components/app-bar/index.js | 3 + .../components/app-bar/renderer.js | 0 .../components/app-bar/template.marko | 0 .../components/app-bar/widget.js | 0 .../components/app-custom-events/index.js | 3 + .../components/app-custom-events/renderer.js | 0 .../app-custom-events/template.marko | 0 .../components/app-custom-events/widget.js | 0 .../widget-destroy-legacy/index.js | 2 +- .../widget-destroy-legacy/marko.json | 0 .../widget-destroy-legacy/renderer.js | 0 .../widget-destroy-legacy/template.marko | 0 .../widget-destroy-legacy/test.js | 0 .../widget-destroy-legacy/widget.js | 0 .../components/app-legacy-button/renderer.js | 0 .../app-legacy-button/template.marko | 0 .../components/app-legacy-button/widget.js | 0 .../widget-destroy-ref/index.js | 2 +- .../widget-destroy-ref/marko.json | 0 .../widget-destroy-ref/template.marko | 0 .../widget-destroy-ref/test.js | 0 .../components/app-custom-events/index.js | 3 + .../components/app-custom-events/renderer.js | 0 .../app-custom-events/template.marko | 0 .../components/app-custom-events/widget.js | 0 .../index.js | 2 +- .../marko.json | 0 .../template.marko | 0 .../test.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../widgets-browser}/widget-destroy/index.js | 2 +- .../widget-destroy/marko.json | 0 .../widget-destroy/template.marko | 0 .../widgets-browser}/widget-destroy/test.js | 2 +- .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../widget-dom-events-jquery/index.js | 3 + .../widget-dom-events-jquery/renderer.js | 0 .../widget-dom-events-jquery/template.marko | 0 .../widget-dom-events-jquery/test.js | 0 .../widget-dom-events-jquery/widget.js | 0 .../components/app-legacy-button/renderer.js | 0 .../app-legacy-button/template.marko | 0 .../components/app-legacy-button/widget.js | 0 .../widget-dom-events/index.js | 3 + .../widget-dom-events/marko.json | 0 .../widget-dom-events/renderer.js | 0 .../widget-dom-events/template.marko | 0 .../widget-dom-events/test.js | 0 .../widget-dom-events/widget.js | 0 .../widget-dynamic-tag-name/index.js | 7 + .../widget-dynamic-tag-name/template.marko | 0 .../widget-dynamic-tag-name/test.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../components/app-extend-button/index.js | 3 + .../app-extend-button/marko-tag.json | 0 .../components/app-extend-button/renderer.js | 0 .../app-extend-button/template.marko | 0 .../components/app-extend-button/widget.js | 0 .../widgets-browser/widget-extend/index.js | 3 + .../widgets-browser}/widget-extend/marko.json | 0 .../widget-extend/renderer.js | 0 .../widget-extend/template.marko | 0 .../widgets-browser}/widget-extend/test.js | 0 .../widgets-browser}/widget-extend/widget.js | 0 .../widget-extends-EventEmitter/index.js | 7 + .../template.marko | 0 .../widget-extends-EventEmitter/test.js | 0 .../widgets-browser/widget-getEl/index.js | 7 + .../widget-getEl/template.marko | 0 .../widgets-browser}/widget-getEl/test.js | 0 .../widgets-browser/widget-getEls/index.js | 7 + .../widget-getEls/template.marko | 0 .../widgets-browser}/widget-getEls/test.js | 0 .../widget-getInitialProps/index.js | 2 +- .../widget-getInitialProps/template.marko | 0 .../widget-getInitialProps/test.js | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widgets-browser/widget-getWidget/index.js | 7 + .../widget-getWidget/marko.json | 0 .../widget-getWidget/template.marko | 0 .../widgets-browser}/widget-getWidget/test.js | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widget-getWidgets-multiple/index.js | 7 + .../widget-getWidgets-multiple/marko.json | 0 .../widget-getWidgets-multiple/template.marko | 0 .../widget-getWidgets-multiple/test.js | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widget-getWidgets-single/index.js | 7 + .../widget-getWidgets-single/marko.json | 0 .../widget-getWidgets-single/template.marko | 0 .../widget-getWidgets-single/test.js | 0 .../widget-invalid-proto-render/test.js | 2 +- .../widget-invalid-proto-render/widget.js | 0 .../components/app-bar/index.js | 3 + .../components/app-bar/renderer.js | 0 .../components/app-bar/template.marko | 0 .../components/app-bar/widget.js | 0 .../widget-invoke-widget-id-dynamic/index.js | 2 +- .../template.marko | 0 .../widget-invoke-widget-id-dynamic/test.js | 0 .../components/app-bar/index.js | 3 + .../components/app-bar/renderer.js | 0 .../components/app-bar/template.marko | 0 .../components/app-bar/widget.js | 0 .../widget-invoke-widget-id/index.js | 2 +- .../widget-invoke-widget-id/template.marko | 0 .../widget-invoke-widget-id/test.js | 0 .../widget-jQuery-proxy/index.js | 7 + .../widget-jQuery-proxy/template.marko | 0 .../widget-jQuery-proxy/test.js | 0 .../widgets-browser/widget-label-for/index.js | 7 + .../widget-label-for/template.marko | 0 .../widgets-browser}/widget-label-for/test.js | 0 .../widget-legacy-render-same-id/index.js | 3 + .../widget-legacy-render-same-id/renderer.js | 0 .../template.marko | 0 .../widget-legacy-render-same-id/test.js | 0 .../widget-legacy-render-same-id/widget.js | 0 .../widget-legacy-rerender/index.js | 3 + .../widget-legacy-rerender/renderer.js | 0 .../widget-legacy-rerender/template.marko | 0 .../widget-legacy-rerender/test.js | 0 .../widget-legacy-rerender/widget.js | 0 .../index.js | 2 +- .../template.marko | 0 .../widget-lifecycle-events-stateful/index.js | 2 +- .../marko.json | 0 .../template.marko | 0 .../widget-lifecycle-events-stateful/test.js | 4 +- .../index.js | 2 +- .../template.marko | 0 .../widget-lifecycle-events-stateless/test.js | 2 +- .../index.js | 3 + .../renderer.js | 0 .../template.marko | 0 .../widget-multiple-binds-in-template/test.js | 0 .../widget-bar.js | 0 .../widget-foo.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 0 .../index.js | 2 +- .../template.marko | 0 .../test.js | 2 +- .../widget-preserve-dom-attrs/index.js | 2 +- .../widget-preserve-dom-attrs/template.marko | 0 .../widget-preserve-dom-attrs/test.js | 2 +- .../app-stateful-rerender}/index.js | 2 +- .../app-stateful-rerender/template.marko | 0 .../widget-preserve-dom-if/index.js | 2 +- .../widget-preserve-dom-if/marko.json | 0 .../widget-preserve-dom-if/template.marko | 0 .../widget-preserve-dom-if/test.js | 6 +- .../widget-preserve-dom-repeated/index.js | 2 +- .../template.marko | 0 .../widget-preserve-dom-repeated/test.js | 0 .../widget-preserve-dom-root/index.js | 2 +- .../widget-preserve-dom-root/template.marko | 0 .../widget-preserve-dom-root/test.js | 2 +- .../components/app-iframe-content/index.js | 3 + .../app-iframe-content/template.marko | 0 .../app-iframe-more-content/index.js | 2 +- .../app-iframe-more-content/template.marko | 0 .../widget-render-to-iframe/index.js | 2 +- .../widget-render-to-iframe/marko.json | 0 .../widget-render-to-iframe/template.marko | 0 .../widget-render-to-iframe/test.js | 0 .../widget-renderer-and-template/index.js | 2 +- .../template.marko | 0 .../widget-renderer-and-template/test.js | 0 .../widget-renderer-only/index.js | 2 +- .../widget-renderer-only/test.js | 0 .../components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../components/app-widgetless/renderer.js | 0 .../components/app-widgetless/template.marko | 0 .../widget-repeated-id-widgetless/index.js | 2 +- .../template.marko | 0 .../widget-repeated-id-widgetless/test.js | 0 .../widget-replaceState/index.js | 2 +- .../widget-replaceState/template.marko | 0 .../widget-replaceState/test.js | 2 +- .../app-rerender-init-order-child/index.js | 2 +- .../template.marko | 0 .../widget-rerender-init-order/index.js | 2 +- .../widget-rerender-init-order/marko.json | 0 .../widget-rerender-init-order/template.marko | 0 .../widget-rerender-init-order/test.js | 2 +- .../components/app-stateful-button}/index.js | 2 +- .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../widget-rerender-reuse-stateful/index.js | 2 +- .../widget-rerender-reuse-stateful/marko.json | 0 .../template.marko | 0 .../widget-rerender-reuse-stateful/test.js | 2 +- .../index.js | 2 +- .../template.marko | 0 .../test.js | 4 +- .../widget-setStateDirty/index.js | 2 +- .../widget-setStateDirty/template.marko | 0 .../widget-setStateDirty/test.js | 2 +- .../components/app-stateful-button/index.js | 2 +- .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../index.js | 7 + .../marko.json | 0 .../template-body.marko | 0 .../template.marko | 0 .../test.js | 0 .../index.js | 79 ++++ .../template.marko | 0 .../test.js | 2 +- .../index.js | 79 ++++ .../template.marko | 0 .../test.js | 2 +- .../index.js | 79 ++++ .../template.marko | 0 .../test.js | 0 .../components/app-stateful-button/index.js | 79 ++++ .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../widget-stateful-preserve-body/index.js | 2 +- .../widget-stateful-preserve-body/marko.json | 0 .../template.marko | 0 .../widget-stateful-preserve-body/test.js | 4 +- .../components/app-stateful-button/index.js | 79 ++++ .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../widget-stateful-reuse-widgets/index.js | 2 +- .../widget-stateful-reuse-widgets/marko.json | 0 .../template.marko | 0 .../widget-stateful-reuse-widgets/test.js | 2 +- .../components/app-stateful-button/index.js | 79 ++++ .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../index.js | 2 +- .../marko.json | 0 .../template.marko | 0 .../test.js | 2 +- .../components/app-stateful-button/index.js | 79 ++++ .../app-stateful-button/marko-tag.json | 0 .../app-stateful-button/template.marko | 0 .../widget-stateful-update-handler/index.js | 2 +- .../widget-stateful-update-handler/marko.json | 0 .../template.marko | 0 .../widget-stateful-update-handler/test.js | 2 +- .../widget-stateful-update/index.js | 79 ++++ .../widget-stateful-update/template.marko | 0 .../widget-stateful-update/test.js | 2 +- .../widget-stopPropagation/index.js | 2 +- .../widget-stopPropagation/template.marko | 0 .../widget-stopPropagation/test.js | 0 .../widget-subscribeTo/index.js | 7 + .../widget-subscribeTo/template.marko | 0 .../widget-subscribeTo/test.js | 0 .../app-transclusion-alert/index.js | 2 +- .../app-transclusion-alert/marko-tag.json | 0 .../app-transclusion-alert/template.marko | 0 .../widget-transclusion/index.js | 2 +- .../widget-transclusion/marko.json | 0 .../widget-transclusion/template.marko | 0 .../widget-transclusion/test.js | 4 +- .../widgets-browser/widget-unique-id/index.js | 7 + .../widget-unique-id/template.marko | 0 .../widgets-browser}/widget-unique-id/test.js | 0 .../component-template-entry/component.js | 0 .../component-template-entry/expected.js | 6 +- .../component-template-entry/index.marko | 0 .../async-boundaries/browser.json | 0 .../components/app-async/renderer.js | 0 .../components/app-async/template.marko | 0 .../components/app-async/widget.js | 0 .../components/app-hello/renderer.js | 0 .../components/app-hello/template.marko | 0 .../components/app-hello/widget.js | 0 .../components/app-init-async/renderer.js | 0 .../components/app-init-async/template.marko | 0 .../components/app-init-async/widget.js | 0 .../async-boundaries/marko.json | 0 .../async-boundaries/template.marko | 0 .../widgets-pages}/async-boundaries/tests.js | 2 +- .../widgets-pages}/dom-events/browser.json | 0 .../dom-events/components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widgets-pages}/dom-events/marko.json | 0 .../widgets-pages}/dom-events/template.marko | 0 .../widgets-pages}/dom-events/tests.js | 2 +- .../getRenderedWidgets/browser.json | 0 .../getRenderedWidgets/components.marko | 0 .../components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../getRenderedWidgets/marko.json | 0 .../getRenderedWidgets/template.marko | 2 +- .../getRenderedWidgets/tests.js | 2 +- .../browser.json | 0 .../components/app-bar/index.js | 2 +- .../components/app-bar/template.marko | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../marko.json | 0 .../template.marko | 0 .../tests.js | 0 .../init-widgets-immediate/browser.json | 0 .../components/app-bar/index.js | 2 +- .../components/app-bar/template.marko | 0 .../components/app-baz/index.js | 2 +- .../components/app-baz/template.marko | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../init-widgets-immediate/marko.json | 0 .../init-widgets-immediate/template.marko | 0 .../init-widgets-immediate/tests.js | 2 +- .../widgets-pages}/init-widgets/browser.json | 0 .../init-widgets/components/app-bar/index.js | 2 +- .../components/app-bar/template.marko | 0 .../init-widgets/components/app-baz/index.js | 2 +- .../components/app-baz/template.marko | 0 .../init-widgets/components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widgets-pages}/init-widgets/marko.json | 0 .../init-widgets/template.marko | 0 .../widgets-pages}/init-widgets/tests.js | 2 +- .../server-browser-unique-ids/browser.json | 0 .../components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../server-browser-unique-ids/marko.json | 0 .../server-browser-unique-ids/template.marko | 0 .../server-browser-unique-ids/tests.js | 0 .../split-widget-renderer/browser.json | 0 .../components/app-button-split/index.js | 0 .../app-button-split/marko-tag.json | 0 .../components/app-button-split/renderer.js | 2 +- .../app-button-split/template.marko | 0 .../components/app-button-split/widget.js | 2 +- .../split-widget-renderer/marko.json | 0 .../split-widget-renderer/template.marko | 0 .../split-widget-renderer/tests.js | 0 .../widgets-pages}/widget-config/browser.json | 0 .../widget-config/components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widgets-pages}/widget-config/marko.json | 0 .../widget-config/template.marko | 0 .../widgets-pages}/widget-config/tests.js | 2 +- .../widget-fixed-id/browser.json | 0 .../components/app-fixed-id/index.js | 3 + .../components/app-fixed-id/renderer.js | 0 .../components/app-fixed-id/template.marko | 0 .../components/app-fixed-id/widget.js | 0 .../components/app-hello/renderer.js | 0 .../components/app-hello/template.marko | 0 .../components/app-hello/widget.js | 0 .../widgets-pages}/widget-fixed-id/marko.json | 0 .../widget-fixed-id/template.marko | 0 .../widgets-pages}/widget-fixed-id/tests.js | 2 +- .../widgets-pages}/widget-state/browser.json | 0 .../widget-state/components/app-foo/index.js | 2 +- .../components/app-foo/template.marko | 0 .../widgets-pages}/widget-state/marko.json | 0 .../widget-state/template.marko | 0 .../widgets-pages}/widget-state/tests.js | 2 +- .../autotests/widgets-pages}/xss/browser.json | 0 .../xss/components/app-foo/index.js | 2 +- .../xss/components/app-foo/template.marko | 0 .../autotests/widgets-pages}/xss/marko.json | 0 .../widgets-pages}/xss/template.marko | 0 .../autotests/widgets-pages}/xss/tests.js | 2 +- .../autotests/widgets-server}/autotests.tests | 0 .../cspNonce/components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../widgets-server}/cspNonce/marko.json | 0 .../widgets-server}/cspNonce/template.marko | 0 .../widgets-server}/cspNonce/test.js | 3 - .../components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../getRenderedWidgetIds/marko.json | 0 .../getRenderedWidgetIds/template.marko | 0 .../getRenderedWidgetIds/test.js | 2 +- .../getRenderedWidgetIds/widget.js | 0 .../components/app-simple/index.js | 2 +- .../components/app-simple/template.marko | 0 .../getRenderedWidgets/marko.json | 0 .../getRenderedWidgets/template.marko | 0 .../getRenderedWidgets/test.js | 2 +- .../getRenderedWidgets/widget.js | 0 .../invalid-missing-template/template.marko | 0 .../invalid-missing-template/test.js | 2 +- .../invalid-missing-template/widget.js | 0 .../invalid-w-id/template.marko | 0 .../widgets-server}/invalid-w-id/test.js | 0 .../widgets-server}/invalid-w-id/widget.js | 0 .../w-bind-missing-widget/index.foo | 2 +- .../w-bind-missing-widget/template.marko | 0 .../w-bind-missing-widget/test.js | 0 .../browser-tests-runner/.jshintrc | 0 .../test => test}/browser-tests-runner/cli.js | 6 +- .../browser-tests-runner/index.js | 2 +- .../lasso-autotest-plugin.js | 0 .../browser-tests-runner/mocha-run.js | 0 .../browser-tests-runner/mocha-setup.js | 0 .../browser-tests-runner/page-template.marko | 0 .../page-template.marko.js | 40 ++ test/codegen-test.js | 2 +- test/compiler-test.js | 2 +- test/express-test.js | 2 +- test/expression-toString-test.js | 2 +- test/hot-reload-test.js | 2 +- test/inline-test.js | 2 +- test/markoc-tests.js | 2 +- {widgets/test => test}/package.json | 3 +- test/parseExpression-test.js | 2 +- test/parseFor-test.js | 2 +- test/parseJavaScriptArgs-test.js | 2 +- test/parser-test.js | 2 +- test/pretty-print-test.js | 2 +- test/render-test.js | 2 +- test/taglib-finder-test.js | 2 +- test/taglib-loader-test.js | 2 +- test/taglib-lookup-test.js | 2 +- {widgets/test => test}/util/autotest/index.js | 0 .../util/autotest/node-require.js | 0 .../test => test}/util/autotest/package.json | 0 .../util/autotest/test-filter.js | 0 test/{ => util}/patch-module.js | 2 +- {widgets/test => test}/util/pubsub.js | 0 test/vdom-async-render-test.js | 2 +- test/vdom-compiler-test.js | 2 +- test/vdom-render-test.js | 2 +- test/walker-test.js | 2 +- .../widgets-browser-tests.js | 2 +- .../widgets-compilation-tests.js | 4 +- .../widgets-server-tests.js | 2 +- widgets/.gitignore | 17 - widgets/.travis.yml | 10 - widgets/CHANGELOG.md | 364 ------------------ widgets/README.md | 35 -- widgets/{src => }/Widget.js | 0 widgets/{src => }/WidgetDef.js | 0 widgets/{src => }/WidgetsContext.js | 0 widgets/{src => }/addEventListener.js | 0 widgets/{src => }/browser.json | 0 widgets/{src => }/bubble.js | 0 widgets/{src => }/client-init.js | 0 widgets/{src => }/defineComponent.js | 0 widgets/{src => }/defineRenderer.js | 0 widgets/{src => }/defineWidget-browser.js | 0 widgets/{src => }/defineWidget.js | 0 widgets/{src => }/event-delegation.js | 0 widgets/{src => }/index-browser.js | 0 widgets/{src => }/index.js | 0 widgets/{src => }/init-widgets-browser.js | 4 +- widgets/{src => }/init-widgets.js | 0 widgets/package.json | 76 +--- widgets/{src => }/registry.js | 0 widgets/{src => }/renderable.js | 0 widgets/{src => }/repeated-id.js | 0 widgets/taglib/TransformHelper/WidgetArgs.js | 2 +- .../taglib/TransformHelper/assignWidgetId.js | 2 +- .../TransformHelper/handleWidgetBind.js | 2 +- .../TransformHelper/handleWidgetBody.js | 2 +- .../TransformHelper/handleWidgetEvents.js | 4 +- widgets/taglib/TransformHelper/index.js | 2 +- widgets/taglib/getRequirePath.js | 13 +- widgets/{ => taglib}/marko.json | 10 +- widgets/taglib/widget-tag.js | 2 +- widgets/test/.gitignore | 5 - widgets/test/.jshintrc | 45 --- .../autotests-browser/widget-api/index.js | 7 - .../components/app-bar/index.js | 3 - .../components/app-custom-events/index.js | 3 - .../widget-destroy-detach/index.js | 3 - .../components/app-bar/index.js | 3 - .../components/app-custom-events/index.js | 3 - .../components/app-custom-events/index.js | 3 - .../widget-dom-events-jquery/index.js | 3 - .../widget-dom-events/index.js | 3 - .../widget-dynamic-tag-name/index.js | 7 - .../components/app-extend-button/index.js | 3 - .../autotests-browser/widget-extend/index.js | 3 - .../widget-extends-EventEmitter/index.js | 7 - .../autotests-browser/widget-getEl/index.js | 7 - .../autotests-browser/widget-getEls/index.js | 7 - .../widget-getWidget/index.js | 7 - .../widget-getWidgets-multiple/index.js | 7 - .../widget-getWidgets-single/index.js | 7 - .../components/app-bar/index.js | 3 - .../components/app-bar/index.js | 3 - .../widget-jQuery-proxy/index.js | 7 - .../widget-label-for/index.js | 7 - .../widget-legacy-render-same-id/index.js | 3 - .../widget-legacy-rerender/index.js | 3 - .../index.js | 3 - .../components/app-iframe-content/index.js | 3 - .../index.js | 7 - .../index.js | 79 ---- .../index.js | 79 ---- .../index.js | 79 ---- .../components/app-stateful-button/index.js | 79 ---- .../components/app-stateful-button/index.js | 79 ---- .../components/app-stateful-button/index.js | 79 ---- .../components/app-stateful-button/index.js | 79 ---- .../widget-stateful-update/index.js | 79 ---- .../widget-subscribeTo/index.js | 7 - .../widget-unique-id/index.js | 7 - .../components/app-fixed-id/index.js | 3 - widgets/test/util/patch-module.js | 14 - widgets/{src => }/uniqueId-browser.js | 0 widgets/{src => }/uniqueId.js | 0 widgets/{src => }/update-manager.js | 0 widgets/{src => }/widget-args-id.js | 0 637 files changed, 1154 insertions(+), 1607 deletions(-) rename {widgets/docs => docs/widgets}/additional-resources.md (100%) rename {widgets/docs => docs/widgets}/component-lifecycle.md (100%) rename {widgets/docs => docs/widgets}/faq.md (100%) rename {widgets/docs => docs/widgets}/get-started.md (100%) rename {widgets/docs => docs/widgets}/javascript-api.md (100%) rename {widgets/docs => docs/widgets}/overview.md (100%) rename {widgets/docs => docs/widgets}/taglib-api.md (100%) rename {widgets/docs => docs/widgets}/upgrade-guide.md (100%) delete mode 100644 test/autotests/taglib-lookup/transformers-custom-node/expected.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/autotests.tests (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body-no-id/index.js (57%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body-no-id/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body-no-id/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body/index.js (57%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-body/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-no-id/index.js (57%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-no-id/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom-no-id/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom/index.js (57%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/preserve-dom/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check-template-entry/component.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check-template-entry/index.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check-template-entry/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check/index.js (83%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/sanity-check/test.js (100%) rename {widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button => test/autotests/widgets-browser/update-manager-batch-updates}/index.js (97%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/update-manager-batch-updates/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/update-manager-batch-updates/test.js (86%) rename {widgets/test/autotests-browser/update-manager-batch-updates => test/autotests/widgets-browser/update-manager-next-tick}/index.js (97%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/update-manager-next-tick/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/update-manager-next-tick/test.js (88%) create mode 100644 test/autotests/widgets-browser/widget-api/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-api/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-api/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-conditional/index.js (77%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-conditional/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-conditional/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-attr/index.js (65%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-attr/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-attr/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-attr/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-attr/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-getWidgetConfig/index.js (85%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-getWidgetConfig/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-getWidgetConfig/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-template-data/index.js (65%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-template-data/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-template-data/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-template-data/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-config-template-data/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-bar/index.js (65%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-bar/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-bar/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-bar/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-custom-events/index.js (65%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-custom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/components/app-custom-events/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/index.js (63%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events-declarative/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-custom-events/components/app-bar/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-bar/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-bar/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-bar/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-custom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/components/app-custom-events/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/index.js (63%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-custom-events/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-destroy-detach/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-detach/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-detach/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-bar/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-bar/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-bar/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-custom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/components/app-custom-events/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/index.js (63%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-legacy/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/components/app-legacy-button/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/components/app-legacy-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/components/app-legacy-button/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-ref/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/components/app-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-custom-events/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-dom-events/index.js (91%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-dom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy-unsubscribe-dom-events/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/components/app-simple/index.js (75%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/components/app-simple/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/index.js (75%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-destroy/test.js (90%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-event-listeners-repeated-non-bubbling/index.js (80%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-event-listeners-repeated-non-bubbling/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-event-listeners-repeated-non-bubbling/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-dom-events-jquery/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events-jquery/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events-jquery/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events-jquery/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events-jquery/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/components/app-legacy-button/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/components/app-legacy-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/components/app-legacy-button/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-dom-events/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dom-events/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-dynamic-tag-name/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dynamic-tag-name/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-dynamic-tag-name/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-bubbles/index.js (78%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-bubbles/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-bubbles/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-direct/index.js (79%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-direct/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-conditional-direct/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-dynamic/index.js (84%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-dynamic/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-event-handler-method-dynamic/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-extend/components/app-extend-button/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/components/app-extend-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/components/app-extend-button/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/components/app-extend-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/components/app-extend-button/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-extend/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extend/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-extends-EventEmitter/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extends-EventEmitter/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-extends-EventEmitter/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-getEl/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getEl/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getEl/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-getEls/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getEls/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getEls/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getInitialProps/index.js (76%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getInitialProps/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getInitialProps/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidget/components/app-foo/index.js (64%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidget/components/app-foo/template.marko (100%) create mode 100644 test/autotests/widgets-browser/widget-getWidget/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidget/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidget/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidget/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-multiple/components/app-foo/index.js (79%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-multiple/components/app-foo/template.marko (100%) create mode 100644 test/autotests/widgets-browser/widget-getWidgets-multiple/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-multiple/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-multiple/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-multiple/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-single/components/app-foo/index.js (64%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-single/components/app-foo/template.marko (100%) create mode 100644 test/autotests/widgets-browser/widget-getWidgets-single/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-single/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-single/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-getWidgets-single/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invalid-proto-render/test.js (83%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invalid-proto-render/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/components/app-bar/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/components/app-bar/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/index.js (81%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id-dynamic/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/components/app-bar/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/components/app-bar/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/components/app-bar/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/index.js (79%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-invoke-widget-id/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-jQuery-proxy/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-jQuery-proxy/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-jQuery-proxy/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-label-for/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-label-for/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-label-for/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-legacy-render-same-id/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-render-same-id/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-render-same-id/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-render-same-id/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-render-same-id/widget.js (100%) create mode 100644 test/autotests/widgets-browser/widget-legacy-rerender/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-rerender/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-rerender/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-rerender/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-legacy-rerender/widget.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js (95%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/index.js (95%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateful/test.js (97%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateless/index.js (93%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateless/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-lifecycle-events-stateless/test.js (95%) create mode 100644 test/autotests/widgets-browser/widget-multiple-binds-in-template/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-multiple-binds-in-template/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-multiple-binds-in-template/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-multiple-binds-in-template/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-multiple-binds-in-template/widget-bar.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-multiple-binds-in-template/widget-foo.js (100%) rename {widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered => test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout}/index.js (88%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-all-state-when-rerendered-setTimeout/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-all-state-when-rerendered-setTimeout/test.js (100%) rename {widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender => test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered}/index.js (88%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-all-state-when-rerendered/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-all-state-when-rerendered/test.js (93%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-attrs/index.js (82%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-attrs/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-attrs/test.js (94%) rename {widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout => test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender}/index.js (88%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-if/components/app-stateful-rerender/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-if/index.js (80%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-if/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-if/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-if/test.js (95%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-repeated/index.js (55%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-repeated/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-repeated/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-root/index.js (85%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-root/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-preserve-dom-root/test.js (89%) create mode 100644 test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/components/app-iframe-content/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/components/app-iframe-more-content/index.js (65%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/components/app-iframe-more-content/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-render-to-iframe/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-renderer-and-template/index.js (84%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-renderer-and-template/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-renderer-and-template/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-renderer-only/index.js (71%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-renderer-only/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/components/app-simple/index.js (75%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/components/app-simple/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/components/app-widgetless/renderer.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/components/app-widgetless/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-repeated-id-widgetless/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-replaceState/index.js (87%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-replaceState/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-replaceState/test.js (94%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/components/app-rerender-init-order-child/index.js (91%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/components/app-rerender-init-order-child/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/index.js (87%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-init-order/test.js (91%) rename {widgets/test/autotests-browser/update-manager-next-tick => test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button}/index.js (97%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/components/app-stateful-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-reuse-stateful/test.js (95%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-stateless-new-props/index.js (75%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-stateless-new-props/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-rerender-stateless-new-props/test.js (87%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-setStateDirty/index.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-setStateDirty/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-setStateDirty/test.js (92%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/components/app-stateful-button/index.js (97%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/components/app-stateful-button/template.marko (100%) create mode 100644 test/autotests/widgets-browser/widget-split-into-multiple-templates/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/template-body.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-split-into-multiple-templates/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-stateful-copy-state-on-write/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-copy-state-on-write/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-copy-state-on-write/test.js (88%) create mode 100644 test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-no-copy-state-on-write-if-same-value/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-no-copy-state-on-write-if-same-value/test.js (85%) create mode 100644 test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-no-rerender-if-destroyed/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-no-rerender-if-destroyed/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/components/app-stateful-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/index.js (83%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-preserve-body/test.js (87%) create mode 100644 test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/components/app-stateful-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/index.js (87%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-reuse-widgets/test.js (95%) create mode 100644 test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/components/app-stateful-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/index.js (89%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler-no-match/test.js (94%) create mode 100644 test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/components/app-stateful-button/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/index.js (89%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update-handler/test.js (94%) create mode 100644 test/autotests/widgets-browser/widget-stateful-update/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stateful-update/test.js (86%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stopPropagation/index.js (88%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stopPropagation/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-stopPropagation/test.js (100%) create mode 100644 test/autotests/widgets-browser/widget-subscribeTo/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-subscribeTo/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-subscribeTo/test.js (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/components/app-transclusion-alert/index.js (90%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/components/app-transclusion-alert/marko-tag.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/components/app-transclusion-alert/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/index.js (92%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/marko.json (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-transclusion/test.js (89%) create mode 100644 test/autotests/widgets-browser/widget-unique-id/index.js rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-unique-id/template.marko (100%) rename {widgets/test/autotests-browser => test/autotests/widgets-browser}/widget-unique-id/test.js (100%) rename {widgets/test/autotests-compilation => test/autotests/widgets-compilation}/component-template-entry/component.js (100%) rename {widgets/test/autotests-compilation => test/autotests/widgets-compilation}/component-template-entry/expected.js (83%) rename {widgets/test/autotests-compilation => test/autotests/widgets-compilation}/component-template-entry/index.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-async/renderer.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-async/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-async/widget.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-hello/renderer.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-hello/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-hello/widget.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-init-async/renderer.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-init-async/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/components/app-init-async/widget.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/async-boundaries/tests.js (84%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/components/app-foo/index.js (89%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/dom-events/tests.js (96%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/components.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/components/app-simple/index.js (90%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/components/app-simple/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/template.marko (95%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/getRenderedWidgets/tests.js (97%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/components/app-bar/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/components/app-bar/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/components/app-foo/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate-await-client-reorder/tests.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-bar/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-bar/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-baz/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-baz/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-foo/index.js (87%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets-immediate/tests.js (97%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-bar/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-bar/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-baz/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-baz/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-foo/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/init-widgets/tests.js (97%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/components/app-foo/index.js (64%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/server-browser-unique-ids/tests.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/components/app-button-split/index.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/components/app-button-split/marko-tag.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/components/app-button-split/renderer.js (95%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/components/app-button-split/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/components/app-button-split/widget.js (80%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/split-widget-renderer/tests.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/components/app-foo/index.js (81%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-config/tests.js (85%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/browser.json (100%) create mode 100644 test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/index.js rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-fixed-id/renderer.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-fixed-id/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-fixed-id/widget.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-hello/renderer.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-hello/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/components/app-hello/widget.js (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-fixed-id/tests.js (88%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/components/app-foo/index.js (78%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/widget-state/tests.js (85%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/browser.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/components/app-foo/index.js (87%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/components/app-foo/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/marko.json (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/template.marko (100%) rename {widgets/test/autotests-pages => test/autotests/widgets-pages}/xss/tests.js (91%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/autotests.tests (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/cspNonce/components/app-simple/index.js (87%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/cspNonce/components/app-simple/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/cspNonce/marko.json (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/cspNonce/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/cspNonce/test.js (79%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/components/app-simple/index.js (87%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/components/app-simple/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/marko.json (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/test.js (89%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgetIds/widget.js (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/components/app-simple/index.js (87%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/components/app-simple/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/marko.json (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/test.js (89%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/getRenderedWidgets/widget.js (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-missing-template/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-missing-template/test.js (86%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-missing-template/widget.js (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-w-id/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-w-id/test.js (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/invalid-w-id/widget.js (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/w-bind-missing-widget/index.foo (56%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/w-bind-missing-widget/template.marko (100%) rename {widgets/test/autotests-server => test/autotests/widgets-server}/w-bind-missing-widget/test.js (100%) rename {widgets/test => test}/browser-tests-runner/.jshintrc (100%) rename {widgets/test => test}/browser-tests-runner/cli.js (93%) rename {widgets/test => test}/browser-tests-runner/index.js (99%) rename {widgets/test => test}/browser-tests-runner/lasso-autotest-plugin.js (100%) rename {widgets/test => test}/browser-tests-runner/mocha-run.js (100%) rename {widgets/test => test}/browser-tests-runner/mocha-setup.js (100%) rename {widgets/test => test}/browser-tests-runner/page-template.marko (100%) create mode 100644 test/browser-tests-runner/page-template.marko.js rename {widgets/test => test}/package.json (64%) rename {widgets/test => test}/util/autotest/index.js (100%) rename {widgets/test => test}/util/autotest/node-require.js (100%) rename {widgets/test => test}/util/autotest/package.json (100%) rename {widgets/test => test}/util/autotest/test-filter.js (100%) rename test/{ => util}/patch-module.js (92%) rename {widgets/test => test}/util/pubsub.js (100%) rename widgets/test/browser-tests.js => test/widgets-browser-tests.js (97%) rename widgets/test/compilation-tests.js => test/widgets-compilation-tests.js (95%) rename widgets/test/server-tests.js => test/widgets-server-tests.js (87%) delete mode 100644 widgets/.gitignore delete mode 100644 widgets/.travis.yml delete mode 100644 widgets/CHANGELOG.md delete mode 100644 widgets/README.md rename widgets/{src => }/Widget.js (100%) rename widgets/{src => }/WidgetDef.js (100%) rename widgets/{src => }/WidgetsContext.js (100%) rename widgets/{src => }/addEventListener.js (100%) rename widgets/{src => }/browser.json (100%) rename widgets/{src => }/bubble.js (100%) rename widgets/{src => }/client-init.js (100%) rename widgets/{src => }/defineComponent.js (100%) rename widgets/{src => }/defineRenderer.js (100%) rename widgets/{src => }/defineWidget-browser.js (100%) rename widgets/{src => }/defineWidget.js (100%) rename widgets/{src => }/event-delegation.js (100%) rename widgets/{src => }/index-browser.js (100%) rename widgets/{src => }/index.js (100%) rename widgets/{src => }/init-widgets-browser.js (99%) rename widgets/{src => }/init-widgets.js (100%) rename widgets/{src => }/registry.js (100%) rename widgets/{src => }/renderable.js (100%) rename widgets/{src => }/repeated-id.js (100%) rename widgets/{ => taglib}/marko.json (95%) delete mode 100644 widgets/test/.gitignore delete mode 100644 widgets/test/.jshintrc delete mode 100644 widgets/test/autotests-browser/widget-api/index.js delete mode 100644 widgets/test/autotests-browser/widget-custom-events/components/app-bar/index.js delete mode 100644 widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/index.js delete mode 100644 widgets/test/autotests-browser/widget-destroy-detach/index.js delete mode 100644 widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/index.js delete mode 100644 widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/index.js delete mode 100644 widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js delete mode 100644 widgets/test/autotests-browser/widget-dom-events-jquery/index.js delete mode 100644 widgets/test/autotests-browser/widget-dom-events/index.js delete mode 100644 widgets/test/autotests-browser/widget-dynamic-tag-name/index.js delete mode 100644 widgets/test/autotests-browser/widget-extend/components/app-extend-button/index.js delete mode 100644 widgets/test/autotests-browser/widget-extend/index.js delete mode 100644 widgets/test/autotests-browser/widget-extends-EventEmitter/index.js delete mode 100644 widgets/test/autotests-browser/widget-getEl/index.js delete mode 100644 widgets/test/autotests-browser/widget-getEls/index.js delete mode 100644 widgets/test/autotests-browser/widget-getWidget/index.js delete mode 100644 widgets/test/autotests-browser/widget-getWidgets-multiple/index.js delete mode 100644 widgets/test/autotests-browser/widget-getWidgets-single/index.js delete mode 100644 widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/index.js delete mode 100644 widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/index.js delete mode 100644 widgets/test/autotests-browser/widget-jQuery-proxy/index.js delete mode 100644 widgets/test/autotests-browser/widget-label-for/index.js delete mode 100644 widgets/test/autotests-browser/widget-legacy-render-same-id/index.js delete mode 100644 widgets/test/autotests-browser/widget-legacy-rerender/index.js delete mode 100644 widgets/test/autotests-browser/widget-multiple-binds-in-template/index.js delete mode 100644 widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-content/index.js delete mode 100644 widgets/test/autotests-browser/widget-split-into-multiple-templates/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-copy-state-on-write/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-no-rerender-if-destroyed/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-preserve-body/components/app-stateful-button/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-reuse-widgets/components/app-stateful-button/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-update-handler/components/app-stateful-button/index.js delete mode 100644 widgets/test/autotests-browser/widget-stateful-update/index.js delete mode 100644 widgets/test/autotests-browser/widget-subscribeTo/index.js delete mode 100644 widgets/test/autotests-browser/widget-unique-id/index.js delete mode 100644 widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/index.js delete mode 100644 widgets/test/util/patch-module.js rename widgets/{src => }/uniqueId-browser.js (100%) rename widgets/{src => }/uniqueId.js (100%) rename widgets/{src => }/update-manager.js (100%) rename widgets/{src => }/widget-args-id.js (100%) diff --git a/.gitignore b/.gitignore index 1d2c8e7bc..4992982a5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ .vscode coverage .nvmrc -~* \ No newline at end of file +~* +/.cache \ No newline at end of file diff --git a/bin/markoc.js b/bin/markoc.js index 5b377ffb8..97728e5c6 100644 --- a/bin/markoc.js +++ b/bin/markoc.js @@ -55,7 +55,7 @@ function relPath(path) { } } -var args = require('raptor-args').createParser({ +var args = require('argly').createParser({ '--help': { type: 'boolean', description: 'Show this help message' diff --git a/compiler/index.js b/compiler/index.js index f9fe30289..b15a18c26 100644 --- a/compiler/index.js +++ b/compiler/index.js @@ -204,6 +204,7 @@ taglibLookup.registerTaglib(require.resolve('../taglibs/layout/marko.json')); taglibLookup.registerTaglib(require.resolve('../taglibs/html/marko.json')); taglibLookup.registerTaglib(require.resolve('../taglibs/async/marko.json')); taglibLookup.registerTaglib(require.resolve('../taglibs/cache/marko.json')); +taglibLookup.registerTaglib(require.resolve('../widgets/taglib/marko.json')); exports.registerTaglib = function(path) { taglibLookup.registerTaglib(path); diff --git a/defineRenderer.js b/defineRenderer.js index 89b99ef1a..097ee8c24 100644 --- a/defineRenderer.js +++ b/defineRenderer.js @@ -1,13 +1,21 @@ var marko = require('./'); -var createRenderFunc = require('raptor-renderer').createRenderFunc; function defineRenderer(def) { var template = def.template; var getTemplateData = def.getTemplateData; var renderer = def.renderer; - var loadedTemplate; + if (typeof template === 'string') { + template = marko.load(template); + } + var createOut; + + if (template) { + createOut = template.createOut; + } else { + createOut = def.createOut || marko.createOut; + } if (!renderer) { // Create a renderer function that takes care of translating @@ -21,12 +29,6 @@ function defineRenderer(def) { newProps = {}; } - if (!loadedTemplate) { - // Lazily load the template on first render to avoid potential problems - // with circular dependencies - loadedTemplate = template.render ? template : marko.load(template); - } - // Use getTemplateData(state, props, out) to get the template // data. If that method is not provided then just use the // the state (if provided) or the input data. @@ -36,11 +38,15 @@ function defineRenderer(def) { // Render the template associated with the component using the final template // data that we constructed - loadedTemplate.render(templateData, out); + template.render(templateData, out); }; } - renderer.render = createRenderFunc(renderer); + renderer.render = function(input) { + var out = createOut(); + renderer(input, out); + return out.end(); + }; return renderer; } diff --git a/widgets/docs/additional-resources.md b/docs/widgets/additional-resources.md similarity index 100% rename from widgets/docs/additional-resources.md rename to docs/widgets/additional-resources.md diff --git a/widgets/docs/component-lifecycle.md b/docs/widgets/component-lifecycle.md similarity index 100% rename from widgets/docs/component-lifecycle.md rename to docs/widgets/component-lifecycle.md diff --git a/widgets/docs/faq.md b/docs/widgets/faq.md similarity index 100% rename from widgets/docs/faq.md rename to docs/widgets/faq.md diff --git a/widgets/docs/get-started.md b/docs/widgets/get-started.md similarity index 100% rename from widgets/docs/get-started.md rename to docs/widgets/get-started.md diff --git a/widgets/docs/javascript-api.md b/docs/widgets/javascript-api.md similarity index 100% rename from widgets/docs/javascript-api.md rename to docs/widgets/javascript-api.md diff --git a/widgets/docs/overview.md b/docs/widgets/overview.md similarity index 100% rename from widgets/docs/overview.md rename to docs/widgets/overview.md diff --git a/widgets/docs/taglib-api.md b/docs/widgets/taglib-api.md similarity index 100% rename from widgets/docs/taglib-api.md rename to docs/widgets/taglib-api.md diff --git a/widgets/docs/upgrade-guide.md b/docs/widgets/upgrade-guide.md similarity index 100% rename from widgets/docs/upgrade-guide.md rename to docs/widgets/upgrade-guide.md diff --git a/package.json b/package.json index 76d04bbaa..d1770fe43 100644 --- a/package.json +++ b/package.json @@ -12,14 +12,19 @@ "url": "https://github.com/marko-js/marko.git" }, "scripts": { - "test": "npm run mocha && npm run jshint", + "test": "npm run mocha -s && npm run test-widgets -s && npm run jshint -s", "mocha": "mocha --ui bdd --reporter spec ./test/", "test-coverage": "istanbul cover _mocha --include-all-sources -- --ui bdd --reporter spec ./test && npm run jshint", "test-fast": "mocha --ui bdd --reporter spec ./test/render-test", "test-async": "mocha --ui bdd --reporter spec ./test/async-render-test", "test-taglib-loader": "mocha --ui bdd --reporter spec ./test/taglib-loader-test", "test-express": "mocha --ui bdd --reporter spec ./test/express-test", - "jshint": "jshint compiler/ runtime/ taglibs/", + "test-widgets": "npm run test-widgets-browser -s && npm run jshint --silent", + "test-widgets-browser": "node test/browser-tests-runner/cli.js test/widgets-browser-tests.js --automated && npm run test-widgets-browser-pages", + "test-widgets-browser-pages": "node test/browser-tests-runner/cli.js --pages --automated", + "test-widgets-browser-dev": "browser-refresh test/browser-tests-runner/cli.js test/widgets-browser-tests.js --server", + "test-widgets-page": "browser-refresh test/browser-tests-runner/cli.js test/widgets-browser-tests.js --server --page", + "jshint": "jshint compiler/ runtime/ taglibs/ widgets/", "coveralls": "cat ./coverage/lcov.info | coveralls" }, "author": "Patrick Steele-Idem ", @@ -30,6 +35,7 @@ "Martin Aberer" ], "dependencies": { + "argly": "^1.0.0", "app-module-path": "^1.0.5", "async-vdom-builder": "^1.0.0", "async-writer": "^3.0.0", @@ -40,36 +46,49 @@ "events": "^1.0.2", "he": "^1.1.0", "htmljs-parser": "^1.5.3", + "lasso-modules-client": "^1.0.0", "lasso-package-root": "^1.0.0", + "listener-tracker": "^1.0.2", + "marko-dom": "^1.1.1", "marko-html-util": "^1.0.0", "marko-vdom": "^1.0.0", "minimatch": "^3.0.2", + "morphdom": "^2.2.0", "object-assign": "^4.1.0", "property-handlers": "^1.0.0", - "raptor-args": "^1.0.0", "raptor-async": "^1.1.2", "raptor-json": "^1.0.1", "raptor-logging": "^1.0.1", "raptor-polyfill": "^1.0.0", "raptor-promises": "^1.0.1", "raptor-regexp": "^1.0.0", - "raptor-renderer": "^1.4.4", - "raptor-strings": "^1.0.0", "raptor-util": "^3.0.0", "resolve-from": "^1.0.0", "strip-json-comments": "^2.0.1", - "try-require": "^1.2.1" + "try-require": "^1.2.1", + "warp10": "^1.0.0" }, "devDependencies": { + "async": "^0.9.0", "bluebird": "^2.9.30", + "browser-refresh": "^1.6.0", + "browser-refresh-taglib": "^1.1.0", "chai": "^3.3.0", + "child-process-promise": "^2.0.3", "coveralls": "^2.11.9", "express": "^4.13.4", "fs-extra": "^0.30.0", + "ignoring-watcher": "^1.0.2", "istanbul": "^0.4.3", + "jquery": "^2.1.3", "jsdom": "^9.6.0", "jshint": "^2.5.0", + "lasso": "^2.4.1", + "lasso-marko": "^2.0.4", + "mkdirp": "^0.5.1", "mocha": "^2.3.3", + "mocha-phantomjs": "^4.1.0", + "phantomjs-prebuilt": "^2.1.13", "request": "^2.72.0", "require-self-ref": "^2.0.1", "through": "^2.3.4" diff --git a/test/.gitignore b/test/.gitignore index 667a523c3..ed9d2f6f1 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,3 +1,9 @@ /node_modules /scratch.js -*.generated.js \ No newline at end of file +*.generated.js + +actual.js +actual.html +*.actual.js +*.actual.html +/generated \ No newline at end of file diff --git a/test/adjustIndent-test.js b/test/adjustIndent-test.js index 910e31d70..2a4508171 100644 --- a/test/adjustIndent-test.js +++ b/test/adjustIndent-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/api-compiler-tests.js b/test/api-compiler-tests.js index b67148b4e..f28e9a0bc 100644 --- a/test/api-compiler-tests.js +++ b/test/api-compiler-tests.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('marko/node-require').install(); var chai = require('chai'); diff --git a/test/api-tests.js b/test/api-tests.js index 9ca37baca..93686d260 100644 --- a/test/api-tests.js +++ b/test/api-tests.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('marko/node-require').install(); require('require-self-ref'); diff --git a/test/async-fragments-deprecated-test.js b/test/async-fragments-deprecated-test.js index f063213f8..45eed75ec 100644 --- a/test/async-fragments-deprecated-test.js +++ b/test/async-fragments-deprecated-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/async-render-test.js b/test/async-render-test.js index 94f716294..58cbdbe16 100644 --- a/test/async-render-test.js +++ b/test/async-render-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('../node-require').install(); var chai = require('chai'); diff --git a/test/autotests/api/defineRenderer/test.js b/test/autotests/api/defineRenderer/test.js index 67208cf17..34039c351 100644 --- a/test/autotests/api/defineRenderer/test.js +++ b/test/autotests/api/defineRenderer/test.js @@ -11,6 +11,6 @@ exports.check = function(marko, markoCompiler, expect, done) { }); var renderResult = renderer.render({ firstName: 'John', lastName: 'Doe' }); - expect(renderResult.html).to.equal('
Hello John Doe!
'); + expect(renderResult.getOutput()).to.equal('
Hello John Doe!
'); done(); }; \ No newline at end of file diff --git a/test/autotests/api/require-hook-compiler-options/test.js b/test/autotests/api/require-hook-compiler-options/test.js index 782c3628b..de1950658 100644 --- a/test/autotests/api/require-hook-compiler-options/test.js +++ b/test/autotests/api/require-hook-compiler-options/test.js @@ -7,7 +7,7 @@ exports.check = function(marko, markoCompiler, expect, done) { expect(markoCompiler.config.writeToDisk).to.equal(true); expect(markoCompiler.config.preserveWhitespace).to.equal(true); - require('~/node-require').install({ + require('marko/node-require').install({ compilerOptions: { writeToDisk: false, preserveWhitespace: false diff --git a/test/autotests/async-fragments-deprecated/async-fragment-data-providers/test.js b/test/autotests/async-fragments-deprecated/async-fragment-data-providers/test.js index 487731cee..f4741ea3d 100644 --- a/test/autotests/async-fragments-deprecated/async-fragment-data-providers/test.js +++ b/test/autotests/async-fragments-deprecated/async-fragment-data-providers/test.js @@ -1,14 +1,10 @@ exports.templateData = { sharedData: function (args, done) { - var deferred = require('raptor-promises').defer(); - - setTimeout(function() { - deferred.resolve({ - name: 'testSharedData' - }); - }, 100); - - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({ name: 'testSharedData' }); + }, 100); + }); }, contextData: function (args, done) { setTimeout(function() { diff --git a/test/autotests/async-fragments-deprecated/async-fragment-function-data-provider-return-promise/test.js b/test/autotests/async-fragments-deprecated/async-fragment-function-data-provider-return-promise/test.js index d63fff1f1..3e77a0ed2 100644 --- a/test/autotests/async-fragments-deprecated/async-fragment-function-data-provider-return-promise/test.js +++ b/test/autotests/async-fragments-deprecated/async-fragment-function-data-provider-return-promise/test.js @@ -1,11 +1,9 @@ exports.templateData = { userInfo: function() { - var deferred = require('raptor-promises').defer(); - setTimeout(function() { - deferred.resolve({ - name: 'John' - }); - }, 200); - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({ name: 'John' }); + }, 100); + }); } }; \ No newline at end of file diff --git a/test/autotests/async-fragments-deprecated/async-fragment-promise-error-q/test.js b/test/autotests/async-fragments-deprecated/async-fragment-promise-error-q/test.js index 94300f181..f9b9cf4b5 100644 --- a/test/autotests/async-fragments-deprecated/async-fragment-promise-error-q/test.js +++ b/test/autotests/async-fragments-deprecated/async-fragment-promise-error-q/test.js @@ -1,9 +1,9 @@ -var deferred = require('raptor-promises').defer(); - -setTimeout(function() { - deferred.resolve({}); -}, 200); +var promise = new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({}); + }, 100); +}); exports.templateData = { - promiseData: deferred.promise + promiseData: promise }; diff --git a/test/autotests/async-fragments-deprecated/async-fragment-promise/test.js b/test/autotests/async-fragments-deprecated/async-fragment-promise/test.js index 668451a30..770df7999 100644 --- a/test/autotests/async-fragments-deprecated/async-fragment-promise/test.js +++ b/test/autotests/async-fragments-deprecated/async-fragment-promise/test.js @@ -1,10 +1,9 @@ -var deferred = require('raptor-promises').defer(); -setTimeout(function() { - deferred.resolve('Test promise'); -}, 200); - exports.templateData = { promiseData: function (arg, done) { - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve('Test promise'); + }, 100); + }); } }; diff --git a/test/autotests/async-render/await-data-providers/test.js b/test/autotests/async-render/await-data-providers/test.js index 487731cee..b6b7c6f6d 100644 --- a/test/autotests/async-render/await-data-providers/test.js +++ b/test/autotests/async-render/await-data-providers/test.js @@ -1,14 +1,12 @@ exports.templateData = { sharedData: function (args, done) { - var deferred = require('raptor-promises').defer(); - - setTimeout(function() { - deferred.resolve({ - name: 'testSharedData' - }); - }, 100); - - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({ + name: 'testSharedData' + }); + }, 100); + }); }, contextData: function (args, done) { setTimeout(function() { diff --git a/test/autotests/async-render/await-function-data-provider-return-promise/test.js b/test/autotests/async-render/await-function-data-provider-return-promise/test.js index d63fff1f1..9c866ed08 100644 --- a/test/autotests/async-render/await-function-data-provider-return-promise/test.js +++ b/test/autotests/async-render/await-function-data-provider-return-promise/test.js @@ -1,11 +1,11 @@ exports.templateData = { userInfo: function() { - var deferred = require('raptor-promises').defer(); - setTimeout(function() { - deferred.resolve({ - name: 'John' - }); - }, 200); - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({ + name: 'John' + }); + }, 100); + }); } }; \ No newline at end of file diff --git a/test/autotests/async-render/await-promise-error-q/test.js b/test/autotests/async-render/await-promise-error-q/test.js index 94300f181..f9b9cf4b5 100644 --- a/test/autotests/async-render/await-promise-error-q/test.js +++ b/test/autotests/async-render/await-promise-error-q/test.js @@ -1,9 +1,9 @@ -var deferred = require('raptor-promises').defer(); - -setTimeout(function() { - deferred.resolve({}); -}, 200); +var promise = new Promise(function(resolve, reject) { + setTimeout(function() { + resolve({}); + }, 100); +}); exports.templateData = { - promiseData: deferred.promise + promiseData: promise }; diff --git a/test/autotests/async-render/await-promise/test.js b/test/autotests/async-render/await-promise/test.js index 668451a30..770df7999 100644 --- a/test/autotests/async-render/await-promise/test.js +++ b/test/autotests/async-render/await-promise/test.js @@ -1,10 +1,9 @@ -var deferred = require('raptor-promises').defer(); -setTimeout(function() { - deferred.resolve('Test promise'); -}, 200); - exports.templateData = { promiseData: function (arg, done) { - return deferred.promise; + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve('Test promise'); + }, 100); + }); } }; diff --git a/test/autotests/taglib-lookup/forEachAttribute/expected.json b/test/autotests/taglib-lookup/forEachAttribute/expected.json index a096e7ecb..06aa8a866 100644 --- a/test/autotests/taglib-lookup/forEachAttribute/expected.json +++ b/test/autotests/taglib-lookup/forEachAttribute/expected.json @@ -2,10 +2,24 @@ "name", "age", "foo-on-*", + "lasso-nonce", "body-only-if", "if", "else-if", "else", "for", - "while" + "while", + "w-bind", + "w-scope", + "w-extend", + "w-config", + "w-for", + "w-id", + "w-body", + "w-preserve", + "w-preserve-body", + "w-preserve-if", + "w-preserve-body-if", + "w-preserve-attrs", + "w-on*" ] \ No newline at end of file diff --git a/test/autotests/taglib-lookup/forEachTag/expected.json b/test/autotests/taglib-lookup/forEachTag/expected.json index 1ecc46f84..1a1c211ea 100644 --- a/test/autotests/taglib-lookup/forEachTag/expected.json +++ b/test/autotests/taglib-lookup/forEachTag/expected.json @@ -2,6 +2,14 @@ "*", "foo", "bar", + "lasso-page", + "lasso-slot", + "lasso-head", + "lasso-body", + "lasso-img", + "_lasso-resources-root", + "lasso-resource", + "browser-refresh", "assign", "else", "else-if", @@ -35,5 +43,9 @@ "async-fragment-placeholder", "async-fragment-timeout", "async-fragment-error", - "cached-fragment" + "cached-fragment", + "w-widget", + "init-widgets", + "w-preserve", + "widget-types" ] \ No newline at end of file diff --git a/test/autotests/taglib-lookup/getTagsSorted/expected.json b/test/autotests/taglib-lookup/getTagsSorted/expected.json index dc131a607..20b0f4415 100644 --- a/test/autotests/taglib-lookup/getTagsSorted/expected.json +++ b/test/autotests/taglib-lookup/getTagsSorted/expected.json @@ -1,4 +1,5 @@ [ + "_lasso-resources-root", "*", "a", "assign", @@ -13,6 +14,7 @@ "await-reorderer", "await-timeout", "bar", + "browser-refresh", "cached-fragment", "else", "else-if", @@ -23,7 +25,14 @@ "include", "include-html", "include-text", + "init-widgets", "invoke", + "lasso-body", + "lasso-head", + "lasso-img", + "lasso-page", + "lasso-resource", + "lasso-slot", "layout-placeholder", "layout-put", "layout-use", @@ -36,5 +45,8 @@ "textarea", "unless", "var", - "while" + "w-preserve", + "w-widget", + "while", + "widget-types" ] \ No newline at end of file diff --git a/test/autotests/taglib-lookup/transformers-core-only/test.js b/test/autotests/taglib-lookup/transformers-core-only/test.js index 003ea4742..019741272 100644 --- a/test/autotests/taglib-lookup/transformers-core-only/test.js +++ b/test/autotests/taglib-lookup/transformers-core-only/test.js @@ -7,5 +7,5 @@ exports.check = function(markoCompiler, expect) { transformers.push(transformer); }); - expect(transformers.length).to.equal(1); + expect(transformers.length).to.equal(3); }; \ No newline at end of file diff --git a/test/autotests/taglib-lookup/transformers-custom-node/expected.js b/test/autotests/taglib-lookup/transformers-custom-node/expected.js deleted file mode 100644 index 2fd9f9570..000000000 --- a/test/autotests/taglib-lookup/transformers-custom-node/expected.js +++ /dev/null @@ -1 +0,0 @@ -TBD \ No newline at end of file diff --git a/test/autotests/taglib-lookup/transformers-custom-node/test.js b/test/autotests/taglib-lookup/transformers-custom-node/test.js index 4f978f639..1022d97e1 100644 --- a/test/autotests/taglib-lookup/transformers-custom-node/test.js +++ b/test/autotests/taglib-lookup/transformers-custom-node/test.js @@ -8,6 +8,8 @@ exports.check = function(markoCompiler, expect) { transformers.push(transformer); }); - expect(transformers.length).to.equal(1); + expect(transformers.length).to.equal(3); expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1); + expect(transformers[1].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); + expect(transformers[2].path.indexOf('widgets-transformer')).to.not.equal(-1); }; \ No newline at end of file diff --git a/test/autotests/taglib-lookup/transformers/test.js b/test/autotests/taglib-lookup/transformers/test.js index fa845ee70..8163b4103 100644 --- a/test/autotests/taglib-lookup/transformers/test.js +++ b/test/autotests/taglib-lookup/transformers/test.js @@ -18,16 +18,20 @@ exports.check = function(markoCompiler, expect) { transformers.push(transformer); }); - expect(transformers.length).to.equal(2); + expect(transformers.length).to.equal(4); expect(transformers[0].path.indexOf('foo')).to.not.equal(-1); expect(transformers[1].path.indexOf('core-transformer')).to.not.equal(-1); + expect(transformers[2].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); + expect(transformers[3].path.indexOf('widgets-transformer')).to.not.equal(-1); transformers = []; lookup.forEachTagTransformer('transform-bar', function(transformer) { transformers.push(transformer); }); - expect(transformers.length).to.equal(2); + expect(transformers.length).to.equal(4); expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1); expect(transformers[1].path.indexOf('bar')).to.not.equal(-1); + expect(transformers[2].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); + expect(transformers[3].path.indexOf('widgets-transformer')).to.not.equal(-1); }; \ No newline at end of file diff --git a/widgets/test/autotests-browser/autotests.tests b/test/autotests/widgets-browser/autotests.tests similarity index 100% rename from widgets/test/autotests-browser/autotests.tests rename to test/autotests/widgets-browser/autotests.tests diff --git a/widgets/test/autotests-browser/preserve-dom-body-no-id/index.js b/test/autotests/widgets-browser/preserve-dom-body-no-id/index.js similarity index 57% rename from widgets/test/autotests-browser/preserve-dom-body-no-id/index.js rename to test/autotests/widgets-browser/preserve-dom-body-no-id/index.js index 6d1028bcf..888b55d6b 100644 --- a/widgets/test/autotests-browser/preserve-dom-body-no-id/index.js +++ b/test/autotests/widgets-browser/preserve-dom-body-no-id/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/preserve-dom-body-no-id/template.marko b/test/autotests/widgets-browser/preserve-dom-body-no-id/template.marko similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-body-no-id/template.marko rename to test/autotests/widgets-browser/preserve-dom-body-no-id/template.marko diff --git a/widgets/test/autotests-browser/preserve-dom-body-no-id/test.js b/test/autotests/widgets-browser/preserve-dom-body-no-id/test.js similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-body-no-id/test.js rename to test/autotests/widgets-browser/preserve-dom-body-no-id/test.js diff --git a/widgets/test/autotests-browser/preserve-dom-body/index.js b/test/autotests/widgets-browser/preserve-dom-body/index.js similarity index 57% rename from widgets/test/autotests-browser/preserve-dom-body/index.js rename to test/autotests/widgets-browser/preserve-dom-body/index.js index 6d1028bcf..888b55d6b 100644 --- a/widgets/test/autotests-browser/preserve-dom-body/index.js +++ b/test/autotests/widgets-browser/preserve-dom-body/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/preserve-dom-body/template.marko b/test/autotests/widgets-browser/preserve-dom-body/template.marko similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-body/template.marko rename to test/autotests/widgets-browser/preserve-dom-body/template.marko diff --git a/widgets/test/autotests-browser/preserve-dom-body/test.js b/test/autotests/widgets-browser/preserve-dom-body/test.js similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-body/test.js rename to test/autotests/widgets-browser/preserve-dom-body/test.js diff --git a/widgets/test/autotests-browser/preserve-dom-no-id/index.js b/test/autotests/widgets-browser/preserve-dom-no-id/index.js similarity index 57% rename from widgets/test/autotests-browser/preserve-dom-no-id/index.js rename to test/autotests/widgets-browser/preserve-dom-no-id/index.js index 6d1028bcf..888b55d6b 100644 --- a/widgets/test/autotests-browser/preserve-dom-no-id/index.js +++ b/test/autotests/widgets-browser/preserve-dom-no-id/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/preserve-dom-no-id/template.marko b/test/autotests/widgets-browser/preserve-dom-no-id/template.marko similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-no-id/template.marko rename to test/autotests/widgets-browser/preserve-dom-no-id/template.marko diff --git a/widgets/test/autotests-browser/preserve-dom-no-id/test.js b/test/autotests/widgets-browser/preserve-dom-no-id/test.js similarity index 100% rename from widgets/test/autotests-browser/preserve-dom-no-id/test.js rename to test/autotests/widgets-browser/preserve-dom-no-id/test.js diff --git a/widgets/test/autotests-browser/preserve-dom/index.js b/test/autotests/widgets-browser/preserve-dom/index.js similarity index 57% rename from widgets/test/autotests-browser/preserve-dom/index.js rename to test/autotests/widgets-browser/preserve-dom/index.js index 6d1028bcf..888b55d6b 100644 --- a/widgets/test/autotests-browser/preserve-dom/index.js +++ b/test/autotests/widgets-browser/preserve-dom/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/preserve-dom/template.marko b/test/autotests/widgets-browser/preserve-dom/template.marko similarity index 100% rename from widgets/test/autotests-browser/preserve-dom/template.marko rename to test/autotests/widgets-browser/preserve-dom/template.marko diff --git a/widgets/test/autotests-browser/preserve-dom/test.js b/test/autotests/widgets-browser/preserve-dom/test.js similarity index 100% rename from widgets/test/autotests-browser/preserve-dom/test.js rename to test/autotests/widgets-browser/preserve-dom/test.js diff --git a/widgets/test/autotests-browser/sanity-check-template-entry/component.js b/test/autotests/widgets-browser/sanity-check-template-entry/component.js similarity index 100% rename from widgets/test/autotests-browser/sanity-check-template-entry/component.js rename to test/autotests/widgets-browser/sanity-check-template-entry/component.js diff --git a/widgets/test/autotests-browser/sanity-check-template-entry/index.marko b/test/autotests/widgets-browser/sanity-check-template-entry/index.marko similarity index 100% rename from widgets/test/autotests-browser/sanity-check-template-entry/index.marko rename to test/autotests/widgets-browser/sanity-check-template-entry/index.marko diff --git a/widgets/test/autotests-browser/sanity-check-template-entry/test.js b/test/autotests/widgets-browser/sanity-check-template-entry/test.js similarity index 100% rename from widgets/test/autotests-browser/sanity-check-template-entry/test.js rename to test/autotests/widgets-browser/sanity-check-template-entry/test.js diff --git a/widgets/test/autotests-browser/sanity-check/index.js b/test/autotests/widgets-browser/sanity-check/index.js similarity index 83% rename from widgets/test/autotests-browser/sanity-check/index.js rename to test/autotests/widgets-browser/sanity-check/index.js index c85e8c99c..cc173456f 100644 --- a/widgets/test/autotests-browser/sanity-check/index.js +++ b/test/autotests/widgets-browser/sanity-check/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/sanity-check/template.marko b/test/autotests/widgets-browser/sanity-check/template.marko similarity index 100% rename from widgets/test/autotests-browser/sanity-check/template.marko rename to test/autotests/widgets-browser/sanity-check/template.marko diff --git a/widgets/test/autotests-browser/sanity-check/test.js b/test/autotests/widgets-browser/sanity-check/test.js similarity index 100% rename from widgets/test/autotests-browser/sanity-check/test.js rename to test/autotests/widgets-browser/sanity-check/test.js diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js b/test/autotests/widgets-browser/update-manager-batch-updates/index.js similarity index 97% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js rename to test/autotests/widgets-browser/update-manager-batch-updates/index.js index 8a579299b..724da4446 100644 --- a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js +++ b/test/autotests/widgets-browser/update-manager-batch-updates/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/update-manager-batch-updates/template.marko b/test/autotests/widgets-browser/update-manager-batch-updates/template.marko similarity index 100% rename from widgets/test/autotests-browser/update-manager-batch-updates/template.marko rename to test/autotests/widgets-browser/update-manager-batch-updates/template.marko diff --git a/widgets/test/autotests-browser/update-manager-batch-updates/test.js b/test/autotests/widgets-browser/update-manager-batch-updates/test.js similarity index 86% rename from widgets/test/autotests-browser/update-manager-batch-updates/test.js rename to test/autotests/widgets-browser/update-manager-batch-updates/test.js index 2a47ad414..7859a4dcc 100644 --- a/widgets/test/autotests-browser/update-manager-batch-updates/test.js +++ b/test/autotests/widgets-browser/update-manager-batch-updates/test.js @@ -8,7 +8,7 @@ module.exports = function(helpers) { expect(widget.el.className).to.contain('large'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setSize('small'); }); diff --git a/widgets/test/autotests-browser/update-manager-batch-updates/index.js b/test/autotests/widgets-browser/update-manager-next-tick/index.js similarity index 97% rename from widgets/test/autotests-browser/update-manager-batch-updates/index.js rename to test/autotests/widgets-browser/update-manager-next-tick/index.js index 8a579299b..724da4446 100644 --- a/widgets/test/autotests-browser/update-manager-batch-updates/index.js +++ b/test/autotests/widgets-browser/update-manager-next-tick/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/update-manager-next-tick/template.marko b/test/autotests/widgets-browser/update-manager-next-tick/template.marko similarity index 100% rename from widgets/test/autotests-browser/update-manager-next-tick/template.marko rename to test/autotests/widgets-browser/update-manager-next-tick/template.marko diff --git a/widgets/test/autotests-browser/update-manager-next-tick/test.js b/test/autotests/widgets-browser/update-manager-next-tick/test.js similarity index 88% rename from widgets/test/autotests-browser/update-manager-next-tick/test.js rename to test/autotests/widgets-browser/update-manager-next-tick/test.js index f8ec698a6..2830422fd 100644 --- a/widgets/test/autotests-browser/update-manager-next-tick/test.js +++ b/test/autotests/widgets-browser/update-manager-next-tick/test.js @@ -10,7 +10,7 @@ module.exports = function(helpers, done) { widget.setSize('small'); expect(widget.el.className).to.not.contain('small'); - require('marko-widgets').onAfterUpdate(function() { + require('marko/widgets').onAfterUpdate(function() { expect(widget.el.className).to.contain('small'); done(); }); diff --git a/test/autotests/widgets-browser/widget-api/index.js b/test/autotests/widgets-browser/widget-api/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-api/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-api/template.marko b/test/autotests/widgets-browser/widget-api/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-api/template.marko rename to test/autotests/widgets-browser/widget-api/template.marko diff --git a/widgets/test/autotests-browser/widget-api/test.js b/test/autotests/widgets-browser/widget-api/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-api/test.js rename to test/autotests/widgets-browser/widget-api/test.js diff --git a/widgets/test/autotests-browser/widget-conditional/index.js b/test/autotests/widgets-browser/widget-conditional/index.js similarity index 77% rename from widgets/test/autotests-browser/widget-conditional/index.js rename to test/autotests/widgets-browser/widget-conditional/index.js index 7953e6ac2..24fe98e89 100644 --- a/widgets/test/autotests-browser/widget-conditional/index.js +++ b/test/autotests/widgets-browser/widget-conditional/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-conditional/template.marko b/test/autotests/widgets-browser/widget-conditional/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-conditional/template.marko rename to test/autotests/widgets-browser/widget-conditional/template.marko diff --git a/widgets/test/autotests-browser/widget-conditional/test.js b/test/autotests/widgets-browser/widget-conditional/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-conditional/test.js rename to test/autotests/widgets-browser/widget-conditional/test.js diff --git a/widgets/test/autotests-browser/widget-config-attr/index.js b/test/autotests/widgets-browser/widget-config-attr/index.js similarity index 65% rename from widgets/test/autotests-browser/widget-config-attr/index.js rename to test/autotests/widgets-browser/widget-config-attr/index.js index 266cee35f..0aec91880 100644 --- a/widgets/test/autotests-browser/widget-config-attr/index.js +++ b/test/autotests/widgets-browser/widget-config-attr/index.js @@ -1,3 +1,3 @@ // Export a render(input, callback) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-config-attr/renderer.js b/test/autotests/widgets-browser/widget-config-attr/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-attr/renderer.js rename to test/autotests/widgets-browser/widget-config-attr/renderer.js diff --git a/widgets/test/autotests-browser/widget-config-attr/template.marko b/test/autotests/widgets-browser/widget-config-attr/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-config-attr/template.marko rename to test/autotests/widgets-browser/widget-config-attr/template.marko diff --git a/widgets/test/autotests-browser/widget-config-attr/test.js b/test/autotests/widgets-browser/widget-config-attr/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-attr/test.js rename to test/autotests/widgets-browser/widget-config-attr/test.js diff --git a/widgets/test/autotests-browser/widget-config-attr/widget.js b/test/autotests/widgets-browser/widget-config-attr/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-attr/widget.js rename to test/autotests/widgets-browser/widget-config-attr/widget.js diff --git a/widgets/test/autotests-browser/widget-config-getWidgetConfig/index.js b/test/autotests/widgets-browser/widget-config-getWidgetConfig/index.js similarity index 85% rename from widgets/test/autotests-browser/widget-config-getWidgetConfig/index.js rename to test/autotests/widgets-browser/widget-config-getWidgetConfig/index.js index 8a8454d93..b593186bc 100644 --- a/widgets/test/autotests-browser/widget-config-getWidgetConfig/index.js +++ b/test/autotests/widgets-browser/widget-config-getWidgetConfig/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getWidgetConfig: function(input) { diff --git a/widgets/test/autotests-browser/widget-config-getWidgetConfig/template.marko b/test/autotests/widgets-browser/widget-config-getWidgetConfig/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-config-getWidgetConfig/template.marko rename to test/autotests/widgets-browser/widget-config-getWidgetConfig/template.marko diff --git a/widgets/test/autotests-browser/widget-config-getWidgetConfig/test.js b/test/autotests/widgets-browser/widget-config-getWidgetConfig/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-getWidgetConfig/test.js rename to test/autotests/widgets-browser/widget-config-getWidgetConfig/test.js diff --git a/widgets/test/autotests-browser/widget-config-template-data/index.js b/test/autotests/widgets-browser/widget-config-template-data/index.js similarity index 65% rename from widgets/test/autotests-browser/widget-config-template-data/index.js rename to test/autotests/widgets-browser/widget-config-template-data/index.js index 266cee35f..0aec91880 100644 --- a/widgets/test/autotests-browser/widget-config-template-data/index.js +++ b/test/autotests/widgets-browser/widget-config-template-data/index.js @@ -1,3 +1,3 @@ // Export a render(input, callback) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-config-template-data/renderer.js b/test/autotests/widgets-browser/widget-config-template-data/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-template-data/renderer.js rename to test/autotests/widgets-browser/widget-config-template-data/renderer.js diff --git a/widgets/test/autotests-browser/widget-config-template-data/template.marko b/test/autotests/widgets-browser/widget-config-template-data/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-config-template-data/template.marko rename to test/autotests/widgets-browser/widget-config-template-data/template.marko diff --git a/widgets/test/autotests-browser/widget-config-template-data/test.js b/test/autotests/widgets-browser/widget-config-template-data/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-template-data/test.js rename to test/autotests/widgets-browser/widget-config-template-data/test.js diff --git a/widgets/test/autotests-browser/widget-config-template-data/widget.js b/test/autotests/widgets-browser/widget-config-template-data/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-config-template-data/widget.js rename to test/autotests/widgets-browser/widget-config-template-data/widget.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/index.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.js similarity index 65% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/index.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.js index 266cee35f..0aec91880 100644 --- a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/index.js +++ b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.js @@ -1,3 +1,3 @@ // Export a render(input, callback) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/renderer.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/renderer.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/template.marko b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/template.marko rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/widget.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-bar/widget.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/widget.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/index.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.js similarity index 65% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/index.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.js index 266cee35f..0aec91880 100644 --- a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/index.js +++ b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.js @@ -1,3 +1,3 @@ // Export a render(input, callback) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/renderer.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/renderer.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/template.marko b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/template.marko rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/widget.js b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/components/app-custom-events/widget.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/widget.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/index.js b/test/autotests/widgets-browser/widget-custom-events-declarative/index.js similarity index 63% rename from widgets/test/autotests-browser/widget-custom-events-declarative/index.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/index.js index bc9d360d5..df945278c 100644 --- a/widgets/test/autotests-browser/widget-custom-events-declarative/index.js +++ b/test/autotests/widgets-browser/widget-custom-events-declarative/index.js @@ -1,3 +1,3 @@ // Export a render(input) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/marko.json b/test/autotests/widgets-browser/widget-custom-events-declarative/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/marko.json rename to test/autotests/widgets-browser/widget-custom-events-declarative/marko.json diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/renderer.js b/test/autotests/widgets-browser/widget-custom-events-declarative/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/renderer.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/template.marko b/test/autotests/widgets-browser/widget-custom-events-declarative/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/template.marko rename to test/autotests/widgets-browser/widget-custom-events-declarative/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/test.js b/test/autotests/widgets-browser/widget-custom-events-declarative/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/test.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/test.js diff --git a/widgets/test/autotests-browser/widget-custom-events-declarative/widget.js b/test/autotests/widgets-browser/widget-custom-events-declarative/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events-declarative/widget.js rename to test/autotests/widgets-browser/widget-custom-events-declarative/widget.js diff --git a/test/autotests/widgets-browser/widget-custom-events/components/app-bar/index.js b/test/autotests/widgets-browser/widget-custom-events/components/app-bar/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-custom-events/components/app-bar/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-bar/renderer.js b/test/autotests/widgets-browser/widget-custom-events/components/app-bar/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-bar/renderer.js rename to test/autotests/widgets-browser/widget-custom-events/components/app-bar/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-bar/template.marko b/test/autotests/widgets-browser/widget-custom-events/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-bar/template.marko rename to test/autotests/widgets-browser/widget-custom-events/components/app-bar/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-bar/widget.js b/test/autotests/widgets-browser/widget-custom-events/components/app-bar/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-bar/widget.js rename to test/autotests/widgets-browser/widget-custom-events/components/app-bar/widget.js diff --git a/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/index.js b/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/renderer.js b/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/renderer.js rename to test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/template.marko b/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/template.marko rename to test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/widget.js b/test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/components/app-custom-events/widget.js rename to test/autotests/widgets-browser/widget-custom-events/components/app-custom-events/widget.js diff --git a/widgets/test/autotests-browser/widget-custom-events/index.js b/test/autotests/widgets-browser/widget-custom-events/index.js similarity index 63% rename from widgets/test/autotests-browser/widget-custom-events/index.js rename to test/autotests/widgets-browser/widget-custom-events/index.js index bc9d360d5..df945278c 100644 --- a/widgets/test/autotests-browser/widget-custom-events/index.js +++ b/test/autotests/widgets-browser/widget-custom-events/index.js @@ -1,3 +1,3 @@ // Export a render(input) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-custom-events/marko.json b/test/autotests/widgets-browser/widget-custom-events/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/marko.json rename to test/autotests/widgets-browser/widget-custom-events/marko.json diff --git a/widgets/test/autotests-browser/widget-custom-events/renderer.js b/test/autotests/widgets-browser/widget-custom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/renderer.js rename to test/autotests/widgets-browser/widget-custom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-custom-events/template.marko b/test/autotests/widgets-browser/widget-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/template.marko rename to test/autotests/widgets-browser/widget-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-custom-events/test.js b/test/autotests/widgets-browser/widget-custom-events/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/test.js rename to test/autotests/widgets-browser/widget-custom-events/test.js diff --git a/widgets/test/autotests-browser/widget-custom-events/widget.js b/test/autotests/widgets-browser/widget-custom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-custom-events/widget.js rename to test/autotests/widgets-browser/widget-custom-events/widget.js diff --git a/test/autotests/widgets-browser/widget-destroy-detach/index.js b/test/autotests/widgets-browser/widget-destroy-detach/index.js new file mode 100644 index 000000000..e267e4ce8 --- /dev/null +++ b/test/autotests/widgets-browser/widget-destroy-detach/index.js @@ -0,0 +1,3 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko') +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-destroy-detach/template.marko b/test/autotests/widgets-browser/widget-destroy-detach/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-detach/template.marko rename to test/autotests/widgets-browser/widget-destroy-detach/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-detach/test.js b/test/autotests/widgets-browser/widget-destroy-detach/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-detach/test.js rename to test/autotests/widgets-browser/widget-destroy-detach/test.js diff --git a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/renderer.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/renderer.js rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/renderer.js diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/template.marko b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/template.marko rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/widget.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-bar/widget.js rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/widget.js diff --git a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/renderer.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/renderer.js rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/template.marko b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/template.marko rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/widget.js b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/components/app-custom-events/widget.js rename to test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/widget.js diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/index.js b/test/autotests/widgets-browser/widget-destroy-legacy/index.js similarity index 63% rename from widgets/test/autotests-browser/widget-destroy-legacy/index.js rename to test/autotests/widgets-browser/widget-destroy-legacy/index.js index bc9d360d5..df945278c 100644 --- a/widgets/test/autotests-browser/widget-destroy-legacy/index.js +++ b/test/autotests/widgets-browser/widget-destroy-legacy/index.js @@ -1,3 +1,3 @@ // Export a render(input) method that can be used // to render this UI component on the client or server -require('marko-widgets').renderable(exports, require('./renderer')); \ No newline at end of file +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/marko.json b/test/autotests/widgets-browser/widget-destroy-legacy/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/marko.json rename to test/autotests/widgets-browser/widget-destroy-legacy/marko.json diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/renderer.js b/test/autotests/widgets-browser/widget-destroy-legacy/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/renderer.js rename to test/autotests/widgets-browser/widget-destroy-legacy/renderer.js diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/template.marko b/test/autotests/widgets-browser/widget-destroy-legacy/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/template.marko rename to test/autotests/widgets-browser/widget-destroy-legacy/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/test.js b/test/autotests/widgets-browser/widget-destroy-legacy/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/test.js rename to test/autotests/widgets-browser/widget-destroy-legacy/test.js diff --git a/widgets/test/autotests-browser/widget-destroy-legacy/widget.js b/test/autotests/widgets-browser/widget-destroy-legacy/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-legacy/widget.js rename to test/autotests/widgets-browser/widget-destroy-legacy/widget.js diff --git a/widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/renderer.js b/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/renderer.js rename to test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/renderer.js diff --git a/widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/template.marko b/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/template.marko rename to test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/widget.js b/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/components/app-legacy-button/widget.js rename to test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/widget.js diff --git a/widgets/test/autotests-browser/widget-destroy-ref/index.js b/test/autotests/widgets-browser/widget-destroy-ref/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-destroy-ref/index.js rename to test/autotests/widgets-browser/widget-destroy-ref/index.js index 4f76a7820..2a02d00dc 100644 --- a/widgets/test/autotests-browser/widget-destroy-ref/index.js +++ b/test/autotests/widgets-browser/widget-destroy-ref/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-destroy-ref/marko.json b/test/autotests/widgets-browser/widget-destroy-ref/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/marko.json rename to test/autotests/widgets-browser/widget-destroy-ref/marko.json diff --git a/widgets/test/autotests-browser/widget-destroy-ref/template.marko b/test/autotests/widgets-browser/widget-destroy-ref/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/template.marko rename to test/autotests/widgets-browser/widget-destroy-ref/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-ref/test.js b/test/autotests/widgets-browser/widget-destroy-ref/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-ref/test.js rename to test/autotests/widgets-browser/widget-destroy-ref/test.js diff --git a/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/template.marko b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/template.marko rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/index.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/index.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/index.js index 4f76a7820..2a02d00dc 100644 --- a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/index.js +++ b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/marko.json b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/marko.json rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/marko.json diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/template.marko b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/template.marko rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/test.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-custom-events/test.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/test.js diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/index.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/index.js similarity index 91% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/index.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/index.js index ee3215f01..11e890038 100644 --- a/widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/index.js +++ b/test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/index.js @@ -1,6 +1,6 @@ var expect = require('chai').expect; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/template.marko b/test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/template.marko rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/test.js b/test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-destroy-unsubscribe-dom-events/test.js rename to test/autotests/widgets-browser/widget-destroy-unsubscribe-dom-events/test.js diff --git a/widgets/test/autotests-browser/widget-destroy/components/app-simple/index.js b/test/autotests/widgets-browser/widget-destroy/components/app-simple/index.js similarity index 75% rename from widgets/test/autotests-browser/widget-destroy/components/app-simple/index.js rename to test/autotests/widgets-browser/widget-destroy/components/app-simple/index.js index 25ddddf5d..7ef4c4459 100644 --- a/widgets/test/autotests-browser/widget-destroy/components/app-simple/index.js +++ b/test/autotests/widgets-browser/widget-destroy/components/app-simple/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-destroy/components/app-simple/template.marko b/test/autotests/widgets-browser/widget-destroy/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy/components/app-simple/template.marko rename to test/autotests/widgets-browser/widget-destroy/components/app-simple/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy/index.js b/test/autotests/widgets-browser/widget-destroy/index.js similarity index 75% rename from widgets/test/autotests-browser/widget-destroy/index.js rename to test/autotests/widgets-browser/widget-destroy/index.js index 6704f5d71..807f10ddf 100644 --- a/widgets/test/autotests-browser/widget-destroy/index.js +++ b/test/autotests/widgets-browser/widget-destroy/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-destroy/marko.json b/test/autotests/widgets-browser/widget-destroy/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-destroy/marko.json rename to test/autotests/widgets-browser/widget-destroy/marko.json diff --git a/widgets/test/autotests-browser/widget-destroy/template.marko b/test/autotests/widgets-browser/widget-destroy/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-destroy/template.marko rename to test/autotests/widgets-browser/widget-destroy/template.marko diff --git a/widgets/test/autotests-browser/widget-destroy/test.js b/test/autotests/widgets-browser/widget-destroy/test.js similarity index 90% rename from widgets/test/autotests-browser/widget-destroy/test.js rename to test/autotests/widgets-browser/widget-destroy/test.js index 2f5d61b40..dccbc7210 100644 --- a/widgets/test/autotests-browser/widget-destroy/test.js +++ b/test/autotests/widgets-browser/widget-destroy/test.js @@ -14,7 +14,7 @@ module.exports = function(helpers) { expect(simple != null).to.equal(true); - require('marko-widgets').batchUpdate(function() { // Force the HTML update to be immediate + require('marko/widgets').batchUpdate(function() { // Force the HTML update to be immediate widget.setProps({ showSimple: false }); diff --git a/widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js b/test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js similarity index 80% rename from widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js rename to test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js index 5952a5f41..9eee14e42 100644 --- a/widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js +++ b/test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/template.marko b/test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/template.marko rename to test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/template.marko diff --git a/widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js b/test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js rename to test/autotests/widgets-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js diff --git a/test/autotests/widgets-browser/widget-dom-events-jquery/index.js b/test/autotests/widgets-browser/widget-dom-events-jquery/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-dom-events-jquery/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-dom-events-jquery/renderer.js b/test/autotests/widgets-browser/widget-dom-events-jquery/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events-jquery/renderer.js rename to test/autotests/widgets-browser/widget-dom-events-jquery/renderer.js diff --git a/widgets/test/autotests-browser/widget-dom-events-jquery/template.marko b/test/autotests/widgets-browser/widget-dom-events-jquery/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events-jquery/template.marko rename to test/autotests/widgets-browser/widget-dom-events-jquery/template.marko diff --git a/widgets/test/autotests-browser/widget-dom-events-jquery/test.js b/test/autotests/widgets-browser/widget-dom-events-jquery/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events-jquery/test.js rename to test/autotests/widgets-browser/widget-dom-events-jquery/test.js diff --git a/widgets/test/autotests-browser/widget-dom-events-jquery/widget.js b/test/autotests/widgets-browser/widget-dom-events-jquery/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events-jquery/widget.js rename to test/autotests/widgets-browser/widget-dom-events-jquery/widget.js diff --git a/widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/renderer.js b/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/renderer.js rename to test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/renderer.js diff --git a/widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/template.marko b/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/template.marko rename to test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/template.marko diff --git a/widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/widget.js b/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/components/app-legacy-button/widget.js rename to test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/widget.js diff --git a/test/autotests/widgets-browser/widget-dom-events/index.js b/test/autotests/widgets-browser/widget-dom-events/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-dom-events/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-dom-events/marko.json b/test/autotests/widgets-browser/widget-dom-events/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/marko.json rename to test/autotests/widgets-browser/widget-dom-events/marko.json diff --git a/widgets/test/autotests-browser/widget-dom-events/renderer.js b/test/autotests/widgets-browser/widget-dom-events/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/renderer.js rename to test/autotests/widgets-browser/widget-dom-events/renderer.js diff --git a/widgets/test/autotests-browser/widget-dom-events/template.marko b/test/autotests/widgets-browser/widget-dom-events/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/template.marko rename to test/autotests/widgets-browser/widget-dom-events/template.marko diff --git a/widgets/test/autotests-browser/widget-dom-events/test.js b/test/autotests/widgets-browser/widget-dom-events/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/test.js rename to test/autotests/widgets-browser/widget-dom-events/test.js diff --git a/widgets/test/autotests-browser/widget-dom-events/widget.js b/test/autotests/widgets-browser/widget-dom-events/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-dom-events/widget.js rename to test/autotests/widgets-browser/widget-dom-events/widget.js diff --git a/test/autotests/widgets-browser/widget-dynamic-tag-name/index.js b/test/autotests/widgets-browser/widget-dynamic-tag-name/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-dynamic-tag-name/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-dynamic-tag-name/template.marko b/test/autotests/widgets-browser/widget-dynamic-tag-name/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-dynamic-tag-name/template.marko rename to test/autotests/widgets-browser/widget-dynamic-tag-name/template.marko diff --git a/widgets/test/autotests-browser/widget-dynamic-tag-name/test.js b/test/autotests/widgets-browser/widget-dynamic-tag-name/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-dynamic-tag-name/test.js rename to test/autotests/widgets-browser/widget-dynamic-tag-name/test.js diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/index.js b/test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/index.js similarity index 78% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/index.js rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/index.js index ada4aec51..164e3a845 100644 --- a/widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/index.js +++ b/test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/template.marko b/test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/template.marko rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/template.marko diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/test.js b/test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-bubbles/test.js rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-bubbles/test.js diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/index.js b/test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/index.js similarity index 79% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/index.js rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/index.js index d18458de5..856333a58 100644 --- a/widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/index.js +++ b/test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/template.marko b/test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/template.marko rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/template.marko diff --git a/widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/test.js b/test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-conditional-direct/test.js rename to test/autotests/widgets-browser/widget-event-handler-method-conditional-direct/test.js diff --git a/widgets/test/autotests-browser/widget-event-handler-method-dynamic/index.js b/test/autotests/widgets-browser/widget-event-handler-method-dynamic/index.js similarity index 84% rename from widgets/test/autotests-browser/widget-event-handler-method-dynamic/index.js rename to test/autotests/widgets-browser/widget-event-handler-method-dynamic/index.js index 7531f79f7..709464633 100644 --- a/widgets/test/autotests-browser/widget-event-handler-method-dynamic/index.js +++ b/test/autotests/widgets-browser/widget-event-handler-method-dynamic/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-event-handler-method-dynamic/template.marko b/test/autotests/widgets-browser/widget-event-handler-method-dynamic/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-dynamic/template.marko rename to test/autotests/widgets-browser/widget-event-handler-method-dynamic/template.marko diff --git a/widgets/test/autotests-browser/widget-event-handler-method-dynamic/test.js b/test/autotests/widgets-browser/widget-event-handler-method-dynamic/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-event-handler-method-dynamic/test.js rename to test/autotests/widgets-browser/widget-event-handler-method-dynamic/test.js diff --git a/test/autotests/widgets-browser/widget-extend/components/app-extend-button/index.js b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-extend/components/app-extend-button/marko-tag.json b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-extend/components/app-extend-button/marko-tag.json rename to test/autotests/widgets-browser/widget-extend/components/app-extend-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-extend/components/app-extend-button/renderer.js b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-extend/components/app-extend-button/renderer.js rename to test/autotests/widgets-browser/widget-extend/components/app-extend-button/renderer.js diff --git a/widgets/test/autotests-browser/widget-extend/components/app-extend-button/template.marko b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-extend/components/app-extend-button/template.marko rename to test/autotests/widgets-browser/widget-extend/components/app-extend-button/template.marko diff --git a/widgets/test/autotests-browser/widget-extend/components/app-extend-button/widget.js b/test/autotests/widgets-browser/widget-extend/components/app-extend-button/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-extend/components/app-extend-button/widget.js rename to test/autotests/widgets-browser/widget-extend/components/app-extend-button/widget.js diff --git a/test/autotests/widgets-browser/widget-extend/index.js b/test/autotests/widgets-browser/widget-extend/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-extend/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-extend/marko.json b/test/autotests/widgets-browser/widget-extend/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-extend/marko.json rename to test/autotests/widgets-browser/widget-extend/marko.json diff --git a/widgets/test/autotests-browser/widget-extend/renderer.js b/test/autotests/widgets-browser/widget-extend/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-extend/renderer.js rename to test/autotests/widgets-browser/widget-extend/renderer.js diff --git a/widgets/test/autotests-browser/widget-extend/template.marko b/test/autotests/widgets-browser/widget-extend/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-extend/template.marko rename to test/autotests/widgets-browser/widget-extend/template.marko diff --git a/widgets/test/autotests-browser/widget-extend/test.js b/test/autotests/widgets-browser/widget-extend/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-extend/test.js rename to test/autotests/widgets-browser/widget-extend/test.js diff --git a/widgets/test/autotests-browser/widget-extend/widget.js b/test/autotests/widgets-browser/widget-extend/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-extend/widget.js rename to test/autotests/widgets-browser/widget-extend/widget.js diff --git a/test/autotests/widgets-browser/widget-extends-EventEmitter/index.js b/test/autotests/widgets-browser/widget-extends-EventEmitter/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-extends-EventEmitter/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-extends-EventEmitter/template.marko b/test/autotests/widgets-browser/widget-extends-EventEmitter/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-extends-EventEmitter/template.marko rename to test/autotests/widgets-browser/widget-extends-EventEmitter/template.marko diff --git a/widgets/test/autotests-browser/widget-extends-EventEmitter/test.js b/test/autotests/widgets-browser/widget-extends-EventEmitter/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-extends-EventEmitter/test.js rename to test/autotests/widgets-browser/widget-extends-EventEmitter/test.js diff --git a/test/autotests/widgets-browser/widget-getEl/index.js b/test/autotests/widgets-browser/widget-getEl/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-getEl/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-getEl/template.marko b/test/autotests/widgets-browser/widget-getEl/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getEl/template.marko rename to test/autotests/widgets-browser/widget-getEl/template.marko diff --git a/widgets/test/autotests-browser/widget-getEl/test.js b/test/autotests/widgets-browser/widget-getEl/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getEl/test.js rename to test/autotests/widgets-browser/widget-getEl/test.js diff --git a/test/autotests/widgets-browser/widget-getEls/index.js b/test/autotests/widgets-browser/widget-getEls/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-getEls/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-getEls/template.marko b/test/autotests/widgets-browser/widget-getEls/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getEls/template.marko rename to test/autotests/widgets-browser/widget-getEls/template.marko diff --git a/widgets/test/autotests-browser/widget-getEls/test.js b/test/autotests/widgets-browser/widget-getEls/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getEls/test.js rename to test/autotests/widgets-browser/widget-getEls/test.js diff --git a/widgets/test/autotests-browser/widget-getInitialProps/index.js b/test/autotests/widgets-browser/widget-getInitialProps/index.js similarity index 76% rename from widgets/test/autotests-browser/widget-getInitialProps/index.js rename to test/autotests/widgets-browser/widget-getInitialProps/index.js index a7d856b0a..9f617b415 100644 --- a/widgets/test/autotests-browser/widget-getInitialProps/index.js +++ b/test/autotests/widgets-browser/widget-getInitialProps/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialProps: function(input, out) { var name = input.name; diff --git a/widgets/test/autotests-browser/widget-getInitialProps/template.marko b/test/autotests/widgets-browser/widget-getInitialProps/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getInitialProps/template.marko rename to test/autotests/widgets-browser/widget-getInitialProps/template.marko diff --git a/widgets/test/autotests-browser/widget-getInitialProps/test.js b/test/autotests/widgets-browser/widget-getInitialProps/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getInitialProps/test.js rename to test/autotests/widgets-browser/widget-getInitialProps/test.js diff --git a/widgets/test/autotests-browser/widget-getWidget/components/app-foo/index.js b/test/autotests/widgets-browser/widget-getWidget/components/app-foo/index.js similarity index 64% rename from widgets/test/autotests-browser/widget-getWidget/components/app-foo/index.js rename to test/autotests/widgets-browser/widget-getWidget/components/app-foo/index.js index 059a454df..456ce731c 100644 --- a/widgets/test/autotests-browser/widget-getWidget/components/app-foo/index.js +++ b/test/autotests/widgets-browser/widget-getWidget/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/widget-getWidget/components/app-foo/template.marko b/test/autotests/widgets-browser/widget-getWidget/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidget/components/app-foo/template.marko rename to test/autotests/widgets-browser/widget-getWidget/components/app-foo/template.marko diff --git a/test/autotests/widgets-browser/widget-getWidget/index.js b/test/autotests/widgets-browser/widget-getWidget/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-getWidget/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-getWidget/marko.json b/test/autotests/widgets-browser/widget-getWidget/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-getWidget/marko.json rename to test/autotests/widgets-browser/widget-getWidget/marko.json diff --git a/widgets/test/autotests-browser/widget-getWidget/template.marko b/test/autotests/widgets-browser/widget-getWidget/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidget/template.marko rename to test/autotests/widgets-browser/widget-getWidget/template.marko diff --git a/widgets/test/autotests-browser/widget-getWidget/test.js b/test/autotests/widgets-browser/widget-getWidget/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getWidget/test.js rename to test/autotests/widgets-browser/widget-getWidget/test.js diff --git a/widgets/test/autotests-browser/widget-getWidgets-multiple/components/app-foo/index.js b/test/autotests/widgets-browser/widget-getWidgets-multiple/components/app-foo/index.js similarity index 79% rename from widgets/test/autotests-browser/widget-getWidgets-multiple/components/app-foo/index.js rename to test/autotests/widgets-browser/widget-getWidgets-multiple/components/app-foo/index.js index c1997a7d9..3418331fb 100644 --- a/widgets/test/autotests-browser/widget-getWidgets-multiple/components/app-foo/index.js +++ b/test/autotests/widgets-browser/widget-getWidgets-multiple/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function(widgetConfig) { diff --git a/widgets/test/autotests-browser/widget-getWidgets-multiple/components/app-foo/template.marko b/test/autotests/widgets-browser/widget-getWidgets-multiple/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-multiple/components/app-foo/template.marko rename to test/autotests/widgets-browser/widget-getWidgets-multiple/components/app-foo/template.marko diff --git a/test/autotests/widgets-browser/widget-getWidgets-multiple/index.js b/test/autotests/widgets-browser/widget-getWidgets-multiple/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-getWidgets-multiple/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-getWidgets-multiple/marko.json b/test/autotests/widgets-browser/widget-getWidgets-multiple/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-multiple/marko.json rename to test/autotests/widgets-browser/widget-getWidgets-multiple/marko.json diff --git a/widgets/test/autotests-browser/widget-getWidgets-multiple/template.marko b/test/autotests/widgets-browser/widget-getWidgets-multiple/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-multiple/template.marko rename to test/autotests/widgets-browser/widget-getWidgets-multiple/template.marko diff --git a/widgets/test/autotests-browser/widget-getWidgets-multiple/test.js b/test/autotests/widgets-browser/widget-getWidgets-multiple/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-multiple/test.js rename to test/autotests/widgets-browser/widget-getWidgets-multiple/test.js diff --git a/widgets/test/autotests-browser/widget-getWidgets-single/components/app-foo/index.js b/test/autotests/widgets-browser/widget-getWidgets-single/components/app-foo/index.js similarity index 64% rename from widgets/test/autotests-browser/widget-getWidgets-single/components/app-foo/index.js rename to test/autotests/widgets-browser/widget-getWidgets-single/components/app-foo/index.js index 059a454df..456ce731c 100644 --- a/widgets/test/autotests-browser/widget-getWidgets-single/components/app-foo/index.js +++ b/test/autotests/widgets-browser/widget-getWidgets-single/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-browser/widget-getWidgets-single/components/app-foo/template.marko b/test/autotests/widgets-browser/widget-getWidgets-single/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-single/components/app-foo/template.marko rename to test/autotests/widgets-browser/widget-getWidgets-single/components/app-foo/template.marko diff --git a/test/autotests/widgets-browser/widget-getWidgets-single/index.js b/test/autotests/widgets-browser/widget-getWidgets-single/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-getWidgets-single/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-getWidgets-single/marko.json b/test/autotests/widgets-browser/widget-getWidgets-single/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-single/marko.json rename to test/autotests/widgets-browser/widget-getWidgets-single/marko.json diff --git a/widgets/test/autotests-browser/widget-getWidgets-single/template.marko b/test/autotests/widgets-browser/widget-getWidgets-single/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-single/template.marko rename to test/autotests/widgets-browser/widget-getWidgets-single/template.marko diff --git a/widgets/test/autotests-browser/widget-getWidgets-single/test.js b/test/autotests/widgets-browser/widget-getWidgets-single/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-getWidgets-single/test.js rename to test/autotests/widgets-browser/widget-getWidgets-single/test.js diff --git a/widgets/test/autotests-browser/widget-invalid-proto-render/test.js b/test/autotests/widgets-browser/widget-invalid-proto-render/test.js similarity index 83% rename from widgets/test/autotests-browser/widget-invalid-proto-render/test.js rename to test/autotests/widgets-browser/widget-invalid-proto-render/test.js index 1f0b513e6..3a9920c5e 100644 --- a/widgets/test/autotests-browser/widget-invalid-proto-render/test.js +++ b/test/autotests/widgets-browser/widget-invalid-proto-render/test.js @@ -2,7 +2,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { expect(function() { - var markoWidgetsRegistry = require('marko-widgets/src/registry'); + var markoWidgetsRegistry = require('marko/widgets/registry'); var widgetWithRender = require('./widget'); var typePath = 'widgetWithRender'; markoWidgetsRegistry.register(typePath, widgetWithRender); diff --git a/widgets/test/autotests-browser/widget-invalid-proto-render/widget.js b/test/autotests/widgets-browser/widget-invalid-proto-render/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-invalid-proto-render/widget.js rename to test/autotests/widgets-browser/widget-invalid-proto-render/widget.js diff --git a/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/index.js b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/template.marko b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/template.marko rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/template.marko diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/widget.js b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/components/app-bar/widget.js rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/components/app-bar/widget.js diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/index.js b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/index.js similarity index 81% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/index.js rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/index.js index 709de657a..0029c9f3a 100644 --- a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/index.js +++ b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/index.js @@ -1,6 +1,6 @@ var barRenderer = require('./components/app-bar/renderer').render; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getTemplateData: function(input, out) { return { diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/template.marko b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/template.marko rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/template.marko diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/test.js b/test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id-dynamic/test.js rename to test/autotests/widgets-browser/widget-invoke-widget-id-dynamic/test.js diff --git a/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/index.js b/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/renderer.js b/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/renderer.js rename to test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/renderer.js diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/template.marko b/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/template.marko rename to test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/template.marko diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/widget.js b/test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id/components/app-bar/widget.js rename to test/autotests/widgets-browser/widget-invoke-widget-id/components/app-bar/widget.js diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/index.js b/test/autotests/widgets-browser/widget-invoke-widget-id/index.js similarity index 79% rename from widgets/test/autotests-browser/widget-invoke-widget-id/index.js rename to test/autotests/widgets-browser/widget-invoke-widget-id/index.js index eda927723..dfcdecbd0 100644 --- a/widgets/test/autotests-browser/widget-invoke-widget-id/index.js +++ b/test/autotests/widgets-browser/widget-invoke-widget-id/index.js @@ -1,6 +1,6 @@ var barRenderer = require('./components/app-bar/renderer').render; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getTemplateData: function(input, out) { return { diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/template.marko b/test/autotests/widgets-browser/widget-invoke-widget-id/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id/template.marko rename to test/autotests/widgets-browser/widget-invoke-widget-id/template.marko diff --git a/widgets/test/autotests-browser/widget-invoke-widget-id/test.js b/test/autotests/widgets-browser/widget-invoke-widget-id/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-invoke-widget-id/test.js rename to test/autotests/widgets-browser/widget-invoke-widget-id/test.js diff --git a/test/autotests/widgets-browser/widget-jQuery-proxy/index.js b/test/autotests/widgets-browser/widget-jQuery-proxy/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-jQuery-proxy/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-jQuery-proxy/template.marko b/test/autotests/widgets-browser/widget-jQuery-proxy/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-jQuery-proxy/template.marko rename to test/autotests/widgets-browser/widget-jQuery-proxy/template.marko diff --git a/widgets/test/autotests-browser/widget-jQuery-proxy/test.js b/test/autotests/widgets-browser/widget-jQuery-proxy/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-jQuery-proxy/test.js rename to test/autotests/widgets-browser/widget-jQuery-proxy/test.js diff --git a/test/autotests/widgets-browser/widget-label-for/index.js b/test/autotests/widgets-browser/widget-label-for/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-label-for/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-label-for/template.marko b/test/autotests/widgets-browser/widget-label-for/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-label-for/template.marko rename to test/autotests/widgets-browser/widget-label-for/template.marko diff --git a/widgets/test/autotests-browser/widget-label-for/test.js b/test/autotests/widgets-browser/widget-label-for/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-label-for/test.js rename to test/autotests/widgets-browser/widget-label-for/test.js diff --git a/test/autotests/widgets-browser/widget-legacy-render-same-id/index.js b/test/autotests/widgets-browser/widget-legacy-render-same-id/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-legacy-render-same-id/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-legacy-render-same-id/renderer.js b/test/autotests/widgets-browser/widget-legacy-render-same-id/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-render-same-id/renderer.js rename to test/autotests/widgets-browser/widget-legacy-render-same-id/renderer.js diff --git a/widgets/test/autotests-browser/widget-legacy-render-same-id/template.marko b/test/autotests/widgets-browser/widget-legacy-render-same-id/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-render-same-id/template.marko rename to test/autotests/widgets-browser/widget-legacy-render-same-id/template.marko diff --git a/widgets/test/autotests-browser/widget-legacy-render-same-id/test.js b/test/autotests/widgets-browser/widget-legacy-render-same-id/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-render-same-id/test.js rename to test/autotests/widgets-browser/widget-legacy-render-same-id/test.js diff --git a/widgets/test/autotests-browser/widget-legacy-render-same-id/widget.js b/test/autotests/widgets-browser/widget-legacy-render-same-id/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-render-same-id/widget.js rename to test/autotests/widgets-browser/widget-legacy-render-same-id/widget.js diff --git a/test/autotests/widgets-browser/widget-legacy-rerender/index.js b/test/autotests/widgets-browser/widget-legacy-rerender/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-legacy-rerender/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-legacy-rerender/renderer.js b/test/autotests/widgets-browser/widget-legacy-rerender/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-rerender/renderer.js rename to test/autotests/widgets-browser/widget-legacy-rerender/renderer.js diff --git a/widgets/test/autotests-browser/widget-legacy-rerender/template.marko b/test/autotests/widgets-browser/widget-legacy-rerender/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-rerender/template.marko rename to test/autotests/widgets-browser/widget-legacy-rerender/template.marko diff --git a/widgets/test/autotests-browser/widget-legacy-rerender/test.js b/test/autotests/widgets-browser/widget-legacy-rerender/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-rerender/test.js rename to test/autotests/widgets-browser/widget-legacy-rerender/test.js diff --git a/widgets/test/autotests-browser/widget-legacy-rerender/widget.js b/test/autotests/widgets-browser/widget-legacy-rerender/widget.js similarity index 100% rename from widgets/test/autotests-browser/widget-legacy-rerender/widget.js rename to test/autotests/widgets-browser/widget-legacy-rerender/widget.js diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js similarity index 95% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js index 94f47e1d6..95d863860 100644 --- a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js +++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/template.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/template.marko rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/template.marko diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/index.js b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.js similarity index 95% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/index.js rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.js index 1b1eeedf1..1061cb75d 100644 --- a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/index.js +++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/marko.json b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/marko.json rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/marko.json diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/template.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/template.marko rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/template.marko diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/test.js b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/test.js similarity index 97% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateful/test.js rename to test/autotests/widgets-browser/widget-lifecycle-events-stateful/test.js index ae6fc972d..ae89c5ec2 100644 --- a/widgets/test/autotests-browser/widget-lifecycle-events-stateful/test.js +++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/test.js @@ -30,7 +30,7 @@ module.exports = function(helpers) { 'init', 'onRender:firstRender']); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { // NOTE: messageCount has an update handler widget.setState('messageCount', 999); expect(targetEl.innerHTML).to.contain('Hello Frank!'); @@ -60,7 +60,7 @@ module.exports = function(helpers) { 'init', 'onRender:firstRender']); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { // NOTE: name does *not* have an update handler widget.setState('name', 'Jane'); expect(targetEl.innerHTML).to.contain('Hello Frank!'); diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateless/index.js b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.js similarity index 93% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateless/index.js rename to test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.js index ced76bbeb..ab6750cb8 100644 --- a/widgets/test/autotests-browser/widget-lifecycle-events-stateless/index.js +++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateless/template.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateless/template.marko rename to test/autotests/widgets-browser/widget-lifecycle-events-stateless/template.marko diff --git a/widgets/test/autotests-browser/widget-lifecycle-events-stateless/test.js b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/test.js similarity index 95% rename from widgets/test/autotests-browser/widget-lifecycle-events-stateless/test.js rename to test/autotests/widgets-browser/widget-lifecycle-events-stateless/test.js index 274c7f9ef..7d707746d 100644 --- a/widgets/test/autotests-browser/widget-lifecycle-events-stateless/test.js +++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/test.js @@ -15,7 +15,7 @@ module.exports = function(helpers) { 'onRender:firstRender' ]); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setProps({ name: 'Jane', messageCount: 30 diff --git a/test/autotests/widgets-browser/widget-multiple-binds-in-template/index.js b/test/autotests/widgets-browser/widget-multiple-binds-in-template/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-browser/widget-multiple-binds-in-template/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-multiple-binds-in-template/renderer.js b/test/autotests/widgets-browser/widget-multiple-binds-in-template/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-multiple-binds-in-template/renderer.js rename to test/autotests/widgets-browser/widget-multiple-binds-in-template/renderer.js diff --git a/widgets/test/autotests-browser/widget-multiple-binds-in-template/template.marko b/test/autotests/widgets-browser/widget-multiple-binds-in-template/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-multiple-binds-in-template/template.marko rename to test/autotests/widgets-browser/widget-multiple-binds-in-template/template.marko diff --git a/widgets/test/autotests-browser/widget-multiple-binds-in-template/test.js b/test/autotests/widgets-browser/widget-multiple-binds-in-template/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-multiple-binds-in-template/test.js rename to test/autotests/widgets-browser/widget-multiple-binds-in-template/test.js diff --git a/widgets/test/autotests-browser/widget-multiple-binds-in-template/widget-bar.js b/test/autotests/widgets-browser/widget-multiple-binds-in-template/widget-bar.js similarity index 100% rename from widgets/test/autotests-browser/widget-multiple-binds-in-template/widget-bar.js rename to test/autotests/widgets-browser/widget-multiple-binds-in-template/widget-bar.js diff --git a/widgets/test/autotests-browser/widget-multiple-binds-in-template/widget-foo.js b/test/autotests/widgets-browser/widget-multiple-binds-in-template/widget-foo.js similarity index 100% rename from widgets/test/autotests-browser/widget-multiple-binds-in-template/widget-foo.js rename to test/autotests/widgets-browser/widget-multiple-binds-in-template/widget-foo.js diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/index.js b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js similarity index 88% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/index.js rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js index c61924463..15d2424bb 100644 --- a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/index.js +++ b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState:function(input){ diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/template.marko b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/template.marko rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.js similarity index 88% rename from widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.js index c61924463..15d2424bb 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js +++ b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState:function(input){ diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/template.marko b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/template.marko rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/test.js b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/test.js similarity index 93% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/test.js rename to test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/test.js index 346f73393..0d43f2de5 100644 --- a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered/test.js +++ b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/test.js @@ -14,7 +14,7 @@ module.exports = function(helpers) { expect(widget.state.name).to.equal('Frank'); expect(widget.state.count).to.equal(30); - require('marko-widgets').batchUpdate(function() { // Force the HTML update to be immediate + require('marko/widgets').batchUpdate(function() { // Force the HTML update to be immediate widget.setState('name', 'John'); }); diff --git a/widgets/test/autotests-browser/widget-preserve-dom-attrs/index.js b/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.js similarity index 82% rename from widgets/test/autotests-browser/widget-preserve-dom-attrs/index.js rename to test/autotests/widgets-browser/widget-preserve-dom-attrs/index.js index 1eaf84411..5136d49c8 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-attrs/index.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.js @@ -1,6 +1,6 @@ var expect = require('chai').expect; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { }, diff --git a/widgets/test/autotests-browser/widget-preserve-dom-attrs/template.marko b/test/autotests/widgets-browser/widget-preserve-dom-attrs/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-attrs/template.marko rename to test/autotests/widgets-browser/widget-preserve-dom-attrs/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-dom-attrs/test.js b/test/autotests/widgets-browser/widget-preserve-dom-attrs/test.js similarity index 94% rename from widgets/test/autotests-browser/widget-preserve-dom-attrs/test.js rename to test/autotests/widgets-browser/widget-preserve-dom-attrs/test.js index 9303571af..383878015 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-attrs/test.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-attrs/test.js @@ -13,7 +13,7 @@ module.exports = function(helpers) { widget.getEl('hello2').removeAttribute('class'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setState('name', 'Frank'); }); diff --git a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js b/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js similarity index 88% rename from widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js rename to test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js index c61924463..15d2424bb 100644 --- a/widgets/test/autotests-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState:function(input){ diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender/template.marko b/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-if/components/app-stateful-rerender/template.marko rename to test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/index.js b/test/autotests/widgets-browser/widget-preserve-dom-if/index.js similarity index 80% rename from widgets/test/autotests-browser/widget-preserve-dom-if/index.js rename to test/autotests/widgets-browser/widget-preserve-dom-if/index.js index 53a089e30..1e1be89d6 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-if/index.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-if/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getTemplateData: function(state, input) { return { diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/marko.json b/test/autotests/widgets-browser/widget-preserve-dom-if/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-if/marko.json rename to test/autotests/widgets-browser/widget-preserve-dom-if/marko.json diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/template.marko b/test/autotests/widgets-browser/widget-preserve-dom-if/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-if/template.marko rename to test/autotests/widgets-browser/widget-preserve-dom-if/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-dom-if/test.js b/test/autotests/widgets-browser/widget-preserve-dom-if/test.js similarity index 95% rename from widgets/test/autotests-browser/widget-preserve-dom-if/test.js rename to test/autotests/widgets-browser/widget-preserve-dom-if/test.js index 71a305a51..0aa3f7789 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-if/test.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-if/test.js @@ -18,13 +18,13 @@ module.exports = function(helpers) { preserveClassBody: widget.el.querySelector('.preserve').innerHTML, preserveBodyClass: widget.el.querySelector('.preserve-body').getAttribute('data-renderId'), preserveBodyClassBody: widget.el.querySelector('.preserve-body').innerHTML, - widgetClass: require('marko-widgets').getWidgetForEl(widget.el.querySelector('.widget-no-id')).state.name + widgetClass: require('marko/widgets').getWidgetForEl(widget.el.querySelector('.widget-no-id')).state.name }; } var renderId = 10; - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.rerender({ preserveCondition: true, renderId: renderId @@ -63,7 +63,7 @@ module.exports = function(helpers) { renderId = 100; // Do not preserve - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.rerender({ preserveCondition: false, renderId: renderId diff --git a/widgets/test/autotests-browser/widget-preserve-dom-repeated/index.js b/test/autotests/widgets-browser/widget-preserve-dom-repeated/index.js similarity index 55% rename from widgets/test/autotests-browser/widget-preserve-dom-repeated/index.js rename to test/autotests/widgets-browser/widget-preserve-dom-repeated/index.js index 96d3241ef..673631d43 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-repeated/index.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-repeated/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { } diff --git a/widgets/test/autotests-browser/widget-preserve-dom-repeated/template.marko b/test/autotests/widgets-browser/widget-preserve-dom-repeated/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-repeated/template.marko rename to test/autotests/widgets-browser/widget-preserve-dom-repeated/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-dom-repeated/test.js b/test/autotests/widgets-browser/widget-preserve-dom-repeated/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-repeated/test.js rename to test/autotests/widgets-browser/widget-preserve-dom-repeated/test.js diff --git a/widgets/test/autotests-browser/widget-preserve-dom-root/index.js b/test/autotests/widgets-browser/widget-preserve-dom-root/index.js similarity index 85% rename from widgets/test/autotests-browser/widget-preserve-dom-root/index.js rename to test/autotests/widgets-browser/widget-preserve-dom-root/index.js index 61c36a841..1281a9499 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-root/index.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-root/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { diff --git a/widgets/test/autotests-browser/widget-preserve-dom-root/template.marko b/test/autotests/widgets-browser/widget-preserve-dom-root/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-preserve-dom-root/template.marko rename to test/autotests/widgets-browser/widget-preserve-dom-root/template.marko diff --git a/widgets/test/autotests-browser/widget-preserve-dom-root/test.js b/test/autotests/widgets-browser/widget-preserve-dom-root/test.js similarity index 89% rename from widgets/test/autotests-browser/widget-preserve-dom-root/test.js rename to test/autotests/widgets-browser/widget-preserve-dom-root/test.js index ac8b4aef1..1df4f2ba5 100644 --- a/widgets/test/autotests-browser/widget-preserve-dom-root/test.js +++ b/test/autotests/widgets-browser/widget-preserve-dom-root/test.js @@ -9,7 +9,7 @@ module.exports = function(helpers) { expect(widget.el.innerHTML).to.contain('Frank'); expect(widget.el.innerHTML).to.contain('30'); - require('marko-widgets').batchUpdate(function() { // Force the HTML update to be immediate + require('marko/widgets').batchUpdate(function() { // Force the HTML update to be immediate widget.setName('John'); }); diff --git a/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/index.js b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/index.js new file mode 100644 index 000000000..2156ebf87 --- /dev/null +++ b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/index.js @@ -0,0 +1,3 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko') +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-content/template.marko b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-content/template.marko rename to test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-content/template.marko diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js similarity index 65% rename from widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js rename to test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js index e82352315..80428bb1f 100644 --- a/widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js +++ b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-more-content/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getValue: function() { diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-more-content/template.marko b/test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-more-content/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-render-to-iframe/components/app-iframe-more-content/template.marko rename to test/autotests/widgets-browser/widget-render-to-iframe/components/app-iframe-more-content/template.marko diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/index.js b/test/autotests/widgets-browser/widget-render-to-iframe/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-render-to-iframe/index.js rename to test/autotests/widgets-browser/widget-render-to-iframe/index.js index c5c36a720..a3818f3a1 100644 --- a/widgets/test/autotests-browser/widget-render-to-iframe/index.js +++ b/test/autotests/widgets-browser/widget-render-to-iframe/index.js @@ -1,6 +1,6 @@ var iframeContentComponent = require('./components/app-iframe-content'); -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), renderIntoIframe: function() { diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/marko.json b/test/autotests/widgets-browser/widget-render-to-iframe/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-render-to-iframe/marko.json rename to test/autotests/widgets-browser/widget-render-to-iframe/marko.json diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/template.marko b/test/autotests/widgets-browser/widget-render-to-iframe/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-render-to-iframe/template.marko rename to test/autotests/widgets-browser/widget-render-to-iframe/template.marko diff --git a/widgets/test/autotests-browser/widget-render-to-iframe/test.js b/test/autotests/widgets-browser/widget-render-to-iframe/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-render-to-iframe/test.js rename to test/autotests/widgets-browser/widget-render-to-iframe/test.js diff --git a/widgets/test/autotests-browser/widget-renderer-and-template/index.js b/test/autotests/widgets-browser/widget-renderer-and-template/index.js similarity index 84% rename from widgets/test/autotests-browser/widget-renderer-and-template/index.js rename to test/autotests/widgets-browser/widget-renderer-and-template/index.js index 4b98e883d..135335b9e 100644 --- a/widgets/test/autotests-browser/widget-renderer-and-template/index.js +++ b/test/autotests/widgets-browser/widget-renderer-and-template/index.js @@ -1,6 +1,6 @@ var template = require('marko').load(require.resolve('./template.marko')); -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ createOut: template.createOut, renderer: function(input, out) { diff --git a/widgets/test/autotests-browser/widget-renderer-and-template/template.marko b/test/autotests/widgets-browser/widget-renderer-and-template/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-renderer-and-template/template.marko rename to test/autotests/widgets-browser/widget-renderer-and-template/template.marko diff --git a/widgets/test/autotests-browser/widget-renderer-and-template/test.js b/test/autotests/widgets-browser/widget-renderer-and-template/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-renderer-and-template/test.js rename to test/autotests/widgets-browser/widget-renderer-and-template/test.js diff --git a/widgets/test/autotests-browser/widget-renderer-only/index.js b/test/autotests/widgets-browser/widget-renderer-only/index.js similarity index 71% rename from widgets/test/autotests-browser/widget-renderer-only/index.js rename to test/autotests/widgets-browser/widget-renderer-only/index.js index 333356967..3190ca9b4 100644 --- a/widgets/test/autotests-browser/widget-renderer-only/index.js +++ b/test/autotests/widgets-browser/widget-renderer-only/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ createOut: require('marko/html').createOut, renderer: function(input, out) { diff --git a/widgets/test/autotests-browser/widget-renderer-only/test.js b/test/autotests/widgets-browser/widget-renderer-only/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-renderer-only/test.js rename to test/autotests/widgets-browser/widget-renderer-only/test.js diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-simple/index.js b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.js similarity index 75% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-simple/index.js rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.js index 25ddddf5d..7ef4c4459 100644 --- a/widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-simple/index.js +++ b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-simple/template.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-simple/template.marko rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/template.marko diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-widgetless/renderer.js b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/renderer.js similarity index 100% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-widgetless/renderer.js rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/renderer.js diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-widgetless/template.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/components/app-widgetless/template.marko rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/template.marko diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/index.js b/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/index.js rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/index.js index cdcf84310..231b30aa1 100644 --- a/widgets/test/autotests-browser/widget-repeated-id-widgetless/index.js +++ b/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.js @@ -1,7 +1,7 @@ var widgetLessRenderer = require('./components/app-widgetless/renderer'); var simpleRenderer = require('./components/app-simple').renderer; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/template.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/template.marko rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/template.marko diff --git a/widgets/test/autotests-browser/widget-repeated-id-widgetless/test.js b/test/autotests/widgets-browser/widget-repeated-id-widgetless/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-repeated-id-widgetless/test.js rename to test/autotests/widgets-browser/widget-repeated-id-widgetless/test.js diff --git a/widgets/test/autotests-browser/widget-replaceState/index.js b/test/autotests/widgets-browser/widget-replaceState/index.js similarity index 87% rename from widgets/test/autotests-browser/widget-replaceState/index.js rename to test/autotests/widgets-browser/widget-replaceState/index.js index 318ebfb8a..52132137e 100644 --- a/widgets/test/autotests-browser/widget-replaceState/index.js +++ b/test/autotests/widgets-browser/widget-replaceState/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-replaceState/template.marko b/test/autotests/widgets-browser/widget-replaceState/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-replaceState/template.marko rename to test/autotests/widgets-browser/widget-replaceState/template.marko diff --git a/widgets/test/autotests-browser/widget-replaceState/test.js b/test/autotests/widgets-browser/widget-replaceState/test.js similarity index 94% rename from widgets/test/autotests-browser/widget-replaceState/test.js rename to test/autotests/widgets-browser/widget-replaceState/test.js index fe518cd9d..c8fdeea3f 100644 --- a/widgets/test/autotests-browser/widget-replaceState/test.js +++ b/test/autotests/widgets-browser/widget-replaceState/test.js @@ -21,7 +21,7 @@ module.exports = function(helpers) { expect(widget.state.message).to.equal(states.original.message); expect(widget.state.colors).to.deep.equal(states.original.colors); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.replaceState(states.new); }); diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js b/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js similarity index 91% rename from widgets/test/autotests-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js rename to test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js index f7e5831b9..ed4ee210f 100644 --- a/widgets/test/autotests-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js +++ b/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/components/app-rerender-init-order-child/template.marko b/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-init-order/components/app-rerender-init-order-child/template.marko rename to test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/template.marko diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/index.js b/test/autotests/widgets-browser/widget-rerender-init-order/index.js similarity index 87% rename from widgets/test/autotests-browser/widget-rerender-init-order/index.js rename to test/autotests/widgets-browser/widget-rerender-init-order/index.js index 44dffc5f1..70711abdb 100644 --- a/widgets/test/autotests-browser/widget-rerender-init-order/index.js +++ b/test/autotests/widgets-browser/widget-rerender-init-order/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/marko.json b/test/autotests/widgets-browser/widget-rerender-init-order/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-init-order/marko.json rename to test/autotests/widgets-browser/widget-rerender-init-order/marko.json diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/template.marko b/test/autotests/widgets-browser/widget-rerender-init-order/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-init-order/template.marko rename to test/autotests/widgets-browser/widget-rerender-init-order/template.marko diff --git a/widgets/test/autotests-browser/widget-rerender-init-order/test.js b/test/autotests/widgets-browser/widget-rerender-init-order/test.js similarity index 91% rename from widgets/test/autotests-browser/widget-rerender-init-order/test.js rename to test/autotests/widgets-browser/widget-rerender-init-order/test.js index f5df4f549..4f12435ad 100644 --- a/widgets/test/autotests-browser/widget-rerender-init-order/test.js +++ b/test/autotests/widgets-browser/widget-rerender-init-order/test.js @@ -11,7 +11,7 @@ module.exports = function(helpers) { window.rerenderInitOrder = []; - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setState('version', 1); }); diff --git a/widgets/test/autotests-browser/update-manager-next-tick/index.js b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js similarity index 97% rename from widgets/test/autotests-browser/update-manager-next-tick/index.js rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js index 8a579299b..724da4446 100644 --- a/widgets/test/autotests-browser/update-manager-next-tick/index.js +++ b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/components/app-stateful-button/template.marko diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/index.js b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/index.js rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.js index 793f697fa..b4152990a 100644 --- a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/index.js +++ b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/marko.json b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/marko.json rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/marko.json diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/template.marko b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/template.marko rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/template.marko diff --git a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/test.js b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/test.js similarity index 95% rename from widgets/test/autotests-browser/widget-rerender-reuse-stateful/test.js rename to test/autotests/widgets-browser/widget-rerender-reuse-stateful/test.js index f841f69e3..71c4c57f3 100644 --- a/widgets/test/autotests-browser/widget-rerender-reuse-stateful/test.js +++ b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/test.js @@ -14,7 +14,7 @@ module.exports = function(helpers) { var self = widget; - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { self.setButtonSize('small'); self.rerender(); }); diff --git a/widgets/test/autotests-browser/widget-rerender-stateless-new-props/index.js b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.js similarity index 75% rename from widgets/test/autotests-browser/widget-rerender-stateless-new-props/index.js rename to test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.js index 25ddddf5d..7ef4c4459 100644 --- a/widgets/test/autotests-browser/widget-rerender-stateless-new-props/index.js +++ b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-rerender-stateless-new-props/template.marko b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-rerender-stateless-new-props/template.marko rename to test/autotests/widgets-browser/widget-rerender-stateless-new-props/template.marko diff --git a/widgets/test/autotests-browser/widget-rerender-stateless-new-props/test.js b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/test.js similarity index 87% rename from widgets/test/autotests-browser/widget-rerender-stateless-new-props/test.js rename to test/autotests/widgets-browser/widget-rerender-stateless-new-props/test.js index cf41b904e..660c590d8 100644 --- a/widgets/test/autotests-browser/widget-rerender-stateless-new-props/test.js +++ b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/test.js @@ -10,7 +10,7 @@ module.exports = function(helpers) { expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setProps({ name: 'John', messageCount: 20 @@ -19,7 +19,7 @@ module.exports = function(helpers) { expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setProps({ name: 'Jane', messageCount: 30 diff --git a/widgets/test/autotests-browser/widget-setStateDirty/index.js b/test/autotests/widgets-browser/widget-setStateDirty/index.js similarity index 86% rename from widgets/test/autotests-browser/widget-setStateDirty/index.js rename to test/autotests/widgets-browser/widget-setStateDirty/index.js index cb3835ff7..cb0ff6a08 100644 --- a/widgets/test/autotests-browser/widget-setStateDirty/index.js +++ b/test/autotests/widgets-browser/widget-setStateDirty/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-setStateDirty/template.marko b/test/autotests/widgets-browser/widget-setStateDirty/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-setStateDirty/template.marko rename to test/autotests/widgets-browser/widget-setStateDirty/template.marko diff --git a/widgets/test/autotests-browser/widget-setStateDirty/test.js b/test/autotests/widgets-browser/widget-setStateDirty/test.js similarity index 92% rename from widgets/test/autotests-browser/widget-setStateDirty/test.js rename to test/autotests/widgets-browser/widget-setStateDirty/test.js index c652a9589..fd8e209f2 100644 --- a/widgets/test/autotests-browser/widget-setStateDirty/test.js +++ b/test/autotests/widgets-browser/widget-setStateDirty/test.js @@ -9,7 +9,7 @@ module.exports = function(helpers) { expect(widget.el.innerHTML).to.contain('green'); expect(widget.el.innerHTML).to.contain('blue'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { // NOTE: name does *not* have an update handler widget.addColor('orange'); }); diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js similarity index 97% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js index 8a579299b..724da4446 100644 --- a/widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js +++ b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/template.marko diff --git a/test/autotests/widgets-browser/widget-split-into-multiple-templates/index.js b/test/autotests/widgets-browser/widget-split-into-multiple-templates/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-split-into-multiple-templates/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/marko.json b/test/autotests/widgets-browser/widget-split-into-multiple-templates/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/marko.json rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/marko.json diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/template-body.marko b/test/autotests/widgets-browser/widget-split-into-multiple-templates/template-body.marko similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/template-body.marko rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/template-body.marko diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/template.marko b/test/autotests/widgets-browser/widget-split-into-multiple-templates/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/template.marko rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/template.marko diff --git a/widgets/test/autotests-browser/widget-split-into-multiple-templates/test.js b/test/autotests/widgets-browser/widget-split-into-multiple-templates/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-split-into-multiple-templates/test.js rename to test/autotests/widgets-browser/widget-split-into-multiple-templates/test.js diff --git a/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/index.js b/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-copy-state-on-write/template.marko b/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-copy-state-on-write/template.marko rename to test/autotests/widgets-browser/widget-stateful-copy-state-on-write/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-copy-state-on-write/test.js b/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/test.js similarity index 88% rename from widgets/test/autotests-browser/widget-stateful-copy-state-on-write/test.js rename to test/autotests/widgets-browser/widget-stateful-copy-state-on-write/test.js index 3cb6accb6..ede9195f3 100644 --- a/widgets/test/autotests-browser/widget-stateful-copy-state-on-write/test.js +++ b/test/autotests/widgets-browser/widget-stateful-copy-state-on-write/test.js @@ -3,7 +3,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { var widget = helpers.mount(require('./index'), {}); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { var oldState = widget.state; widget.setState('foo', 'bar'); diff --git a/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/index.js b/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/template.marko b/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/template.marko rename to test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js b/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js similarity index 85% rename from widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js rename to test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js index dfb96a1a9..b70bfbcb2 100644 --- a/widgets/test/autotests-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js +++ b/test/autotests/widgets-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js @@ -6,7 +6,7 @@ module.exports = function(helpers) { label: 'Initial Label' }); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { var oldState = widget.state; widget.setState('size', 'large'); expect(widget.state).to.equal(oldState); diff --git a/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/index.js b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-no-rerender-if-destroyed/template.marko b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-no-rerender-if-destroyed/template.marko rename to test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-no-rerender-if-destroyed/test.js b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-no-rerender-if-destroyed/test.js rename to test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js diff --git a/test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/index.js b/test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-stateful-preserve-body/components/app-stateful-button/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/index.js b/test/autotests/widgets-browser/widget-stateful-preserve-body/index.js similarity index 83% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/index.js rename to test/autotests/widgets-browser/widget-stateful-preserve-body/index.js index e43baf558..9e583b595 100644 --- a/widgets/test/autotests-browser/widget-stateful-preserve-body/index.js +++ b/test/autotests/widgets-browser/widget-stateful-preserve-body/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/marko.json b/test/autotests/widgets-browser/widget-stateful-preserve-body/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/marko.json rename to test/autotests/widgets-browser/widget-stateful-preserve-body/marko.json diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/template.marko b/test/autotests/widgets-browser/widget-stateful-preserve-body/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/template.marko rename to test/autotests/widgets-browser/widget-stateful-preserve-body/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-preserve-body/test.js b/test/autotests/widgets-browser/widget-stateful-preserve-body/test.js similarity index 87% rename from widgets/test/autotests-browser/widget-stateful-preserve-body/test.js rename to test/autotests/widgets-browser/widget-stateful-preserve-body/test.js index e80930177..629da1156 100644 --- a/widgets/test/autotests-browser/widget-stateful-preserve-body/test.js +++ b/test/autotests/widgets-browser/widget-stateful-preserve-body/test.js @@ -8,14 +8,14 @@ module.exports = function(helpers) { expect(button1Widget.el.innerHTML).to.equal('Initial Button Label'); expect(button1Widget.el.className).to.contain('large'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { button1Widget.setSize('small'); }); expect(button1Widget.el.innerHTML).to.equal('Initial Button Label'); expect(button1Widget.el.className).to.contain('small'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setState('buttonLabel', 'New Button Label'); }); diff --git a/test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/index.js b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/components/app-stateful-button/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/index.js b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.js similarity index 87% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/index.js rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.js index d619c1228..112e81325 100644 --- a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/index.js +++ b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/marko.json b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/marko.json rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/marko.json diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/template.marko b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/template.marko rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/test.js b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/test.js similarity index 95% rename from widgets/test/autotests-browser/widget-stateful-reuse-widgets/test.js rename to test/autotests/widgets-browser/widget-stateful-reuse-widgets/test.js index 9a6390e56..64ce02653 100644 --- a/widgets/test/autotests-browser/widget-stateful-reuse-widgets/test.js +++ b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/test.js @@ -12,7 +12,7 @@ module.exports = function(helpers) { var self = widget; - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { self.setButtonSize('small'); self.rerender(); }); diff --git a/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/components/app-stateful-button/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/index.js b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/index.js similarity index 89% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/index.js rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/index.js index 4fb5a845f..23dd17fa9 100644 --- a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/index.js +++ b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/marko.json b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/marko.json rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/marko.json diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/template.marko b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/template.marko rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/test.js b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/test.js similarity index 94% rename from widgets/test/autotests-browser/widget-stateful-update-handler-no-match/test.js rename to test/autotests/widgets-browser/widget-stateful-update-handler-no-match/test.js index e34eda073..318085a1d 100644 --- a/widgets/test/autotests-browser/widget-stateful-update-handler-no-match/test.js +++ b/test/autotests/widgets-browser/widget-stateful-update-handler-no-match/test.js @@ -14,7 +14,7 @@ module.exports = function(helpers) { expect(button1Widget.el.innerHTML).to.contain('Initial Label'); expect(button2Widget.el.innerHTML).to.contain('Initial Label'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setState('buttonSize', 'large'); widget.setState('buttonLabel', 'New Label'); // buttonLabel does not have an update handler }); diff --git a/test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/index.js b/test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json b/test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json rename to test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/components/app-stateful-button/template.marko b/test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler/components/app-stateful-button/template.marko rename to test/autotests/widgets-browser/widget-stateful-update-handler/components/app-stateful-button/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/index.js b/test/autotests/widgets-browser/widget-stateful-update-handler/index.js similarity index 89% rename from widgets/test/autotests-browser/widget-stateful-update-handler/index.js rename to test/autotests/widgets-browser/widget-stateful-update-handler/index.js index 4fb5a845f..23dd17fa9 100644 --- a/widgets/test/autotests-browser/widget-stateful-update-handler/index.js +++ b/test/autotests/widgets-browser/widget-stateful-update-handler/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/marko.json b/test/autotests/widgets-browser/widget-stateful-update-handler/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler/marko.json rename to test/autotests/widgets-browser/widget-stateful-update-handler/marko.json diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/template.marko b/test/autotests/widgets-browser/widget-stateful-update-handler/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update-handler/template.marko rename to test/autotests/widgets-browser/widget-stateful-update-handler/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-update-handler/test.js b/test/autotests/widgets-browser/widget-stateful-update-handler/test.js similarity index 94% rename from widgets/test/autotests-browser/widget-stateful-update-handler/test.js rename to test/autotests/widgets-browser/widget-stateful-update-handler/test.js index 69a21ea87..61940254d 100644 --- a/widgets/test/autotests-browser/widget-stateful-update-handler/test.js +++ b/test/autotests/widgets-browser/widget-stateful-update-handler/test.js @@ -14,7 +14,7 @@ module.exports = function(helpers) { expect(button1Widget.el.innerHTML).to.contain('Initial Label'); expect(button2Widget.el.innerHTML).to.contain('Initial Label'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setState('buttonSize', 'large'); }); diff --git a/test/autotests/widgets-browser/widget-stateful-update/index.js b/test/autotests/widgets-browser/widget-stateful-update/index.js new file mode 100644 index 000000000..724da4446 --- /dev/null +++ b/test/autotests/widgets-browser/widget-stateful-update/index.js @@ -0,0 +1,79 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require.resolve('./template.marko'), + getInitialState: function(input) { + return { + size: input.size || 'normal', + variant: input.variant || 'primary', + className: input['class'], + attrs: input['*'] + }; + }, + + getInitialBody: function(input) { + return input.label || input.renderBody; + }, + getTemplateData: function(state, input) { + var rootAttrs = {}; + + var classParts = ['app-button']; + + var type = 'button'; + + var variant = state.variant; + if (variant !== 'primary') { + classParts.push('app-button-' + variant); + } + + var size = state.size; + if (size !== 'normal') { + classParts.push('app-button-' + size); + } + + var className = state.className; + if (className) { + classParts.push(className); + } + + var splatAttrs = state.attrs; + if (splatAttrs) { + for (var splatAttr in splatAttrs) { + if (splatAttrs.hasOwnProperty(splatAttr)) { + rootAttrs[splatAttr] = splatAttrs[splatAttr]; + } + } + } + + rootAttrs['class'] = classParts.join(' '); + + return { + type: type, + rootAttrs: rootAttrs + }; + }, + + handleClick: function(event) { + // Every Widget instance is also an EventEmitter instance. + // We will emit a custom "click" event when a DOM click event + // is triggered + this.emit('click', { + event: event // Pass along the DOM event in case it is helpful to others + }); + }, + + // Add any other methods here + setVariant: function(variant) { + this.setState('variant', variant); + }, + + setSize: function(size) { + this.setState('size', size); + }, + + setLabel: function(label) { + this.setState('label', label); + }, + + getSize: function() { + return this.state.size; + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-stateful-update/template.marko b/test/autotests/widgets-browser/widget-stateful-update/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stateful-update/template.marko rename to test/autotests/widgets-browser/widget-stateful-update/template.marko diff --git a/widgets/test/autotests-browser/widget-stateful-update/test.js b/test/autotests/widgets-browser/widget-stateful-update/test.js similarity index 86% rename from widgets/test/autotests-browser/widget-stateful-update/test.js rename to test/autotests/widgets-browser/widget-stateful-update/test.js index 2a47ad414..7859a4dcc 100644 --- a/widgets/test/autotests-browser/widget-stateful-update/test.js +++ b/test/autotests/widgets-browser/widget-stateful-update/test.js @@ -8,7 +8,7 @@ module.exports = function(helpers) { expect(widget.el.className).to.contain('large'); - require('marko-widgets').batchUpdate(function() { + require('marko/widgets').batchUpdate(function() { widget.setSize('small'); }); diff --git a/widgets/test/autotests-browser/widget-stopPropagation/index.js b/test/autotests/widgets-browser/widget-stopPropagation/index.js similarity index 88% rename from widgets/test/autotests-browser/widget-stopPropagation/index.js rename to test/autotests/widgets-browser/widget-stopPropagation/index.js index 0d2ee9749..3487c9411 100644 --- a/widgets/test/autotests-browser/widget-stopPropagation/index.js +++ b/test/autotests/widgets-browser/widget-stopPropagation/index.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getTemplateData: function(state, input) { diff --git a/widgets/test/autotests-browser/widget-stopPropagation/template.marko b/test/autotests/widgets-browser/widget-stopPropagation/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-stopPropagation/template.marko rename to test/autotests/widgets-browser/widget-stopPropagation/template.marko diff --git a/widgets/test/autotests-browser/widget-stopPropagation/test.js b/test/autotests/widgets-browser/widget-stopPropagation/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-stopPropagation/test.js rename to test/autotests/widgets-browser/widget-stopPropagation/test.js diff --git a/test/autotests/widgets-browser/widget-subscribeTo/index.js b/test/autotests/widgets-browser/widget-subscribeTo/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-subscribeTo/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-subscribeTo/template.marko b/test/autotests/widgets-browser/widget-subscribeTo/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-subscribeTo/template.marko rename to test/autotests/widgets-browser/widget-subscribeTo/template.marko diff --git a/widgets/test/autotests-browser/widget-subscribeTo/test.js b/test/autotests/widgets-browser/widget-subscribeTo/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-subscribeTo/test.js rename to test/autotests/widgets-browser/widget-subscribeTo/test.js diff --git a/widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/index.js b/test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/index.js similarity index 90% rename from widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/index.js rename to test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/index.js index 2b1e4e90b..638f87728 100644 --- a/widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/index.js +++ b/test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function(input) { diff --git a/widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/marko-tag.json b/test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/marko-tag.json similarity index 100% rename from widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/marko-tag.json rename to test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/marko-tag.json diff --git a/widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/template.marko b/test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-transclusion/components/app-transclusion-alert/template.marko rename to test/autotests/widgets-browser/widget-transclusion/components/app-transclusion-alert/template.marko diff --git a/widgets/test/autotests-browser/widget-transclusion/index.js b/test/autotests/widgets-browser/widget-transclusion/index.js similarity index 92% rename from widgets/test/autotests-browser/widget-transclusion/index.js rename to test/autotests/widgets-browser/widget-transclusion/index.js index db28c9890..7cc0f01ca 100644 --- a/widgets/test/autotests-browser/widget-transclusion/index.js +++ b/test/autotests/widgets-browser/widget-transclusion/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function(input) { diff --git a/widgets/test/autotests-browser/widget-transclusion/marko.json b/test/autotests/widgets-browser/widget-transclusion/marko.json similarity index 100% rename from widgets/test/autotests-browser/widget-transclusion/marko.json rename to test/autotests/widgets-browser/widget-transclusion/marko.json diff --git a/widgets/test/autotests-browser/widget-transclusion/template.marko b/test/autotests/widgets-browser/widget-transclusion/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-transclusion/template.marko rename to test/autotests/widgets-browser/widget-transclusion/template.marko diff --git a/widgets/test/autotests-browser/widget-transclusion/test.js b/test/autotests/widgets-browser/widget-transclusion/test.js similarity index 89% rename from widgets/test/autotests-browser/widget-transclusion/test.js rename to test/autotests/widgets-browser/widget-transclusion/test.js index 7289b8373..50c04aa15 100644 --- a/widgets/test/autotests-browser/widget-transclusion/test.js +++ b/test/autotests/widgets-browser/widget-transclusion/test.js @@ -9,7 +9,7 @@ module.exports = function(helpers) { expect(el.innerHTML).to.contain('alert alert-success'); // The inner HTML for the H1 should not change since only the body content changed - require('marko-widgets').batchUpdate(function() { // Force the HTML update to be immediate + require('marko/widgets').batchUpdate(function() { // Force the HTML update to be immediate widget.setAlertMessage('Hello Universe'); }); @@ -18,7 +18,7 @@ module.exports = function(helpers) { expect(el.querySelector('.alert').className).to.contain('alert alert-success'); // The inner HTML for the H1 should change since the state of the alert widget changed - require('marko-widgets').batchUpdate(function() { // Force the HTML update to be immediate + require('marko/widgets').batchUpdate(function() { // Force the HTML update to be immediate widget.setAlertType('failure'); }); diff --git a/test/autotests/widgets-browser/widget-unique-id/index.js b/test/autotests/widgets-browser/widget-unique-id/index.js new file mode 100644 index 000000000..888b55d6b --- /dev/null +++ b/test/autotests/widgets-browser/widget-unique-id/index.js @@ -0,0 +1,7 @@ +module.exports = require('marko/widgets').defineComponent({ + template: require('./template.marko'), + + init: function() { + + } +}); \ No newline at end of file diff --git a/widgets/test/autotests-browser/widget-unique-id/template.marko b/test/autotests/widgets-browser/widget-unique-id/template.marko similarity index 100% rename from widgets/test/autotests-browser/widget-unique-id/template.marko rename to test/autotests/widgets-browser/widget-unique-id/template.marko diff --git a/widgets/test/autotests-browser/widget-unique-id/test.js b/test/autotests/widgets-browser/widget-unique-id/test.js similarity index 100% rename from widgets/test/autotests-browser/widget-unique-id/test.js rename to test/autotests/widgets-browser/widget-unique-id/test.js diff --git a/widgets/test/autotests-compilation/component-template-entry/component.js b/test/autotests/widgets-compilation/component-template-entry/component.js similarity index 100% rename from widgets/test/autotests-compilation/component-template-entry/component.js rename to test/autotests/widgets-compilation/component-template-entry/component.js diff --git a/widgets/test/autotests-compilation/component-template-entry/expected.js b/test/autotests/widgets-compilation/component-template-entry/expected.js similarity index 83% rename from widgets/test/autotests-compilation/component-template-entry/expected.js rename to test/autotests/widgets-compilation/component-template-entry/expected.js index 6dcc646fe..9b4cef18a 100644 --- a/widgets/test/autotests-compilation/component-template-entry/expected.js +++ b/test/autotests/widgets-compilation/component-template-entry/expected.js @@ -5,12 +5,12 @@ function create(__markoHelpers) { return module.exports; } }, - __markoWidgets = require("marko-widgets"), + __markoWidgets = require("marko/widgets/index"), __widgetAttrs = __markoWidgets.attrs, marko_attr = __markoHelpers.a, marko_attrs = __markoHelpers.as, marko_loadTag = __markoHelpers.t, - w_widget_tag = marko_loadTag(require("marko-widgets/taglib/widget-tag")); + w_widget_tag = marko_loadTag(require("marko/widgets/taglib/widget-tag")); return function render(data, out) { w_widget_tag({ @@ -33,4 +33,4 @@ var component = require("./component"); var template = require("marko/html").c(__filename, create); -module.exports = require("marko-widgets").c(component, template); +module.exports = require("marko/widgets").c(component, template); diff --git a/widgets/test/autotests-compilation/component-template-entry/index.marko b/test/autotests/widgets-compilation/component-template-entry/index.marko similarity index 100% rename from widgets/test/autotests-compilation/component-template-entry/index.marko rename to test/autotests/widgets-compilation/component-template-entry/index.marko diff --git a/widgets/test/autotests-pages/async-boundaries/browser.json b/test/autotests/widgets-pages/async-boundaries/browser.json similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/browser.json rename to test/autotests/widgets-pages/async-boundaries/browser.json diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-async/renderer.js b/test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-async/renderer.js rename to test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-async/template.marko b/test/autotests/widgets-pages/async-boundaries/components/app-async/template.marko similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-async/template.marko rename to test/autotests/widgets-pages/async-boundaries/components/app-async/template.marko diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-async/widget.js b/test/autotests/widgets-pages/async-boundaries/components/app-async/widget.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-async/widget.js rename to test/autotests/widgets-pages/async-boundaries/components/app-async/widget.js diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-hello/renderer.js b/test/autotests/widgets-pages/async-boundaries/components/app-hello/renderer.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-hello/renderer.js rename to test/autotests/widgets-pages/async-boundaries/components/app-hello/renderer.js diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-hello/template.marko b/test/autotests/widgets-pages/async-boundaries/components/app-hello/template.marko similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-hello/template.marko rename to test/autotests/widgets-pages/async-boundaries/components/app-hello/template.marko diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-hello/widget.js b/test/autotests/widgets-pages/async-boundaries/components/app-hello/widget.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-hello/widget.js rename to test/autotests/widgets-pages/async-boundaries/components/app-hello/widget.js diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-init-async/renderer.js b/test/autotests/widgets-pages/async-boundaries/components/app-init-async/renderer.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-init-async/renderer.js rename to test/autotests/widgets-pages/async-boundaries/components/app-init-async/renderer.js diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-init-async/template.marko b/test/autotests/widgets-pages/async-boundaries/components/app-init-async/template.marko similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-init-async/template.marko rename to test/autotests/widgets-pages/async-boundaries/components/app-init-async/template.marko diff --git a/widgets/test/autotests-pages/async-boundaries/components/app-init-async/widget.js b/test/autotests/widgets-pages/async-boundaries/components/app-init-async/widget.js similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/components/app-init-async/widget.js rename to test/autotests/widgets-pages/async-boundaries/components/app-init-async/widget.js diff --git a/widgets/test/autotests-pages/async-boundaries/marko.json b/test/autotests/widgets-pages/async-boundaries/marko.json similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/marko.json rename to test/autotests/widgets-pages/async-boundaries/marko.json diff --git a/widgets/test/autotests-pages/async-boundaries/template.marko b/test/autotests/widgets-pages/async-boundaries/template.marko similarity index 100% rename from widgets/test/autotests-pages/async-boundaries/template.marko rename to test/autotests/widgets-pages/async-boundaries/template.marko diff --git a/widgets/test/autotests-pages/async-boundaries/tests.js b/test/autotests/widgets-pages/async-boundaries/tests.js similarity index 84% rename from widgets/test/autotests-pages/async-boundaries/tests.js rename to test/autotests/widgets-pages/async-boundaries/tests.js index 42a0a9c92..d2f7142be 100644 --- a/widgets/test/autotests-pages/async-boundaries/tests.js +++ b/test/autotests/widgets-pages/async-boundaries/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should initialize widgets correctly across async boundaries', function() { diff --git a/widgets/test/autotests-pages/dom-events/browser.json b/test/autotests/widgets-pages/dom-events/browser.json similarity index 100% rename from widgets/test/autotests-pages/dom-events/browser.json rename to test/autotests/widgets-pages/dom-events/browser.json diff --git a/widgets/test/autotests-pages/dom-events/components/app-foo/index.js b/test/autotests/widgets-pages/dom-events/components/app-foo/index.js similarity index 89% rename from widgets/test/autotests-pages/dom-events/components/app-foo/index.js rename to test/autotests/widgets-pages/dom-events/components/app-foo/index.js index 058607acb..e593a3315 100644 --- a/widgets/test/autotests-pages/dom-events/components/app-foo/index.js +++ b/test/autotests/widgets-pages/dom-events/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function() { diff --git a/widgets/test/autotests-pages/dom-events/components/app-foo/template.marko b/test/autotests/widgets-pages/dom-events/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/dom-events/components/app-foo/template.marko rename to test/autotests/widgets-pages/dom-events/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/dom-events/marko.json b/test/autotests/widgets-pages/dom-events/marko.json similarity index 100% rename from widgets/test/autotests-pages/dom-events/marko.json rename to test/autotests/widgets-pages/dom-events/marko.json diff --git a/widgets/test/autotests-pages/dom-events/template.marko b/test/autotests/widgets-pages/dom-events/template.marko similarity index 100% rename from widgets/test/autotests-pages/dom-events/template.marko rename to test/autotests/widgets-pages/dom-events/template.marko diff --git a/widgets/test/autotests-pages/dom-events/tests.js b/test/autotests/widgets-pages/dom-events/tests.js similarity index 96% rename from widgets/test/autotests-pages/dom-events/tests.js rename to test/autotests/widgets-pages/dom-events/tests.js index 6ab5623aa..b480a0f25 100644 --- a/widgets/test/autotests-pages/dom-events/tests.js +++ b/test/autotests/widgets-pages/dom-events/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); function triggerMouseEvent(el, type) { var ev = document.createEvent("MouseEvent"); diff --git a/widgets/test/autotests-pages/getRenderedWidgets/browser.json b/test/autotests/widgets-pages/getRenderedWidgets/browser.json similarity index 100% rename from widgets/test/autotests-pages/getRenderedWidgets/browser.json rename to test/autotests/widgets-pages/getRenderedWidgets/browser.json diff --git a/widgets/test/autotests-pages/getRenderedWidgets/components.marko b/test/autotests/widgets-pages/getRenderedWidgets/components.marko similarity index 100% rename from widgets/test/autotests-pages/getRenderedWidgets/components.marko rename to test/autotests/widgets-pages/getRenderedWidgets/components.marko diff --git a/widgets/test/autotests-pages/getRenderedWidgets/components/app-simple/index.js b/test/autotests/widgets-pages/getRenderedWidgets/components/app-simple/index.js similarity index 90% rename from widgets/test/autotests-pages/getRenderedWidgets/components/app-simple/index.js rename to test/autotests/widgets-pages/getRenderedWidgets/components/app-simple/index.js index 025a9c6a5..216c968e4 100644 --- a/widgets/test/autotests-pages/getRenderedWidgets/components/app-simple/index.js +++ b/test/autotests/widgets-pages/getRenderedWidgets/components/app-simple/index.js @@ -2,7 +2,7 @@ if (typeof window !== 'undefined') { window.simpleWidgets = []; } -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getWidgetConfig: function(input) { diff --git a/widgets/test/autotests-pages/getRenderedWidgets/components/app-simple/template.marko b/test/autotests/widgets-pages/getRenderedWidgets/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-pages/getRenderedWidgets/components/app-simple/template.marko rename to test/autotests/widgets-pages/getRenderedWidgets/components/app-simple/template.marko diff --git a/widgets/test/autotests-pages/getRenderedWidgets/marko.json b/test/autotests/widgets-pages/getRenderedWidgets/marko.json similarity index 100% rename from widgets/test/autotests-pages/getRenderedWidgets/marko.json rename to test/autotests/widgets-pages/getRenderedWidgets/marko.json diff --git a/widgets/test/autotests-pages/getRenderedWidgets/template.marko b/test/autotests/widgets-pages/getRenderedWidgets/template.marko similarity index 95% rename from widgets/test/autotests-pages/getRenderedWidgets/template.marko rename to test/autotests/widgets-pages/getRenderedWidgets/template.marko index d733c0ece..a47baca05 100644 --- a/widgets/test/autotests-pages/getRenderedWidgets/template.marko +++ b/test/autotests/widgets-pages/getRenderedWidgets/template.marko @@ -1,6 +1,6 @@ script marko-init --- - var markoWidgets = require('marko-widgets'); + var markoWidgets = require('marko/widgets'); var componentsTemplate = require('./components.marko'); function componentsDataProvider(callback) { diff --git a/widgets/test/autotests-pages/getRenderedWidgets/tests.js b/test/autotests/widgets-pages/getRenderedWidgets/tests.js similarity index 97% rename from widgets/test/autotests-pages/getRenderedWidgets/tests.js rename to test/autotests/widgets-pages/getRenderedWidgets/tests.js index 7651eb271..95b36273f 100644 --- a/widgets/test/autotests-pages/getRenderedWidgets/tests.js +++ b/test/autotests/widgets-pages/getRenderedWidgets/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should serialize widget config down to the browser', function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/browser.json b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/browser.json rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js index 54855c272..4f6b87316 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js +++ b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-bar/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-bar/template.marko b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-bar/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-bar/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js index 4431e8f9e..414755375 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js +++ b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-foo/template.marko b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/components/app-foo/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/marko.json b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/marko.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/marko.json rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/marko.json diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/template.marko b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/tests.js b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/tests.js similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate-await-client-reorder/tests.js rename to test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/tests.js diff --git a/widgets/test/autotests-pages/init-widgets-immediate/browser.json b/test/autotests/widgets-pages/init-widgets-immediate/browser.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/browser.json rename to test/autotests/widgets-pages/init-widgets-immediate/browser.json diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-bar/index.js b/test/autotests/widgets-pages/init-widgets-immediate/components/app-bar/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-bar/index.js rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-bar/index.js index 54855c272..4f6b87316 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate/components/app-bar/index.js +++ b/test/autotests/widgets-pages/init-widgets-immediate/components/app-bar/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-bar/template.marko b/test/autotests/widgets-pages/init-widgets-immediate/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-bar/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-bar/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-baz/index.js b/test/autotests/widgets-pages/init-widgets-immediate/components/app-baz/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-baz/index.js rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-baz/index.js index 3d45f94f4..8bdff23d0 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate/components/app-baz/index.js +++ b/test/autotests/widgets-pages/init-widgets-immediate/components/app-baz/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-baz/template.marko b/test/autotests/widgets-pages/init-widgets-immediate/components/app-baz/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-baz/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-baz/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-foo/index.js b/test/autotests/widgets-pages/init-widgets-immediate/components/app-foo/index.js similarity index 87% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-foo/index.js rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-foo/index.js index 171085471..15f3576e2 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate/components/app-foo/index.js +++ b/test/autotests/widgets-pages/init-widgets-immediate/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function() { diff --git a/widgets/test/autotests-pages/init-widgets-immediate/components/app-foo/template.marko b/test/autotests/widgets-pages/init-widgets-immediate/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/components/app-foo/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate/marko.json b/test/autotests/widgets-pages/init-widgets-immediate/marko.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/marko.json rename to test/autotests/widgets-pages/init-widgets-immediate/marko.json diff --git a/widgets/test/autotests-pages/init-widgets-immediate/template.marko b/test/autotests/widgets-pages/init-widgets-immediate/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets-immediate/template.marko rename to test/autotests/widgets-pages/init-widgets-immediate/template.marko diff --git a/widgets/test/autotests-pages/init-widgets-immediate/tests.js b/test/autotests/widgets-pages/init-widgets-immediate/tests.js similarity index 97% rename from widgets/test/autotests-pages/init-widgets-immediate/tests.js rename to test/autotests/widgets-pages/init-widgets-immediate/tests.js index 48bf54705..58b103090 100644 --- a/widgets/test/autotests-pages/init-widgets-immediate/tests.js +++ b/test/autotests/widgets-pages/init-widgets-immediate/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should initialize widgets before ready', function() { diff --git a/widgets/test/autotests-pages/init-widgets/browser.json b/test/autotests/widgets-pages/init-widgets/browser.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets/browser.json rename to test/autotests/widgets-pages/init-widgets/browser.json diff --git a/widgets/test/autotests-pages/init-widgets/components/app-bar/index.js b/test/autotests/widgets-pages/init-widgets/components/app-bar/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets/components/app-bar/index.js rename to test/autotests/widgets-pages/init-widgets/components/app-bar/index.js index 54855c272..4f6b87316 100644 --- a/widgets/test/autotests-pages/init-widgets/components/app-bar/index.js +++ b/test/autotests/widgets-pages/init-widgets/components/app-bar/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets/components/app-bar/template.marko b/test/autotests/widgets-pages/init-widgets/components/app-bar/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets/components/app-bar/template.marko rename to test/autotests/widgets-pages/init-widgets/components/app-bar/template.marko diff --git a/widgets/test/autotests-pages/init-widgets/components/app-baz/index.js b/test/autotests/widgets-pages/init-widgets/components/app-baz/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets/components/app-baz/index.js rename to test/autotests/widgets-pages/init-widgets/components/app-baz/index.js index 3d45f94f4..8bdff23d0 100644 --- a/widgets/test/autotests-pages/init-widgets/components/app-baz/index.js +++ b/test/autotests/widgets-pages/init-widgets/components/app-baz/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets/components/app-baz/template.marko b/test/autotests/widgets-pages/init-widgets/components/app-baz/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets/components/app-baz/template.marko rename to test/autotests/widgets-pages/init-widgets/components/app-baz/template.marko diff --git a/widgets/test/autotests-pages/init-widgets/components/app-foo/index.js b/test/autotests/widgets-pages/init-widgets/components/app-foo/index.js similarity index 64% rename from widgets/test/autotests-pages/init-widgets/components/app-foo/index.js rename to test/autotests/widgets-pages/init-widgets/components/app-foo/index.js index 4431e8f9e..414755375 100644 --- a/widgets/test/autotests-pages/init-widgets/components/app-foo/index.js +++ b/test/autotests/widgets-pages/init-widgets/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/init-widgets/components/app-foo/template.marko b/test/autotests/widgets-pages/init-widgets/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets/components/app-foo/template.marko rename to test/autotests/widgets-pages/init-widgets/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/init-widgets/marko.json b/test/autotests/widgets-pages/init-widgets/marko.json similarity index 100% rename from widgets/test/autotests-pages/init-widgets/marko.json rename to test/autotests/widgets-pages/init-widgets/marko.json diff --git a/widgets/test/autotests-pages/init-widgets/template.marko b/test/autotests/widgets-pages/init-widgets/template.marko similarity index 100% rename from widgets/test/autotests-pages/init-widgets/template.marko rename to test/autotests/widgets-pages/init-widgets/template.marko diff --git a/widgets/test/autotests-pages/init-widgets/tests.js b/test/autotests/widgets-pages/init-widgets/tests.js similarity index 97% rename from widgets/test/autotests-pages/init-widgets/tests.js rename to test/autotests/widgets-pages/init-widgets/tests.js index e6a374d07..28ef2a09c 100644 --- a/widgets/test/autotests-pages/init-widgets/tests.js +++ b/test/autotests/widgets-pages/init-widgets/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should initialize widgets after ready', function(done) { diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/browser.json b/test/autotests/widgets-pages/server-browser-unique-ids/browser.json similarity index 100% rename from widgets/test/autotests-pages/server-browser-unique-ids/browser.json rename to test/autotests/widgets-pages/server-browser-unique-ids/browser.json diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/components/app-foo/index.js b/test/autotests/widgets-pages/server-browser-unique-ids/components/app-foo/index.js similarity index 64% rename from widgets/test/autotests-pages/server-browser-unique-ids/components/app-foo/index.js rename to test/autotests/widgets-pages/server-browser-unique-ids/components/app-foo/index.js index 4431e8f9e..414755375 100644 --- a/widgets/test/autotests-pages/server-browser-unique-ids/components/app-foo/index.js +++ b/test/autotests/widgets-pages/server-browser-unique-ids/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/components/app-foo/template.marko b/test/autotests/widgets-pages/server-browser-unique-ids/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/server-browser-unique-ids/components/app-foo/template.marko rename to test/autotests/widgets-pages/server-browser-unique-ids/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/marko.json b/test/autotests/widgets-pages/server-browser-unique-ids/marko.json similarity index 100% rename from widgets/test/autotests-pages/server-browser-unique-ids/marko.json rename to test/autotests/widgets-pages/server-browser-unique-ids/marko.json diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/template.marko b/test/autotests/widgets-pages/server-browser-unique-ids/template.marko similarity index 100% rename from widgets/test/autotests-pages/server-browser-unique-ids/template.marko rename to test/autotests/widgets-pages/server-browser-unique-ids/template.marko diff --git a/widgets/test/autotests-pages/server-browser-unique-ids/tests.js b/test/autotests/widgets-pages/server-browser-unique-ids/tests.js similarity index 100% rename from widgets/test/autotests-pages/server-browser-unique-ids/tests.js rename to test/autotests/widgets-pages/server-browser-unique-ids/tests.js diff --git a/widgets/test/autotests-pages/split-widget-renderer/browser.json b/test/autotests/widgets-pages/split-widget-renderer/browser.json similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/browser.json rename to test/autotests/widgets-pages/split-widget-renderer/browser.json diff --git a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/index.js b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/index.js similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/index.js rename to test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/index.js diff --git a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/marko-tag.json b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/marko-tag.json similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/marko-tag.json rename to test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/marko-tag.json diff --git a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/renderer.js b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/renderer.js similarity index 95% rename from widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/renderer.js rename to test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/renderer.js index cd4f24f31..da51d5d38 100644 --- a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/renderer.js +++ b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/renderer.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineRenderer({ +module.exports = require('marko/widgets').defineRenderer({ template: require.resolve('./template.marko'), getInitialBody: function(input) { return input.label || input.renderBody; diff --git a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/template.marko b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/template.marko similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/template.marko rename to test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/template.marko diff --git a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/widget.js b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/widget.js similarity index 80% rename from widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/widget.js rename to test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/widget.js index 0a7a12ede..b917e636c 100644 --- a/widgets/test/autotests-pages/split-widget-renderer/components/app-button-split/widget.js +++ b/test/autotests/widgets-pages/split-widget-renderer/components/app-button-split/widget.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineWidget({ +module.exports = require('marko/widgets').defineWidget({ init: function() { window.appButtonSplit = this; }, diff --git a/widgets/test/autotests-pages/split-widget-renderer/marko.json b/test/autotests/widgets-pages/split-widget-renderer/marko.json similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/marko.json rename to test/autotests/widgets-pages/split-widget-renderer/marko.json diff --git a/widgets/test/autotests-pages/split-widget-renderer/template.marko b/test/autotests/widgets-pages/split-widget-renderer/template.marko similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/template.marko rename to test/autotests/widgets-pages/split-widget-renderer/template.marko diff --git a/widgets/test/autotests-pages/split-widget-renderer/tests.js b/test/autotests/widgets-pages/split-widget-renderer/tests.js similarity index 100% rename from widgets/test/autotests-pages/split-widget-renderer/tests.js rename to test/autotests/widgets-pages/split-widget-renderer/tests.js diff --git a/widgets/test/autotests-pages/widget-config/browser.json b/test/autotests/widgets-pages/widget-config/browser.json similarity index 100% rename from widgets/test/autotests-pages/widget-config/browser.json rename to test/autotests/widgets-pages/widget-config/browser.json diff --git a/widgets/test/autotests-pages/widget-config/components/app-foo/index.js b/test/autotests/widgets-pages/widget-config/components/app-foo/index.js similarity index 81% rename from widgets/test/autotests-pages/widget-config/components/app-foo/index.js rename to test/autotests/widgets-pages/widget-config/components/app-foo/index.js index 9afef97d6..d44b4376d 100644 --- a/widgets/test/autotests-pages/widget-config/components/app-foo/index.js +++ b/test/autotests/widgets-pages/widget-config/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getWidgetConfig: function() { diff --git a/widgets/test/autotests-pages/widget-config/components/app-foo/template.marko b/test/autotests/widgets-pages/widget-config/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-config/components/app-foo/template.marko rename to test/autotests/widgets-pages/widget-config/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/widget-config/marko.json b/test/autotests/widgets-pages/widget-config/marko.json similarity index 100% rename from widgets/test/autotests-pages/widget-config/marko.json rename to test/autotests/widgets-pages/widget-config/marko.json diff --git a/widgets/test/autotests-pages/widget-config/template.marko b/test/autotests/widgets-pages/widget-config/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-config/template.marko rename to test/autotests/widgets-pages/widget-config/template.marko diff --git a/widgets/test/autotests-pages/widget-config/tests.js b/test/autotests/widgets-pages/widget-config/tests.js similarity index 85% rename from widgets/test/autotests-pages/widget-config/tests.js rename to test/autotests/widgets-pages/widget-config/tests.js index 223a71403..17c37324a 100644 --- a/widgets/test/autotests-pages/widget-config/tests.js +++ b/test/autotests/widgets-pages/widget-config/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should serialize widget config down to the browser', function() { diff --git a/widgets/test/autotests-pages/widget-fixed-id/browser.json b/test/autotests/widgets-pages/widget-fixed-id/browser.json similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/browser.json rename to test/autotests/widgets-pages/widget-fixed-id/browser.json diff --git a/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/index.js b/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/index.js new file mode 100644 index 000000000..0aec91880 --- /dev/null +++ b/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/index.js @@ -0,0 +1,3 @@ +// Export a render(input, callback) method that can be used +// to render this UI component on the client or server +require('marko/widgets').renderable(exports, require('./renderer')); \ No newline at end of file diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/renderer.js b/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/renderer.js similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/renderer.js rename to test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/renderer.js diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/template.marko b/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/template.marko rename to test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/template.marko diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/widget.js b/test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/widget.js similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-fixed-id/widget.js rename to test/autotests/widgets-pages/widget-fixed-id/components/app-fixed-id/widget.js diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-hello/renderer.js b/test/autotests/widgets-pages/widget-fixed-id/components/app-hello/renderer.js similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-hello/renderer.js rename to test/autotests/widgets-pages/widget-fixed-id/components/app-hello/renderer.js diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-hello/template.marko b/test/autotests/widgets-pages/widget-fixed-id/components/app-hello/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-hello/template.marko rename to test/autotests/widgets-pages/widget-fixed-id/components/app-hello/template.marko diff --git a/widgets/test/autotests-pages/widget-fixed-id/components/app-hello/widget.js b/test/autotests/widgets-pages/widget-fixed-id/components/app-hello/widget.js similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/components/app-hello/widget.js rename to test/autotests/widgets-pages/widget-fixed-id/components/app-hello/widget.js diff --git a/widgets/test/autotests-pages/widget-fixed-id/marko.json b/test/autotests/widgets-pages/widget-fixed-id/marko.json similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/marko.json rename to test/autotests/widgets-pages/widget-fixed-id/marko.json diff --git a/widgets/test/autotests-pages/widget-fixed-id/template.marko b/test/autotests/widgets-pages/widget-fixed-id/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-fixed-id/template.marko rename to test/autotests/widgets-pages/widget-fixed-id/template.marko diff --git a/widgets/test/autotests-pages/widget-fixed-id/tests.js b/test/autotests/widgets-pages/widget-fixed-id/tests.js similarity index 88% rename from widgets/test/autotests-pages/widget-fixed-id/tests.js rename to test/autotests/widgets-pages/widget-fixed-id/tests.js index 9abda5e67..0a16157c5 100644 --- a/widgets/test/autotests-pages/widget-fixed-id/tests.js +++ b/test/autotests/widgets-pages/widget-fixed-id/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should allow fixed IDs for widgets', function() { diff --git a/widgets/test/autotests-pages/widget-state/browser.json b/test/autotests/widgets-pages/widget-state/browser.json similarity index 100% rename from widgets/test/autotests-pages/widget-state/browser.json rename to test/autotests/widgets-pages/widget-state/browser.json diff --git a/widgets/test/autotests-pages/widget-state/components/app-foo/index.js b/test/autotests/widgets-pages/widget-state/components/app-foo/index.js similarity index 78% rename from widgets/test/autotests-pages/widget-state/components/app-foo/index.js rename to test/autotests/widgets-pages/widget-state/components/app-foo/index.js index 1d0299312..fb8c6390a 100644 --- a/widgets/test/autotests-pages/widget-state/components/app-foo/index.js +++ b/test/autotests/widgets-pages/widget-state/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function() { diff --git a/widgets/test/autotests-pages/widget-state/components/app-foo/template.marko b/test/autotests/widgets-pages/widget-state/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-state/components/app-foo/template.marko rename to test/autotests/widgets-pages/widget-state/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/widget-state/marko.json b/test/autotests/widgets-pages/widget-state/marko.json similarity index 100% rename from widgets/test/autotests-pages/widget-state/marko.json rename to test/autotests/widgets-pages/widget-state/marko.json diff --git a/widgets/test/autotests-pages/widget-state/template.marko b/test/autotests/widgets-pages/widget-state/template.marko similarity index 100% rename from widgets/test/autotests-pages/widget-state/template.marko rename to test/autotests/widgets-pages/widget-state/template.marko diff --git a/widgets/test/autotests-pages/widget-state/tests.js b/test/autotests/widgets-pages/widget-state/tests.js similarity index 85% rename from widgets/test/autotests-pages/widget-state/tests.js rename to test/autotests/widgets-pages/widget-state/tests.js index 9fb592e53..87ee85715 100644 --- a/widgets/test/autotests-pages/widget-state/tests.js +++ b/test/autotests/widgets-pages/widget-state/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { it('should serialize widget config down to the browser', function() { diff --git a/widgets/test/autotests-pages/xss/browser.json b/test/autotests/widgets-pages/xss/browser.json similarity index 100% rename from widgets/test/autotests-pages/xss/browser.json rename to test/autotests/widgets-pages/xss/browser.json diff --git a/widgets/test/autotests-pages/xss/components/app-foo/index.js b/test/autotests/widgets-pages/xss/components/app-foo/index.js similarity index 87% rename from widgets/test/autotests-pages/xss/components/app-foo/index.js rename to test/autotests/widgets-pages/xss/components/app-foo/index.js index ae0bd09af..61d735945 100644 --- a/widgets/test/autotests-pages/xss/components/app-foo/index.js +++ b/test/autotests/widgets-pages/xss/components/app-foo/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), getInitialState: function() { diff --git a/widgets/test/autotests-pages/xss/components/app-foo/template.marko b/test/autotests/widgets-pages/xss/components/app-foo/template.marko similarity index 100% rename from widgets/test/autotests-pages/xss/components/app-foo/template.marko rename to test/autotests/widgets-pages/xss/components/app-foo/template.marko diff --git a/widgets/test/autotests-pages/xss/marko.json b/test/autotests/widgets-pages/xss/marko.json similarity index 100% rename from widgets/test/autotests-pages/xss/marko.json rename to test/autotests/widgets-pages/xss/marko.json diff --git a/widgets/test/autotests-pages/xss/template.marko b/test/autotests/widgets-pages/xss/template.marko similarity index 100% rename from widgets/test/autotests-pages/xss/template.marko rename to test/autotests/widgets-pages/xss/template.marko diff --git a/widgets/test/autotests-pages/xss/tests.js b/test/autotests/widgets-pages/xss/tests.js similarity index 91% rename from widgets/test/autotests-pages/xss/tests.js rename to test/autotests/widgets-pages/xss/tests.js index 06e47126c..4c3978dea 100644 --- a/widgets/test/autotests-pages/xss/tests.js +++ b/test/autotests/widgets-pages/xss/tests.js @@ -1,6 +1,6 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); describe(path.basename(__dirname), function() { diff --git a/widgets/test/autotests-server/autotests.tests b/test/autotests/widgets-server/autotests.tests similarity index 100% rename from widgets/test/autotests-server/autotests.tests rename to test/autotests/widgets-server/autotests.tests diff --git a/widgets/test/autotests-server/cspNonce/components/app-simple/index.js b/test/autotests/widgets-server/cspNonce/components/app-simple/index.js similarity index 87% rename from widgets/test/autotests-server/cspNonce/components/app-simple/index.js rename to test/autotests/widgets-server/cspNonce/components/app-simple/index.js index 321f596b5..c46f4535d 100644 --- a/widgets/test/autotests-server/cspNonce/components/app-simple/index.js +++ b/test/autotests/widgets-server/cspNonce/components/app-simple/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getWidgetConfig: function() { diff --git a/widgets/test/autotests-server/cspNonce/components/app-simple/template.marko b/test/autotests/widgets-server/cspNonce/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-server/cspNonce/components/app-simple/template.marko rename to test/autotests/widgets-server/cspNonce/components/app-simple/template.marko diff --git a/widgets/test/autotests-server/cspNonce/marko.json b/test/autotests/widgets-server/cspNonce/marko.json similarity index 100% rename from widgets/test/autotests-server/cspNonce/marko.json rename to test/autotests/widgets-server/cspNonce/marko.json diff --git a/widgets/test/autotests-server/cspNonce/template.marko b/test/autotests/widgets-server/cspNonce/template.marko similarity index 100% rename from widgets/test/autotests-server/cspNonce/template.marko rename to test/autotests/widgets-server/cspNonce/template.marko diff --git a/widgets/test/autotests-server/cspNonce/test.js b/test/autotests/widgets-server/cspNonce/test.js similarity index 79% rename from widgets/test/autotests-server/cspNonce/test.js rename to test/autotests/widgets-server/cspNonce/test.js index 5048a6f40..87061bf10 100644 --- a/widgets/test/autotests-server/cspNonce/test.js +++ b/test/autotests/widgets-server/cspNonce/test.js @@ -1,6 +1,3 @@ -var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); - module.exports = function(helpers, done) { var template = require('./template.marko'); diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/components/app-simple/index.js b/test/autotests/widgets-server/getRenderedWidgetIds/components/app-simple/index.js similarity index 87% rename from widgets/test/autotests-server/getRenderedWidgetIds/components/app-simple/index.js rename to test/autotests/widgets-server/getRenderedWidgetIds/components/app-simple/index.js index 321f596b5..c46f4535d 100644 --- a/widgets/test/autotests-server/getRenderedWidgetIds/components/app-simple/index.js +++ b/test/autotests/widgets-server/getRenderedWidgetIds/components/app-simple/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getWidgetConfig: function() { diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/components/app-simple/template.marko b/test/autotests/widgets-server/getRenderedWidgetIds/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgetIds/components/app-simple/template.marko rename to test/autotests/widgets-server/getRenderedWidgetIds/components/app-simple/template.marko diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/marko.json b/test/autotests/widgets-server/getRenderedWidgetIds/marko.json similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgetIds/marko.json rename to test/autotests/widgets-server/getRenderedWidgetIds/marko.json diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/template.marko b/test/autotests/widgets-server/getRenderedWidgetIds/template.marko similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgetIds/template.marko rename to test/autotests/widgets-server/getRenderedWidgetIds/template.marko diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/test.js b/test/autotests/widgets-server/getRenderedWidgetIds/test.js similarity index 89% rename from widgets/test/autotests-server/getRenderedWidgetIds/test.js rename to test/autotests/widgets-server/getRenderedWidgetIds/test.js index 8e52d52c3..1d3592c66 100644 --- a/widgets/test/autotests-server/getRenderedWidgetIds/test.js +++ b/test/autotests/widgets-server/getRenderedWidgetIds/test.js @@ -1,5 +1,5 @@ var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); module.exports = function(helpers, done) { var template = require('./template.marko'); diff --git a/widgets/test/autotests-server/getRenderedWidgetIds/widget.js b/test/autotests/widgets-server/getRenderedWidgetIds/widget.js similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgetIds/widget.js rename to test/autotests/widgets-server/getRenderedWidgetIds/widget.js diff --git a/widgets/test/autotests-server/getRenderedWidgets/components/app-simple/index.js b/test/autotests/widgets-server/getRenderedWidgets/components/app-simple/index.js similarity index 87% rename from widgets/test/autotests-server/getRenderedWidgets/components/app-simple/index.js rename to test/autotests/widgets-server/getRenderedWidgets/components/app-simple/index.js index 321f596b5..c46f4535d 100644 --- a/widgets/test/autotests-server/getRenderedWidgets/components/app-simple/index.js +++ b/test/autotests/widgets-server/getRenderedWidgets/components/app-simple/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require.resolve('./template.marko'), getWidgetConfig: function() { diff --git a/widgets/test/autotests-server/getRenderedWidgets/components/app-simple/template.marko b/test/autotests/widgets-server/getRenderedWidgets/components/app-simple/template.marko similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgets/components/app-simple/template.marko rename to test/autotests/widgets-server/getRenderedWidgets/components/app-simple/template.marko diff --git a/widgets/test/autotests-server/getRenderedWidgets/marko.json b/test/autotests/widgets-server/getRenderedWidgets/marko.json similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgets/marko.json rename to test/autotests/widgets-server/getRenderedWidgets/marko.json diff --git a/widgets/test/autotests-server/getRenderedWidgets/template.marko b/test/autotests/widgets-server/getRenderedWidgets/template.marko similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgets/template.marko rename to test/autotests/widgets-server/getRenderedWidgets/template.marko diff --git a/widgets/test/autotests-server/getRenderedWidgets/test.js b/test/autotests/widgets-server/getRenderedWidgets/test.js similarity index 89% rename from widgets/test/autotests-server/getRenderedWidgets/test.js rename to test/autotests/widgets-server/getRenderedWidgets/test.js index b93bc6c68..059ee03b0 100644 --- a/widgets/test/autotests-server/getRenderedWidgets/test.js +++ b/test/autotests/widgets-server/getRenderedWidgets/test.js @@ -1,5 +1,5 @@ var expect = require('chai').expect; -var markoWidgets = require('marko-widgets'); +var markoWidgets = require('marko/widgets'); module.exports = function(helpers, done) { var template = require('./template.marko'); diff --git a/widgets/test/autotests-server/getRenderedWidgets/widget.js b/test/autotests/widgets-server/getRenderedWidgets/widget.js similarity index 100% rename from widgets/test/autotests-server/getRenderedWidgets/widget.js rename to test/autotests/widgets-server/getRenderedWidgets/widget.js diff --git a/widgets/test/autotests-server/invalid-missing-template/template.marko b/test/autotests/widgets-server/invalid-missing-template/template.marko similarity index 100% rename from widgets/test/autotests-server/invalid-missing-template/template.marko rename to test/autotests/widgets-server/invalid-missing-template/template.marko diff --git a/widgets/test/autotests-server/invalid-missing-template/test.js b/test/autotests/widgets-server/invalid-missing-template/test.js similarity index 86% rename from widgets/test/autotests-server/invalid-missing-template/test.js rename to test/autotests/widgets-server/invalid-missing-template/test.js index 275b6b0dd..7df3d2cf2 100644 --- a/widgets/test/autotests-server/invalid-missing-template/test.js +++ b/test/autotests/widgets-server/invalid-missing-template/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var defineComponent = require('marko-widgets').defineComponent; + var defineComponent = require('marko/widgets').defineComponent; expect(function() { defineComponent({ // template: require.resolve('./template.marko'), diff --git a/widgets/test/autotests-server/invalid-missing-template/widget.js b/test/autotests/widgets-server/invalid-missing-template/widget.js similarity index 100% rename from widgets/test/autotests-server/invalid-missing-template/widget.js rename to test/autotests/widgets-server/invalid-missing-template/widget.js diff --git a/widgets/test/autotests-server/invalid-w-id/template.marko b/test/autotests/widgets-server/invalid-w-id/template.marko similarity index 100% rename from widgets/test/autotests-server/invalid-w-id/template.marko rename to test/autotests/widgets-server/invalid-w-id/template.marko diff --git a/widgets/test/autotests-server/invalid-w-id/test.js b/test/autotests/widgets-server/invalid-w-id/test.js similarity index 100% rename from widgets/test/autotests-server/invalid-w-id/test.js rename to test/autotests/widgets-server/invalid-w-id/test.js diff --git a/widgets/test/autotests-server/invalid-w-id/widget.js b/test/autotests/widgets-server/invalid-w-id/widget.js similarity index 100% rename from widgets/test/autotests-server/invalid-w-id/widget.js rename to test/autotests/widgets-server/invalid-w-id/widget.js diff --git a/widgets/test/autotests-server/w-bind-missing-widget/index.foo b/test/autotests/widgets-server/w-bind-missing-widget/index.foo similarity index 56% rename from widgets/test/autotests-server/w-bind-missing-widget/index.foo rename to test/autotests/widgets-server/w-bind-missing-widget/index.foo index a627b019c..91f0e3a92 100644 --- a/widgets/test/autotests-server/w-bind-missing-widget/index.foo +++ b/test/autotests/widgets-server/w-bind-missing-widget/index.foo @@ -1,4 +1,4 @@ -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko/widgets').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/widgets/test/autotests-server/w-bind-missing-widget/template.marko b/test/autotests/widgets-server/w-bind-missing-widget/template.marko similarity index 100% rename from widgets/test/autotests-server/w-bind-missing-widget/template.marko rename to test/autotests/widgets-server/w-bind-missing-widget/template.marko diff --git a/widgets/test/autotests-server/w-bind-missing-widget/test.js b/test/autotests/widgets-server/w-bind-missing-widget/test.js similarity index 100% rename from widgets/test/autotests-server/w-bind-missing-widget/test.js rename to test/autotests/widgets-server/w-bind-missing-widget/test.js diff --git a/widgets/test/browser-tests-runner/.jshintrc b/test/browser-tests-runner/.jshintrc similarity index 100% rename from widgets/test/browser-tests-runner/.jshintrc rename to test/browser-tests-runner/.jshintrc diff --git a/widgets/test/browser-tests-runner/cli.js b/test/browser-tests-runner/cli.js similarity index 93% rename from widgets/test/browser-tests-runner/cli.js rename to test/browser-tests-runner/cli.js index 9cf190cf7..be0f2ac2c 100644 --- a/widgets/test/browser-tests-runner/cli.js +++ b/test/browser-tests-runner/cli.js @@ -1,3 +1,5 @@ +require('../util/patch-module'); + require('marko/node-require').install(); var path = require('path'); var fs = require('fs'); @@ -17,7 +19,7 @@ if (options.testsFile) { } function populatePageOptions(pageName) { - var pageDir = path.join(__dirname, '../autotests-pages', pageName); + var pageDir = path.join(__dirname, '../autotests/widgets-pages', pageName); var pageTemplate = path.join(pageDir, 'template.marko'); options.pageTemplate = require(pageTemplate); options.generatedDir = './page-' + pageName; @@ -37,7 +39,7 @@ function go() { } if (options.pages) { - var pageNames = fs.readdirSync(path.resolve(__dirname, '../autotests-pages')); + var pageNames = fs.readdirSync(path.resolve(__dirname, '../autotests/widgets-pages')); var promise = pageNames.reduce(function(previousValue, pageName) { return previousValue .then(() => { diff --git a/widgets/test/browser-tests-runner/index.js b/test/browser-tests-runner/index.js similarity index 99% rename from widgets/test/browser-tests-runner/index.js rename to test/browser-tests-runner/index.js index 049b5f3a5..27d3a63ae 100644 --- a/widgets/test/browser-tests-runner/index.js +++ b/test/browser-tests-runner/index.js @@ -34,7 +34,7 @@ function generate(options) { "require-run: " + require.resolve('./mocha-setup'), 'require-run: ' + testsFile, "require: jquery", - "require: marko-widgets", + "require: marko/widgets", { "require-run": require.resolve('./mocha-run'), "slot": "mocha-run" diff --git a/widgets/test/browser-tests-runner/lasso-autotest-plugin.js b/test/browser-tests-runner/lasso-autotest-plugin.js similarity index 100% rename from widgets/test/browser-tests-runner/lasso-autotest-plugin.js rename to test/browser-tests-runner/lasso-autotest-plugin.js diff --git a/widgets/test/browser-tests-runner/mocha-run.js b/test/browser-tests-runner/mocha-run.js similarity index 100% rename from widgets/test/browser-tests-runner/mocha-run.js rename to test/browser-tests-runner/mocha-run.js diff --git a/widgets/test/browser-tests-runner/mocha-setup.js b/test/browser-tests-runner/mocha-setup.js similarity index 100% rename from widgets/test/browser-tests-runner/mocha-setup.js rename to test/browser-tests-runner/mocha-setup.js diff --git a/widgets/test/browser-tests-runner/page-template.marko b/test/browser-tests-runner/page-template.marko similarity index 100% rename from widgets/test/browser-tests-runner/page-template.marko rename to test/browser-tests-runner/page-template.marko diff --git a/test/browser-tests-runner/page-template.marko.js b/test/browser-tests-runner/page-template.marko.js new file mode 100644 index 000000000..0d50cfdb3 --- /dev/null +++ b/test/browser-tests-runner/page-template.marko.js @@ -0,0 +1,40 @@ +function create(__markoHelpers) { + var marko_loadTag = __markoHelpers.t, + lasso_page_tag = marko_loadTag(require("lasso/taglib/page-tag")), + lasso_head_tag = marko_loadTag(require("lasso/taglib/head-tag")), + lasso_body_tag = marko_loadTag(require("lasso/taglib/body-tag")), + init_widgets_tag = marko_loadTag(require("marko/widgets/taglib/init-widgets-tag")), + lasso_slot_tag = marko_loadTag(require("lasso/taglib/slot-tag")), + browser_refresh_tag = marko_loadTag(require("browser-refresh-taglib/refresh-tag")); + + return function render(data, out) { + lasso_page_tag({ + dependencies: data.browserDependencies, + lasso: data.lasso, + dirname: __dirname, + filename: __filename + }, out); + + out.w("Marko Widgets Tests"); + + lasso_head_tag({}, out); + + out.w("
"); + + lasso_body_tag({}, out); + + init_widgets_tag({ + immediate: true + }, out); + + lasso_slot_tag({ + name: "mocha-run" + }, out); + + browser_refresh_tag({}, out); + + out.w(""); + }; +} + +module.exports = require("marko/html").c(__filename, create); diff --git a/test/codegen-test.js b/test/codegen-test.js index b319dfb0a..0e1d84131 100644 --- a/test/codegen-test.js +++ b/test/codegen-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/compiler-test.js b/test/compiler-test.js index 7e5f2211c..01d81b484 100644 --- a/test/compiler-test.js +++ b/test/compiler-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/express-test.js b/test/express-test.js index 69d35c269..d1b523388 100644 --- a/test/express-test.js +++ b/test/express-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/expression-toString-test.js b/test/expression-toString-test.js index 0784ab459..eaa2fa67a 100644 --- a/test/expression-toString-test.js +++ b/test/expression-toString-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/hot-reload-test.js b/test/hot-reload-test.js index 63c6458af..fb0461eed 100644 --- a/test/hot-reload-test.js +++ b/test/hot-reload-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('../node-require').install(); var chai = require('chai'); diff --git a/test/inline-test.js b/test/inline-test.js index 473fc6a13..7147ce55d 100644 --- a/test/inline-test.js +++ b/test/inline-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/markoc-tests.js b/test/markoc-tests.js index 796258e8e..082b53662 100644 --- a/test/markoc-tests.js +++ b/test/markoc-tests.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('marko/node-require').install(); var chai = require('chai'); diff --git a/widgets/test/package.json b/test/package.json similarity index 64% rename from widgets/test/package.json rename to test/package.json index 9069d23f1..a12238551 100644 --- a/widgets/test/package.json +++ b/test/package.json @@ -1,9 +1,8 @@ { - "name": "marko-widgets-test", + "name": "marko-test", "version": "1.0.0", "dependencies": { "lasso": "*", - "marko-widgets": "*", "browser-refresh-taglib": "*" } } diff --git a/test/parseExpression-test.js b/test/parseExpression-test.js index 1676156e5..36bb424c7 100644 --- a/test/parseExpression-test.js +++ b/test/parseExpression-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/parseFor-test.js b/test/parseFor-test.js index cf98f7541..1a996a44c 100644 --- a/test/parseFor-test.js +++ b/test/parseFor-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/parseJavaScriptArgs-test.js b/test/parseJavaScriptArgs-test.js index db33ffada..39d80a255 100644 --- a/test/parseJavaScriptArgs-test.js +++ b/test/parseJavaScriptArgs-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/parser-test.js b/test/parser-test.js index 82512e18c..60da7a122 100644 --- a/test/parser-test.js +++ b/test/parser-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/pretty-print-test.js b/test/pretty-print-test.js index ab3959b71..448f6f027 100644 --- a/test/pretty-print-test.js +++ b/test/pretty-print-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/render-test.js b/test/render-test.js index c61bc5cd0..b0f5d5728 100644 --- a/test/render-test.js +++ b/test/render-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/taglib-finder-test.js b/test/taglib-finder-test.js index 2643a9f1e..46d4553de 100644 --- a/test/taglib-finder-test.js +++ b/test/taglib-finder-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/taglib-loader-test.js b/test/taglib-loader-test.js index 719885779..c08feb62d 100644 --- a/test/taglib-loader-test.js +++ b/test/taglib-loader-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/taglib-lookup-test.js b/test/taglib-lookup-test.js index d799c2077..c785e4ac0 100644 --- a/test/taglib-lookup-test.js +++ b/test/taglib-lookup-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/widgets/test/util/autotest/index.js b/test/util/autotest/index.js similarity index 100% rename from widgets/test/util/autotest/index.js rename to test/util/autotest/index.js diff --git a/widgets/test/util/autotest/node-require.js b/test/util/autotest/node-require.js similarity index 100% rename from widgets/test/util/autotest/node-require.js rename to test/util/autotest/node-require.js diff --git a/widgets/test/util/autotest/package.json b/test/util/autotest/package.json similarity index 100% rename from widgets/test/util/autotest/package.json rename to test/util/autotest/package.json diff --git a/widgets/test/util/autotest/test-filter.js b/test/util/autotest/test-filter.js similarity index 100% rename from widgets/test/util/autotest/test-filter.js rename to test/util/autotest/test-filter.js diff --git a/test/patch-module.js b/test/util/patch-module.js similarity index 92% rename from test/patch-module.js rename to test/util/patch-module.js index 23ceed184..a18d4c0f1 100644 --- a/test/patch-module.js +++ b/test/util/patch-module.js @@ -3,7 +3,7 @@ var nodePath = require('path'); var Module = require('module').Module; var oldResolveFilename = Module._resolveFilename; -var rootDir = nodePath.join(__dirname, '../'); +var rootDir = nodePath.join(__dirname, '../../'); Module._resolveFilename = function(request, parent, isMain) { if (request.charAt(0) !== '.') { diff --git a/widgets/test/util/pubsub.js b/test/util/pubsub.js similarity index 100% rename from widgets/test/util/pubsub.js rename to test/util/pubsub.js diff --git a/test/vdom-async-render-test.js b/test/vdom-async-render-test.js index dbf730a9c..548e925f3 100644 --- a/test/vdom-async-render-test.js +++ b/test/vdom-async-render-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); require('../node-require').install(); var chai = require('chai'); diff --git a/test/vdom-compiler-test.js b/test/vdom-compiler-test.js index b3a3b7213..b02307c10 100644 --- a/test/vdom-compiler-test.js +++ b/test/vdom-compiler-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/vdom-render-test.js b/test/vdom-render-test.js index d5e37680e..1a9f63ad9 100644 --- a/test/vdom-render-test.js +++ b/test/vdom-render-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/test/walker-test.js b/test/walker-test.js index 1048c6fd1..d95135e20 100644 --- a/test/walker-test.js +++ b/test/walker-test.js @@ -1,5 +1,5 @@ 'use strict'; -require('./patch-module'); +require('./util/patch-module'); var chai = require('chai'); chai.config.includeStack = true; diff --git a/widgets/test/browser-tests.js b/test/widgets-browser-tests.js similarity index 97% rename from widgets/test/browser-tests.js rename to test/widgets-browser-tests.js index a6ab8bf8a..06ee4585d 100644 --- a/widgets/test/browser-tests.js +++ b/test/widgets-browser-tests.js @@ -86,7 +86,7 @@ BrowserHelpers.prototype = { if (typeof window !== 'undefined') { describe('marko-widgets (browser)', function() { require('./util/autotest').runTests( - require('./autotests-browser/autotests.tests'), + require('./autotests/widgets-browser/autotests.tests'), function run(testFunc, done) { var helpers = new BrowserHelpers(); diff --git a/widgets/test/compilation-tests.js b/test/widgets-compilation-tests.js similarity index 95% rename from widgets/test/compilation-tests.js rename to test/widgets-compilation-tests.js index 70a618f7d..043196a2c 100644 --- a/widgets/test/compilation-tests.js +++ b/test/widgets-compilation-tests.js @@ -8,7 +8,7 @@ require('marko/node-require').install(); require('./util/patch-module'); describe('marko-widgets (compilation)', function() { - var testsPath = path.join(__dirname, './autotests-compilation'); + var testsPath = path.join(__dirname, './autotests/widgets-compilation'); var tests = fs.readdirSync(testsPath); tests.forEach(function(testName) { @@ -50,5 +50,5 @@ describe('marko-widgets (compilation)', function() { done(); } }); - }) + }); }); \ No newline at end of file diff --git a/widgets/test/server-tests.js b/test/widgets-server-tests.js similarity index 87% rename from widgets/test/server-tests.js rename to test/widgets-server-tests.js index f9481a075..671264d4d 100644 --- a/widgets/test/server-tests.js +++ b/test/widgets-server-tests.js @@ -3,7 +3,7 @@ require('./util/patch-module'); describe('marko-widgets (server)', function() { require('./util/autotest').runTests( - require('./autotests-server/autotests.tests'), + require('./autotests/widgets-server/autotests.tests'), function run(testFunc, done) { var helpers = {}; diff --git a/widgets/.gitignore b/widgets/.gitignore deleted file mode 100644 index b086297af..000000000 --- a/widgets/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -/work -/build -/.idea/ -/npm-debug.log -/node_modules -/test/node_modules -/*.sublime-workspace -*.orig -.DS_Store -coverage -*.actual.js -*.actual.html -*.marko.js -/.cache -.cache -/test/generated/ -.marko-devtools/ \ No newline at end of file diff --git a/widgets/.travis.yml b/widgets/.travis.yml deleted file mode 100644 index 4218a0f4d..000000000 --- a/widgets/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -sudo: false -node_js: -- "4" -- "5" -- "6" -- "7" -language: node_js -# Use latest version of npm -before_install: npm install -g npm@* -script: "npm test" diff --git a/widgets/CHANGELOG.md b/widgets/CHANGELOG.md deleted file mode 100644 index ab7a70cb6..000000000 --- a/widgets/CHANGELOG.md +++ /dev/null @@ -1,364 +0,0 @@ -CHANGELOG -========= - -# 6.x - -## 6.3.x - -### v6.3.5 - -- Fixed [#160](https://github.com/marko-js/marko-widgets/issues/160) - Listeners for event delegation do not work if `document.body` is not available - -### v6.3.4 - -- Fixed [#154](https://github.com/marko-js/marko-widgets/issues/154) - Listeners for event delegation do not work if `document.body` is not available - -### v6.3.3 - -- Fixed [#153](https://github.com/marko-js/marko-widgets/issues/153) - Bubbling event listeners used by event delegation system are attached too late - -### v6.3.2 - -- Upgraded to `raptor-util@2` - -### v6.3.1 - -- Fixed regression where `code` was note being returned from `getInitWidgetsCode`. - -### v6.3.0 - -- Fixed [#150](https://github.com/marko-js/marko-widgets/issues/150) - Integrated [warp10](https://github.com/patrick-steele-idem/warp10) for high performance state/config serialization. Circular dependencies are now supported and duplicate objects are only serialized once. - -## 6.2.x - -### v6.2.2 - -- Revert back to `morphdom@^1` until more testing can be done - -### v6.2.1 - -- Fixes #147 - Immediate widget initialization not working correctly with client reordering enabled - -### v6.2.0 - -- Throw an error if a widget fails to initialize because DOM el is missing -- Upgrade to `morphdom@2` - -## 6.1.x - -### v6.1.3 - -- Fixed #144 - ready callback invoked multiple times when using jQuery proxy -- Refactored testing harness - -### v6.1.2 - -- Fixed #141 - w-preserve-if/w-preserve-body-if broken - -### v6.1.1 - -- Fixed #137 - A widget should not update the DOM if it is destroyed (fixed by [@avigy](https://github.com/avigy)) - -### v6.1.0 - -- Use [lasso-modules-client](https://github.com/lasso-js/lasso-modules-client) for generating client-side widget module paths - -## 6.0.x - -### v6.0.2 - -- Upgraded test dependencies - -### v6.0.1 - -- Improve how client-side module paths are generated when lasso is available - -### v6.0.0 - -- Marko v3 compatibility - -# 5.x - -## 5.3.x - -### v5.3.0 - -- Fixes [#121](https://github.com/marko-js/marko-widgets/issues/121) - Allow for w-preserve-attrs to enable preservation of attributes: - -```html -
-``` - -## 5.2.x - -### v5.2.2 - -- The function for generating unique widget IDs on the client-side is not - exported as a global on the `window` object (fixes #118). - -### 5.2.0 - - - Fixes #116 - Bug in browserify breaks browserify compatibility (workaround required) - - Use `