From 69b3ff57c829418946e05c13b644a5560f589086 Mon Sep 17 00:00:00 2001 From: dpiercey Date: Tue, 9 Jan 2024 14:20:34 -0700 Subject: [PATCH] chore: reformat files --- .changeset/lazy-worms-wash.md | 8 ++ packages/babel-utils/index.d.ts | 62 +++++----- packages/babel-utils/src/assert.js | 6 +- packages/babel-utils/src/diagnostics.js | 2 +- packages/babel-utils/src/imports.js | 18 +-- packages/babel-utils/src/parse.js | 24 ++-- packages/babel-utils/src/tags.js | 26 +++-- packages/babel-utils/src/template-string.js | 4 +- packages/compiler/babel-types.d.ts | 1 + packages/compiler/config.d.ts | 2 +- packages/compiler/index.d.ts | 14 +-- packages/compiler/register.d.ts | 2 +- .../compiler/scripts/types-babel-traverse.js | 18 +-- packages/compiler/src/babel-plugin/index.js | 32 +++--- packages/compiler/src/babel-plugin/parser.js | 96 ++++++++-------- .../src/babel-types/generator/patch.js | 2 +- .../src/babel-types/traverse/patch.js | 6 +- .../src/babel-types/types/definitions.js | 10 +- .../compiler/src/babel-types/types/patch.js | 8 +- packages/compiler/src/index.js | 6 +- packages/compiler/src/register.js | 6 +- packages/compiler/src/taglib/finder/index.js | 4 +- packages/compiler/src/taglib/index.js | 16 +-- packages/compiler/src/taglib/loader/Taglib.js | 2 +- packages/compiler/src/taglib/loader/index.js | 6 +- .../src/taglib/loader/json-file-reader.js | 4 +- .../taglib/loader/loadAttributeFromProps.js | 4 +- .../src/taglib/loader/loadAttributes.js | 2 +- .../src/taglib/loader/loadTagFromFile.js | 7 +- .../src/taglib/loader/loadTagFromProps.js | 30 ++--- .../src/taglib/loader/loadTaglibFromDir.js | 7 +- .../src/taglib/loader/loadTaglibFromFile.js | 7 +- .../src/taglib/loader/loadTaglibFromProps.js | 38 +++--- .../src/taglib/loader/property-handlers.js | 2 +- .../compiler/src/taglib/loader/scanTagsDir.js | 4 +- packages/compiler/src/taglib/lookup/index.js | 6 +- .../compiler/src/util/build-code-frame.js | 6 +- packages/marko/bin/markoc.js | 71 ++++++------ .../marko/docs/10-awesome-marko-features.md | 2 +- packages/marko/docs/class-components.md | 2 +- packages/marko/docs/compiler.md | 4 +- packages/marko/docs/http.md | 2 +- packages/marko/docs/lasso.md | 2 +- packages/marko/docs/marko-vs-react.md | 2 +- packages/marko/docs/rendering.md | 2 +- packages/marko/docs/rollup.md | 8 +- packages/marko/docs/why-is-marko-fast.md | 2 +- packages/marko/index.d.ts | 92 +++++++-------- packages/marko/src/compiler/index.js | 12 +- .../src/core-tags/core/await/AsyncValue.js | 2 +- .../core/await/client-reorder-runtime.js | 2 +- .../src/core-tags/core/await/renderer.js | 2 +- .../core/await/reorderer-renderer.js | 8 +- .../marko/src/node-require/browser-refresh.js | 2 +- packages/marko/src/node-require/hot-reload.js | 4 +- packages/marko/src/node-require/index.js | 6 +- packages/marko/src/runtime/RenderResult.js | 6 +- .../marko/src/runtime/components/Component.js | 43 ++++--- .../src/runtime/components/ComponentDef.js | 2 +- .../marko/src/runtime/components/State.js | 4 +- .../src/runtime/components/defineComponent.js | 4 +- .../runtime/components/event-delegation.js | 2 +- .../legacy/defineRenderer-legacy.js | 6 +- .../components/legacy/dependencies/html.js | 2 +- .../components/legacy/dependencies/index.js | 4 +- .../components/legacy/dependencies/vdom.js | 2 +- .../components/legacy/renderer-legacy.js | 28 ++--- .../marko/src/runtime/components/renderer.js | 20 ++-- .../marko/src/runtime/helpers/_change-case.js | 2 +- .../marko/src/runtime/helpers/dynamic-tag.js | 22 ++-- .../marko/src/runtime/helpers/render-tag.js | 4 +- .../marko/src/runtime/html/AsyncStream.js | 16 +-- .../marko/src/runtime/html/BufferedWriter.js | 2 +- .../marko/src/runtime/html/helpers/attr.js | 2 +- .../marko/src/runtime/html/helpers/attrs.js | 2 +- .../src/runtime/html/helpers/class-attr.js | 2 +- .../src/runtime/html/helpers/data-marko.js | 2 +- .../src/runtime/html/helpers/merge-attrs.js | 4 +- .../src/runtime/html/helpers/style-attr.js | 2 +- packages/marko/src/runtime/html/index.js | 4 +- packages/marko/src/runtime/queueMicrotask.js | 8 +- packages/marko/src/runtime/renderable.js | 6 +- .../src/runtime/vdom/AsyncVDOMBuilder.js | 18 +-- packages/marko/src/runtime/vdom/VComponent.js | 2 +- .../src/runtime/vdom/VDocumentFragment.js | 4 +- packages/marko/src/runtime/vdom/VElement.js | 22 ++-- packages/marko/src/runtime/vdom/VFragment.js | 4 +- packages/marko/src/runtime/vdom/VText.js | 2 +- .../marko/src/runtime/vdom/helpers/attrs.js | 2 +- .../src/runtime/vdom/helpers/v-element.js | 2 +- packages/marko/src/runtime/vdom/hot-reload.js | 4 +- packages/marko/src/runtime/vdom/index.js | 4 +- .../src/runtime/vdom/morphdom/fragment.js | 4 +- .../src/runtime/vdom/morphdom/helpers.js | 4 +- .../marko/src/runtime/vdom/morphdom/index.js | 54 ++++----- .../vdom/morphdom/specialElHandlers.js | 2 +- packages/marko/src/runtime/vdom/vdom.js | 8 +- packages/marko/src/taglib/index.js | 4 +- .../marko/test/__util__/BrowserHelpers.js | 6 +- packages/marko/test/__util__/async-helpers.js | 2 +- .../__util__/create-marko-jsdom-module.js | 2 +- packages/marko/test/__util__/domToHTML.js | 8 +- packages/marko/test/__util__/domToString.js | 5 +- packages/marko/test/__util__/patch-module.js | 4 +- .../compileFileForBrowser-callback.js/test.js | 2 +- .../compileForBrowser-callback.js/test.js | 2 +- .../marko/test/api-compiler/index.test.js | 2 +- .../api/fixtures/load-render-callback/test.js | 2 +- .../fixtures/no-write-to-disk-load/test.js | 2 +- .../fixtures/no-write-to-disk-require/test.js | 2 +- .../test.js | 4 +- .../test.js | 2 +- .../require-compiled-template/test.js | 2 +- .../fixtures/require-render-callback/test.js | 2 +- packages/marko/test/api/index.test.js | 2 +- .../marko/test/async-stream/index.test.js | 24 ++-- .../test/async-vdom-builder/index.test.js | 4 +- .../fixtures/append-prepend/test.js | 2 +- .../test.js | 2 +- .../fixtures/component-dom-events/test.js | 4 +- .../test.js | 6 +- .../test.js | 6 +- .../test.js | 4 +- .../component-preserve-dom-if/test.js | 2 +- .../component-render-to-iframe/component.js | 2 +- .../component.js | 2 +- .../fixtures/component-renderToString/test.js | 2 +- .../test.js | 8 +- .../fixtures/component-transclusion/test.js | 4 +- .../test.js | 2 +- .../custom-events-declarative/test.js | 2 +- .../test.js | 4 +- .../test.js | 4 +- .../test.js | 4 +- .../fixtures/dynamic-tag-preserve-old/test.js | 8 +- .../fixtures/event-attach-el-function/test.js | 4 +- .../fixtures/event-attach-el/test.js | 6 +- .../test.js | 10 +- .../event-handler-custom-args/test.js | 4 +- .../test.js | 4 +- .../for-first-el-key-cache-value/test.js | 2 +- .../fixtures/include-preserve-old/test.js | 8 +- .../fixtures/input-no-change-nested/test.js | 12 +- .../input-persisted-nested-component/test.js | 12 +- .../fixtures/input-persisted/test.js | 4 +- .../fixtures/insert-before-after/test.js | 2 +- .../keyed-matching-transcluded/test.js | 2 +- .../test.js | 12 +- .../test.js | 12 +- .../fixtures/preserve-dom-body-no-id/test.js | 12 +- .../preserve-dom-body-shared-key/test.js | 4 +- .../fixtures/preserve-dom-body/test.js | 12 +- .../preserve-dom-conditional-before/test.js | 12 +- .../fixtures/preserve-dom-loop/test.js | 4 +- .../fixtures/preserve-dom-no-id/test.js | 12 +- .../preserve-dom-transcluded-autokey/test.js | 12 +- .../preserve-dom-transcluded-userkey/test.js | 12 +- .../fixtures/preserve-dom/test.js | 12 +- .../test.js | 4 +- .../fixtures/server-client-mismatch/test.js | 4 +- .../fixtures/tag-empty/test.js | 2 +- .../fixtures/textarea/test.js | 2 +- .../test/components-browser/index.test.js | 2 +- .../components/app-hello-async/renderer.js | 2 +- .../fixtures/component-globals-async/tests.js | 4 +- .../tests.js | 2 +- .../component-mount-root-renderBody/tests.js | 2 +- .../fixtures/custom-events/tests.js | 4 +- .../fixtures/dom-events-bubbling/tests.js | 2 +- .../fixtures/dom-events/tests.js | 10 +- .../fixtures/getRenderedComponents/tests.js | 4 +- .../fixtures/implicit-component-root/tests.js | 2 +- .../fixtures/no-update/tests.js | 12 +- .../preserve-no-update-for-loop/tests.js | 2 +- .../repeated-list-items-unkeyed/tests.js | 32 +++--- .../fixtures/split-emit-multi-args/tests.js | 2 +- .../components-pages/fixtures/xss/tests.js | 4 +- .../marko/test/components-pages/index.test.js | 2 +- .../fixtures/scriptConcat/test.js | 2 +- packages/marko/test/hot-reload/index.test.js | 3 +- .../fixtures/compiles/test.js | 2 +- .../test.js | 2 +- packages/marko/test/morphdom/index.test.js | 11 +- .../marko/test/node-require/index.test.js | 10 +- .../await-args-merge/test.js | 2 +- .../await-client-reorder-cspnonce/test.js | 2 +- .../await-client-reorder-invoked-once/test.js | 2 +- .../await-client-reorder-mixed/test.js | 2 +- .../await-client-reorder-nested/test.js | 2 +- .../await-client-reorder-sync/test.js | 2 +- .../await-client-reorder/test.js | 2 +- .../await-timeout/test.js | 2 +- .../await-client-reorder-cspnonce/test.js | 2 +- .../await-client-reorder-invoked-once/test.js | 2 +- .../await-client-reorder-mixed/test.js | 2 +- .../await-client-reorder-nested/test.js | 2 +- .../await-client-reorder-sync/test.js | 2 +- .../fixtures/await-client-reorder/test.js | 2 +- .../render/fixtures/await-timeout/test.js | 2 +- .../tags/test-default-attributes/renderer.js | 2 +- .../tags/test-nested-tags-tabs/renderer.js | 2 +- .../tags/test-nested-tags-tabs/renderer.js | 2 +- .../tags/test-nested-tags-overlay/renderer.js | 2 +- .../tags/test-nested-tags-tabs/renderer.js | 2 +- .../tags/test-nested-tags-tabs/renderer.js | 2 +- .../tags/test-nested-tags-overlay/renderer.js | 2 +- .../fixtures/syntax-concise/tabs/renderer.js | 2 +- .../fixtures/syntax-mixed/tabs/renderer.js | 2 +- .../fixtures/syntax-verbose/tabs/renderer.js | 2 +- .../render/fixtures/tags-dir-null/test.js | 7 +- packages/marko/test/render/index.test.js | 14 +-- .../marko/test/taglib-finder/index.test.js | 3 +- .../fixtures/custom-extensions/test.js | 2 +- .../test/taglib-loader/fixtures/paths/test.js | 10 +- .../fixtures/repeated-nested-tag/test.js | 2 +- .../fixtures/shorthand-attrs-and-tags/test.js | 4 +- .../taglib-lookup/fixtures/de-dupe/test.js | 2 +- .../fixtures/global-attrs/test.js | 2 +- .../appendDocumentFragment-children/index.js | 2 +- .../fixtures/attributes-null-false/index.js | 2 +- .../cloneNode-documentFragment/index.js | 2 +- .../vdom-create/fixtures/cloneNode/index.js | 6 +- .../fixtures/createAttributes/index.js | 2 +- .../doc-fragment-deeply-nested/index.js | 8 +- .../test/vdom-create/fixtures/id/index.js | 2 +- .../fixtures/input-checked/index.js | 2 +- .../fixtures/input-disabled/index.js | 2 +- .../vdom-create/fixtures/input-value/index.js | 2 +- .../isSameNode-createElement/index.js | 4 +- .../vdom-create/fixtures/no-children/index.js | 2 +- .../fixtures/option-selected/index.js | 2 +- .../fixtures/static-tree-svg/index.js | 12 +- .../vdom-create/fixtures/static-tree/index.js | 4 +- .../vdom-create/fixtures/svg-dynamic/index.js | 6 +- .../test/vdom-create/fixtures/svg/index.js | 4 +- .../fixtures/textarea-invalid-child/index.js | 2 +- .../vdom-create/fixtures/textarea/index.js | 2 +- packages/marko/test/vdom-create/index.test.js | 8 +- .../marko/test/vdom-virtualize/index.test.js | 4 +- .../src/cdata/index[html].js | 4 +- .../src/cdata/index[vdom].js | 2 +- packages/translator-default/src/class.js | 12 +- .../src/comment/index[html].js | 2 +- .../src/declaration/index[html].js | 2 +- .../src/document-type/index[html].js | 2 +- packages/translator-default/src/index.js | 108 +++++++++--------- .../src/placeholder/index[html].js | 12 +- .../src/placeholder/index[vdom].js | 4 +- .../src/tag/attribute-tag.js | 48 ++++---- .../src/tag/attribute/directives/class.js | 10 +- .../src/tag/attribute/directives/index.js | 4 +- .../attribute/directives/no-update-body-if.js | 2 +- .../tag/attribute/directives/no-update-if.js | 2 +- .../src/tag/attribute/directives/no-update.js | 8 +- .../src/tag/attribute/directives/style.js | 10 +- .../src/tag/attribute/index.js | 12 +- .../src/tag/attribute/modifiers/index.js | 2 +- .../src/tag/attribute/modifiers/scoped.js | 8 +- .../translator-default/src/tag/custom-tag.js | 28 ++--- .../translator-default/src/tag/dynamic-tag.js | 18 +-- packages/translator-default/src/tag/index.js | 18 +-- .../translator-default/src/tag/native-tag.js | 4 +- .../src/tag/native-tag[html]/attributes.js | 20 ++-- .../src/tag/native-tag[html]/index.js | 42 +++---- .../src/tag/native-tag[vdom]/attributes.js | 16 +-- .../src/tag/native-tag[vdom]/index.js | 61 ++++------ packages/translator-default/src/tag/util.js | 24 ++-- .../core/conditional/translate-else-if.js | 2 +- .../taglib/core/conditional/translate-else.js | 4 +- .../src/taglib/core/conditional/util.js | 4 +- .../src/taglib/core/index.js | 24 ++-- .../src/taglib/core/macro/parse.js | 2 +- .../src/taglib/core/macro/translate.js | 8 +- .../src/taglib/core/parse-class.js | 4 +- .../src/taglib/core/parse-module-code.js | 2 +- .../src/taglib/core/parse-static.js | 2 +- .../src/taglib/core/transform-style.js | 6 +- .../src/taglib/core/translate-await.js | 8 +- .../src/taglib/core/translate-body.js | 2 +- .../src/taglib/core/translate-for.js | 38 +++--- .../taglib/core/translate-include-content.js | 10 +- .../src/taglib/core/translate-while.js | 10 +- .../src/taglib/migrate/all-templates.js | 6 +- .../src/text/index[html].js | 2 +- .../src/text/index[vdom].js | 8 +- .../src/util/add-dependencies.js | 32 +++--- .../src/util/get-component-files.js | 2 +- .../src/util/html-out-write.js | 6 +- .../src/util/key-manager.js | 16 +-- .../src/util/optimize-vdom-create.js | 20 ++-- .../src/util/vdom-out-write.js | 4 +- .../components/hello/transformer.js | 2 +- .../custom-tag-migration/old.migrator.js | 6 +- .../custom-tag-transform/div.transformer.js | 8 +- .../translator-default/test/index.test.js | 27 +++-- scripts/babel-plugin-marko-debug.js | 6 +- 296 files changed, 1228 insertions(+), 1233 deletions(-) create mode 100644 .changeset/lazy-worms-wash.md diff --git a/.changeset/lazy-worms-wash.md b/.changeset/lazy-worms-wash.md new file mode 100644 index 0000000000..64502c40b9 --- /dev/null +++ b/.changeset/lazy-worms-wash.md @@ -0,0 +1,8 @@ +--- +"@marko/translator-default": patch +"@marko/babel-utils": patch +"@marko/compiler": patch +"marko": patch +--- + +Upgrade all package deps to latest diff --git a/packages/babel-utils/index.d.ts b/packages/babel-utils/index.d.ts index 9d6186a2f7..353ed578ab 100644 --- a/packages/babel-utils/index.d.ts +++ b/packages/babel-utils/index.d.ts @@ -74,11 +74,11 @@ export interface TaglibLookup { getTag(tagName: string): undefined | TagDefinition; getAttribute( tagName: string, - attrName: string + attrName: string, ): undefined | AttributeDefinition; forEachAttribute( tagName: string, - callback: (attr: AttributeDefinition, tag: TagDefinition) => void + callback: (attr: AttributeDefinition, tag: TagDefinition) => void, ): void; } @@ -143,7 +143,7 @@ export function defineTag(tag: T): T; export type FunctionPlugin = ( path: t.NodePath, - types: typeof t + types: typeof t, ) => void; type EnterExitPlugin = { enter?(path: t.NodePath, types: typeof t): void; @@ -161,7 +161,7 @@ export type Plugin = export function assertAllowedAttributes( path: t.NodePath, - allowed: string[] + allowed: string[], ): void; export function assertNoArgs(path: t.NodePath): void; export function assertNoVar(path: t.NodePath): void; @@ -180,31 +180,31 @@ export function registerMacro(path: t.NodePath, name: string): void; export function hasMacro(path: t.NodePath, name: string): boolean; export function getMacroIdentifierForName( path: t.NodePath, - name: string + name: string, ): t.Identifier; export function getMacroIdentifier(path: t.NodePath): t.Identifier; export function getTagDef( - path: t.NodePath + path: t.NodePath, ): TagDefinition | undefined; export function getFullyResolvedTagName(path: t.NodePath): string; export function findParentTag( - path: t.NodePath + path: t.NodePath, ): t.NodePath | undefined; export function findAttributeTags( - path: t.NodePath + path: t.NodePath, ): Array>; export function getArgOrSequence( - path: t.NodePath + path: t.NodePath, ): t.Expression; export function loadFileForTag( - path: t.NodePath + path: t.NodePath, ): t.BabelFile | undefined; export function loadFileForImport( file: t.BabelFile, - template: string + template: string, ): t.BabelFile | undefined; export function normalizeTemplateString( @@ -219,13 +219,13 @@ export function getLoc(file: t.BabelFile, pos: number): Loc; export function getLocRange( file: t.BabelFile, start: number, - end: number + end: number, ): LocRange; export function withLoc( file: t.BabelFile, node: T, start: number, - end: number + end: number, ): T; export function parseStatements(file: t.BabelFile, str: string): t.Statement[]; @@ -234,7 +234,7 @@ export function parseStatements( str: string, sourceStart: number, sourceEnd: number, - sourceOffset?: number + sourceOffset?: number, ): t.Statement[]; export function parseExpression(file: t.BabelFile, str: string): t.Expression; @@ -243,76 +243,76 @@ export function parseExpression( str: string, sourceStart: number, sourceEnd: number, - sourceOffset?: number + sourceOffset?: number, ): t.Expression; export function parseParams( file: t.BabelFile, - str: string + str: string, ): t.Function["params"]; export function parseParams( file: t.BabelFile, str: string, sourceStart: number, - sourceEnd: number + sourceEnd: number, ): t.Function["params"]; export function parseArgs( file: t.BabelFile, - str: string + str: string, ): t.CallExpression["arguments"]; export function parseArgs( file: t.BabelFile, str: string, sourceStart: number, - sourceEnd: number + sourceEnd: number, ): t.CallExpression["arguments"]; export function parseVar( file: t.BabelFile, - str: string + str: string, ): t.VariableDeclarator["id"]; export function parseVar( file: t.BabelFile, str: string, sourceStart: number, - sourceEnd: number + sourceEnd: number, ): t.VariableDeclarator["id"]; export function parseTemplateLiteral( file: t.BabelFile, - str: string + str: string, ): t.TemplateLiteral; export function parseTemplateLiteral( file: t.BabelFile, str: string, sourceStart: number, - sourceEnd: number + sourceEnd: number, ): t.TemplateLiteral; export function resolveRelativePath(file: t.BabelFile, request: string): string; export function importDefault( file: t.BabelFile, request: string, - nameHint?: string + nameHint?: string, ): t.Identifier; export function importNamed( file: t.BabelFile, request: string, name: string, - nameHint?: string + nameHint?: string, ): t.Identifier; export function getTaglibLookup(file: t.BabelFile): TaglibLookup; export function getTagDefForTagName( file: t.BabelFile, - tagName: string + tagName: string, ): TagDefinition | undefined; export function getTemplateId(optimize: boolean, request: string): string; export function resolveTagImport( path: t.NodePath, - request: string + request: string, ): string | undefined; export enum DiagnosticType { @@ -345,19 +345,19 @@ export interface DiagnosticOptions { export function diagnosticError( path: t.NodePath, - options: DiagnosticOptions + options: DiagnosticOptions, ): void; export function diagnosticWarn( path: t.NodePath, - options: DiagnosticOptions + options: DiagnosticOptions, ): void; export function diagnosticDeprecate( path: t.NodePath, - options: DiagnosticOptions + options: DiagnosticOptions, ): void; export function diagnosticSuggest( path: t.NodePath, - options: DiagnosticOptions + options: DiagnosticOptions, ): void; interface ConfirmFix { diff --git a/packages/babel-utils/src/assert.js b/packages/babel-utils/src/assert.js index 2fe80f90e5..e5086b321e 100644 --- a/packages/babel-utils/src/assert.js +++ b/packages/babel-utils/src/assert.js @@ -5,7 +5,7 @@ export function assertAllowedAttributes(path, allowed) { throw path .get(`attributes.${i}`) .buildCodeFrameError( - `Invalid "${node.name.value}" tag attribute: "${attr.name}".` + `Invalid "${node.name.value}" tag attribute: "${attr.name}".`, ); } }); @@ -22,7 +22,7 @@ export function assertNoParams(path) { const end = params[params.length - 1].loc.end; throw path.hub.buildError( { loc: { start, end } }, - "Tag does not support parameters." + "Tag does not support parameters.", ); } } @@ -44,7 +44,7 @@ export function assertNoArgs(path) { const end = args[args.length - 1].node.loc.end; throw hub.buildError( { loc: { start, end } }, - "Tag does not support arguments." + "Tag does not support arguments.", ); } } diff --git a/packages/babel-utils/src/diagnostics.js b/packages/babel-utils/src/diagnostics.js index 03da010790..d488df8781 100644 --- a/packages/babel-utils/src/diagnostics.js +++ b/packages/babel-utils/src/diagnostics.js @@ -30,7 +30,7 @@ function add(type, path, options) { if (rawFix) { if (file.___compileStage !== "migrate") { throw new Error( - "Diagnostic fixes can only be registered during the migrate stage." + "Diagnostic fixes can only be registered during the migrate stage.", ); } diff --git a/packages/babel-utils/src/imports.js b/packages/babel-utils/src/imports.js index 6d5e1379f5..04f41e41f9 100644 --- a/packages/babel-utils/src/imports.js +++ b/packages/babel-utils/src/imports.js @@ -13,7 +13,7 @@ export function resolveRelativePath(file, request) { if (file.markoOpts.optimize) { request = request.replace( /(^|\/node-modules\/)marko\/src\//, - "$1marko/dist/" + "$1marko/dist/", ); } @@ -30,8 +30,8 @@ export function importDefault(file, request, nameHint) { request, (importDeclaration = file.path.pushContainer( "body", - t.importDeclaration([], t.stringLiteral(request)) - )[0]) + t.importDeclaration([], t.stringLiteral(request)), + )[0]), ); } @@ -41,14 +41,14 @@ export function importDefault(file, request, nameHint) { const specifiers = importDeclaration.get("specifiers"); const specifier = specifiers.find((specifier) => - specifier.isImportDefaultSpecifier() + specifier.isImportDefaultSpecifier(), ); if (!specifier) { const identifier = file.scope.generateUidIdentifier(nameHint); importDeclaration.pushContainer( "specifiers", - t.importDefaultSpecifier(identifier) + t.importDefaultSpecifier(identifier), ); return identifier; } @@ -66,22 +66,22 @@ export function importNamed(file, request, name, nameHint = name) { request, (importDeclaration = file.path.pushContainer( "body", - t.importDeclaration([], t.stringLiteral(request)) - )[0]) + t.importDeclaration([], t.stringLiteral(request)), + )[0]), ); } const specifiers = importDeclaration.get("specifiers"); const specifier = specifiers.find( (specifier) => - specifier.isImportSpecifier() && specifier.node.imported.name === name + specifier.isImportSpecifier() && specifier.node.imported.name === name, ); if (!specifier) { const identifier = file.scope.generateUidIdentifier(nameHint); importDeclaration.pushContainer( "specifiers", - t.importSpecifier(identifier, t.identifier(name)) + t.importSpecifier(identifier, t.identifier(name)), ); return identifier; } diff --git a/packages/babel-utils/src/parse.js b/packages/babel-utils/src/parse.js index d75d471d9c..100378aaaf 100644 --- a/packages/babel-utils/src/parse.js +++ b/packages/babel-utils/src/parse.js @@ -1,6 +1,6 @@ import * as babelParser from "@babel/parser"; -import { getLocRange } from "./loc"; import { types as t } from "@marko/compiler"; +import { getLocRange } from "./loc"; const CODE_AS_WHITE_SPACE_KEY = Symbol(); @@ -9,7 +9,7 @@ export function parseStatements( str, sourceStart, sourceEnd, - sourceOffset + sourceOffset, ) { return tryParse(file, false, str, sourceStart, sourceEnd, sourceOffset); } @@ -19,7 +19,7 @@ export function parseExpression( str, sourceStart, sourceEnd, - sourceOffset + sourceOffset, ) { return tryParse(file, true, str, sourceStart, sourceEnd, sourceOffset); } @@ -30,7 +30,7 @@ export function parseParams(file, str, sourceStart, sourceEnd) { `(${str})=>{}`, sourceStart, sourceEnd, - 1 + 1, ); if (parsed.type === "ArrowFunctionExpression") { @@ -56,7 +56,7 @@ export function parseVar(file, str, sourceStart, sourceEnd) { `(${str})=>{}`, sourceStart, sourceEnd, - 1 + 1, ); if (parsed.type === "ArrowFunctionExpression" && parsed.params.length === 1) { @@ -72,7 +72,7 @@ export function parseTemplateLiteral(file, str, sourceStart, sourceEnd) { "`" + str + "`", sourceStart, sourceEnd, - 1 + 1, ); if (parsed.type === "TemplateLiteral") { @@ -99,7 +99,7 @@ export function parseTypeParams(file, str, sourceStart, sourceEnd) { `<${str}>()=>{}`, sourceStart, sourceEnd, - 1 + 1, ); if (parsed.type === "ArrowFunctionExpression") { @@ -115,7 +115,7 @@ function tryParse( str, sourceStart, sourceEnd, - sourceOffset + sourceOffset, ) { const { parserOpts } = file.opts; let code = str; @@ -125,12 +125,12 @@ function tryParse( file.metadata.marko[CODE_AS_WHITE_SPACE_KEY] || (file.metadata.marko[CODE_AS_WHITE_SPACE_KEY] = file.code.replace( /[^\s]/g, - " " + " ", )); code = whitespace.slice( 0, - sourceOffset ? sourceStart - sourceOffset : sourceStart + sourceOffset ? sourceStart - sourceOffset : sourceStart, ) + str; try { @@ -143,7 +143,7 @@ function tryParse( sourceStart, sourceEnd, err.message, - err.loc + err.loc, ); if (isExpression) { @@ -167,7 +167,7 @@ function ensureParseError(file, node, sourceStart, sourceEnd) { file, sourceStart, sourceEnd, - `Unexpected node of type ${node.type} returned while parsing.` + `Unexpected node of type ${node.type} returned while parsing.`, ); } diff --git a/packages/babel-utils/src/tags.js b/packages/babel-utils/src/tags.js index d367efd671..8cf7bab230 100644 --- a/packages/babel-utils/src/tags.js +++ b/packages/babel-utils/src/tags.js @@ -1,10 +1,10 @@ -import { basename, dirname, relative, resolve } from "path"; -import resolveFrom from "resolve-from"; import { createHash } from "crypto"; +import { basename, dirname, relative, resolve } from "path"; import { types as t } from "@marko/compiler"; import { getRootDir } from "lasso-package-root"; -import { getTagDefForTagName } from "./taglib"; +import resolveFrom from "resolve-from"; import { resolveRelativePath } from "./imports"; +import { getTagDefForTagName } from "./taglib"; const MACRO_IDS_KEY = Symbol(); const MACRO_NAMES_KEY = "__marko_macro_names__"; // must be a string literal since it is used across compiler stages. @@ -64,7 +64,7 @@ export function registerMacro(path, name) { if (macroNames) { if (macroNames[name]) { throw path.buildCodeFrameError( - `A macro with the name "${name}" already exists.` + `A macro with the name "${name}" already exists.`, ); } macroNames[name] = true; @@ -88,7 +88,7 @@ export function getMacroIdentifierForName(path, name) { if (file.___compileStage !== "translate") { throw new Error( - "getMacroIdentifierForName can only be called during the translate phase of the compiler." + "getMacroIdentifierForName can only be called during the translate phase of the compiler.", ); } @@ -107,7 +107,7 @@ export function getMacroIdentifierForName(path, name) { if (!id) { throw new Error( - " was added programmatically, but was not registered via the 'registerMacro' api in @marko/babel-utils." + " was added programmatically, but was not registered via the 'registerMacro' api in @marko/babel-utils.", ); } @@ -119,13 +119,13 @@ export function getMacroIdentifier(path) { if (file.___compileStage !== "translate") { throw new Error( - "getMacroIdentifier can only be called during the translate phase of the compiler." + "getMacroIdentifier can only be called during the translate phase of the compiler.", ); } if (!isMacroTag(path)) { throw path.buildCodeFrameError( - "getMacroIdentifier called on non macro referencing tag." + "getMacroIdentifier called on non macro referencing tag.", ); } @@ -145,7 +145,9 @@ export function getTagDef(path) { node.tagDef = getTagDefForTagName( file, - isAttributeTag(path) ? getFullyResolvedTagName(path) : node.name.value + isAttributeTag(path) + ? getFullyResolvedTagName(path) + : node.name.value, ) || null; } } @@ -247,7 +249,7 @@ export function loadFileForTag(tag) { return file.___getMarkoFile( fs.readFileSync(filename).toString("utf-8"), createNewFileOpts(file.opts, filename), - file.markoOpts + file.markoOpts, ); } } @@ -272,7 +274,7 @@ export function loadFileForImport(file, request) { return file.___getMarkoFile( fs.readFileSync(filename).toString("utf-8"), createNewFileOpts(file.opts, filename), - file.markoOpts + file.markoOpts, ); } } @@ -299,7 +301,7 @@ export function resolveTagImport(path, request) { if (!relativePath) { throw path.buildCodeFrameError( - `Unable to find entry point for custom tag <${tagName}>.` + `Unable to find entry point for custom tag <${tagName}>.`, ); } diff --git a/packages/babel-utils/src/template-string.js b/packages/babel-utils/src/template-string.js index 7d29fbf9c5..4770aaa95d 100644 --- a/packages/babel-utils/src/template-string.js +++ b/packages/babel-utils/src/template-string.js @@ -1,5 +1,5 @@ -import jsesc from "jsesc"; import { types as t } from "@marko/compiler"; +import jsesc from "jsesc"; export function normalizeTemplateString(quasis, ...expressions) { quasis = quasis.map((q) => (t.isTemplateElement(q) ? q.value.cooked : q)); @@ -13,7 +13,7 @@ export function normalizeTemplateString(quasis, ...expressions) { quasis.splice( i + 1, 0, - ...v.quasis.slice(1, -1).map((q) => q.value.cooked) + ...v.quasis.slice(1, -1).map((q) => q.value.cooked), ); expressions.splice(i, 1, ...v.expressions); i += v.expressions.length; diff --git a/packages/compiler/babel-types.d.ts b/packages/compiler/babel-types.d.ts index 310bd812de..ec68d1981e 100644 --- a/packages/compiler/babel-types.d.ts +++ b/packages/compiler/babel-types.d.ts @@ -1,3 +1,4 @@ +/* eslint-disable import/export */ import { Scope } from "./dist/traverse"; export * from "./dist/types"; export * from "./dist/traverse"; diff --git a/packages/compiler/config.d.ts b/packages/compiler/config.d.ts index 0e3e0f1667..d4c284b01e 100644 --- a/packages/compiler/config.d.ts +++ b/packages/compiler/config.d.ts @@ -18,7 +18,7 @@ declare const Config: { resolveVirtualDependency?: | (( filename: string, - dep: { virtualPath: string; code: string; map?: any } + dep: { virtualPath: string; code: string; map?: any }, ) => string) | null; hydrateIncludeImports?: RegExp | ((request: string) => boolean); diff --git a/packages/compiler/index.d.ts b/packages/compiler/index.d.ts index ebf8c301f1..9bce94f4ff 100644 --- a/packages/compiler/index.d.ts +++ b/packages/compiler/index.d.ts @@ -1,5 +1,5 @@ -import { SourceMap } from "magic-string"; import { Diagnostic, TaglibLookup } from "@marko/babel-utils"; +import { SourceMap } from "magic-string"; import * as types from "./babel-types"; export { types }; @@ -42,28 +42,28 @@ export function configure(config: Config): void; export function compile( src: string, filename: string, - config?: Config + config?: Config, ): Promise; export function compileSync( src: string, filename: string, - config?: Config + config?: Config, ): CompileResult; export function compileFile( filename: string, - config?: Config + config?: Config, ): Promise; export function compileFileSync( filename: string, - config?: Config + config?: Config, ): CompileResult; export function getRuntimeEntryFiles( output: string, - translator?: string | undefined + translator?: string | undefined, ): string[]; export namespace taglib { @@ -74,7 +74,7 @@ export namespace taglib { export function buildLookup( dirname: string, translator?: unknown, - onError?: (err: Error) => void + onError?: (err: Error) => void, ): TaglibLookup; export function clearCaches(): void; } diff --git a/packages/compiler/register.d.ts b/packages/compiler/register.d.ts index a13fd467b8..8a183239e2 100644 --- a/packages/compiler/register.d.ts +++ b/packages/compiler/register.d.ts @@ -2,5 +2,5 @@ import { Config } from "."; type Extensions = Partial; export default function register( - config: Config & { extensions?: Extensions } + config: Config & { extensions?: Extensions }, ): Extensions; diff --git a/packages/compiler/scripts/types-babel-traverse.js b/packages/compiler/scripts/types-babel-traverse.js index eec354d226..ef77395fd6 100644 --- a/packages/compiler/scripts/types-babel-traverse.js +++ b/packages/compiler/scripts/types-babel-traverse.js @@ -53,11 +53,11 @@ fs.readFile( (str) => { if (data.indexOf(str) === -1) { console.error( - `Unable to find \`${str}\` in @types/babel__traverse/index.d.ts` + `Unable to find \`${str}\` in @types/babel__traverse/index.d.ts`, ); process.exit(1); } - } + }, ); var result = data @@ -76,12 +76,12 @@ fs.readFile( } ${HUB_INTERFACE} - file: BabelFile;` + file: BabelFile;`, ) .replace( HUB_CLASS, `${HUB_CLASS} - file: BabelFile;` + file: BabelFile;`, ) .replace(IMPORT, `import * as t from './types'`) .replace(EXPORT_NODE, "type Node = t.Node") @@ -91,18 +91,18 @@ ${HUB_INTERFACE} IS + BREAK + MARKO_TYPES.map( - (t) => `is${t}(opts?: object | null): this is NodePath;` - ).join(BREAK) + (t) => `is${t}(opts?: object | null): this is NodePath;`, + ).join(BREAK), ) .replace( ASSERT, ASSERT + BREAK + MARKO_TYPES.map( - (t) => `assert${t}(opts?: object | null): void;` - ).join(BREAK) + (t) => `assert${t}(opts?: object | null): void;`, + ).join(BREAK), ); process.stdout.write(result); - } + }, ); diff --git a/packages/compiler/src/babel-plugin/index.js b/packages/compiler/src/babel-plugin/index.js index 8fc749f365..fee7e5da35 100644 --- a/packages/compiler/src/babel-plugin/index.js +++ b/packages/compiler/src/babel-plugin/index.js @@ -1,25 +1,25 @@ -import path from "path"; import { createHash } from "crypto"; -import * as t from "../babel-types"; -import { diagnosticError, getTemplateId } from "@marko/babel-utils"; +import path from "path"; import { visitors } from "@babel/traverse"; +import { diagnosticError, getTemplateId } from "@marko/babel-utils"; +import * as t from "../babel-types"; import { buildLookup } from "../taglib"; -import { parseMarko } from "./parser"; -import { visitor as migrate } from "./plugins/migrate"; -import { visitor as transform } from "./plugins/transform"; -import { MarkoFile } from "./file"; import taglibConfig from "../taglib/config"; -import tryLoadTranslator from "../util/try-load-translator"; -import shouldOptimize from "../util/should-optimize"; import { buildCodeFrameError } from "../util/build-code-frame"; import throwAggregateError from "../util/merge-errors"; +import shouldOptimize from "../util/should-optimize"; +import tryLoadTranslator from "../util/try-load-translator"; +import { MarkoFile } from "./file"; +import { parseMarko } from "./parser"; +import { visitor as migrate } from "./plugins/migrate"; +import { visitor as transform } from "./plugins/transform"; const SOURCE_FILES = new WeakMap(); export default (api, markoOpts) => { api.assertVersion(7); const translator = (markoOpts.translator = tryLoadTranslator( - markoOpts.translator + markoOpts.translator, )); markoOpts.output = markoOpts.output || "html"; @@ -30,7 +30,7 @@ export default (api, markoOpts) => { if (!translator || !translator.translate) { throw new Error( - "@marko/compiler: translator must provide a translate visitor object" + "@marko/compiler: translator must provide a translate visitor object", ); } @@ -39,7 +39,7 @@ export default (api, markoOpts) => { typeof markoOpts.resolveVirtualDependency !== "function" ) { throw new Error( - `@marko/compiler: the "resolveVirtualDependency" option must be supplied when output is "hydrate".` + `@marko/compiler: the "resolveVirtualDependency" option must be supplied when output is "hydrate".`, ); } @@ -100,7 +100,7 @@ export default (api, markoOpts) => { addPlugin( metadata.marko, rootTranslators, - taglibLookup.taglibsById[id].translator + taglibLookup.taglibsById[id].translator, ); } } @@ -127,7 +127,7 @@ export default (api, markoOpts) => { MarkoClass(path) { // We replace the MarkoClass with a regular class declaration so babel can strip it's types. path.replaceWith( - t.classDeclaration(t.identifier(""), null, path.node.body) + t.classDeclaration(t.identifier(""), null, path.node.body), ); }, ExportNamedDeclaration: { @@ -254,8 +254,8 @@ export function getMarkoFile(code, fileOpts, markoOpts) { file.opts.filename, file.code, node.errorLoc || node.loc, - node.label - ) + node.label, + ), ); } }); diff --git a/packages/compiler/src/babel-plugin/parser.js b/packages/compiler/src/babel-plugin/parser.js index 206e4e6d2c..1a228383b8 100644 --- a/packages/compiler/src/babel-plugin/parser.js +++ b/packages/compiler/src/babel-plugin/parser.js @@ -1,5 +1,3 @@ -import { TagType, createParser } from "htmljs-parser"; -import * as t from "../babel-types"; import { getTagDefForTagName, parseArgs, @@ -11,6 +9,8 @@ import { parseTypeParams, parseVar, } from "@marko/babel-utils"; +import { TagType, createParser } from "htmljs-parser"; +import * as t from "../babel-types"; const noop = () => {}; const emptyRange = (part) => part.start === part.end; @@ -75,7 +75,7 @@ export function parseMarko(file) { file, parser.read(value), value.start, - value.end + value.end, ); if (t.isStringLiteral(result)) { // convert to template literal just so that we don't mistake it for a native tag if this is a tag name. @@ -86,7 +86,7 @@ export function parseMarko(file) { cooked: result.value, }), ], - [] + [], ); } else { return result; @@ -204,7 +204,7 @@ export function parseMarko(file) { file, parser.read(part.value), part.value.start, - part.value.end + part.value.end, ); }, onTagTypeParams(part) { @@ -212,7 +212,7 @@ export function parseMarko(file) { file, parser.read(part.value), part.value.start, - part.value.end + part.value.end, ); }, onPlaceholder(part) { @@ -223,12 +223,12 @@ export function parseMarko(file) { file, parser.read(part.value), part.value.start, - part.value.end + part.value.end, ), - part.escape + part.escape, ), - part - ) + part, + ), ); }, onScriptlet(part) { @@ -239,11 +239,11 @@ export function parseMarko(file) { file, parser.read(part.value), part.value.start, - part.value.end - ) + part.value.end, + ), ), - part - ) + part, + ), ); }, onOpenTagName(part) { @@ -259,13 +259,13 @@ export function parseMarko(file) { if (literalTagName === "%") { throw file.buildCodeFrameError( tagName, - "<% scriptlets %> are no longer supported." + "<% scriptlets %> are no longer supported.", ); } const parseOptions = (node.tagDef = getTagDefForTagName( file, - literalTagName + literalTagName, ))?.parseOptions; if (parseOptions) { @@ -302,7 +302,7 @@ export function parseMarko(file) { file, parser.read(value), value.start, - value.end + value.end, ); }, @@ -311,7 +311,7 @@ export function parseMarko(file) { file, parser.read(value), value.start, - value.end + value.end, ); }, @@ -320,7 +320,7 @@ export function parseMarko(file) { file, parser.read(value), value.start, - value.end + value.end, ); }, @@ -333,8 +333,8 @@ export function parseMarko(file) { t.booleanLiteral(true), modifier, undefined, - !name - )) + !name, + )), ); currentAttr.start = part.start; @@ -346,7 +346,7 @@ export function parseMarko(file) { file, parser.read(value), value.start, - value.end + value.end, ); currentAttr.end = end; @@ -358,7 +358,7 @@ export function parseMarko(file) { currentAttr.value = parseExpression( file, parser.read(part.value), - part.value.start + part.value.start, ); }, @@ -371,18 +371,18 @@ export function parseMarko(file) { file, parser.read(part.params.value), part.params.value.start, - part.params.value.end + part.params.value.end, ), t.blockStatement( parseStatements( file, parser.read(part.body.value), part.body.value.start, - part.body.value.end - ) - ) + part.body.value.end, + ), + ), ), - part + part, ); }, @@ -391,10 +391,10 @@ export function parseMarko(file) { currentTag.node.attributes.push( withLoc( t.markoSpreadAttribute( - parseExpression(file, parser.read(part.value), part.value.start) + parseExpression(file, parser.read(part.value), part.value.start), ), - part - ) + part, + ), ); }, @@ -410,20 +410,22 @@ export function parseMarko(file) { currentShorthandClassNames.length === 1 ? currentShorthandClassNames[0] : currentShorthandClassNames.every((expr) => - t.isStringLiteral(expr) - ) - ? withLoc( - t.stringLiteral( - currentShorthandClassNames.map((node) => node.value).join(" ") - ), - { - start: currentShorthandClassNames[0].start, - end: currentShorthandClassNames[ - currentShorthandClassNames.length - 1 - ].end, - } - ) - : t.arrayExpression(currentShorthandClassNames); + t.isStringLiteral(expr), + ) + ? withLoc( + t.stringLiteral( + currentShorthandClassNames + .map((node) => node.value) + .join(" "), + ), + { + start: currentShorthandClassNames[0].start, + end: currentShorthandClassNames[ + currentShorthandClassNames.length - 1 + ].end, + }, + ) + : t.arrayExpression(currentShorthandClassNames); for (const attr of attributes) { if (attr.name === "class") { @@ -461,12 +463,12 @@ export function parseMarko(file) { if (attr.name === "id") { throw file.buildCodeFrameError( attr, - "Cannot have shorthand id and id attribute." + "Cannot have shorthand id and id attribute.", ); } } currentTag.node.attributes.push( - t.markoAttribute("id", currentShorthandId) + t.markoAttribute("id", currentShorthandId), ); currentShorthandId = undefined; } diff --git a/packages/compiler/src/babel-types/generator/patch.js b/packages/compiler/src/babel-types/generator/patch.js index dab9aacb4a..de0a0fa919 100644 --- a/packages/compiler/src/babel-types/generator/patch.js +++ b/packages/compiler/src/babel-types/generator/patch.js @@ -1,8 +1,8 @@ import "../types/patch"; +import Printer from "@babel/generator/lib/printer"; import * as t from "@babel/types"; import SELF_CLOSING from "self-closing-tags"; -import Printer from "@babel/generator/lib/printer"; Object.assign(Printer.prototype, { MarkoParseError(node) { diff --git a/packages/compiler/src/babel-types/traverse/patch.js b/packages/compiler/src/babel-types/traverse/patch.js index 1ddfbc941c..0dd0a2b579 100644 --- a/packages/compiler/src/babel-types/traverse/patch.js +++ b/packages/compiler/src/babel-types/traverse/patch.js @@ -1,7 +1,7 @@ import "../types/patch"; -import * as t from "@babel/types"; import traverse, { NodePath, Scope } from "@babel/traverse"; +import * as t from "@babel/types"; import { MARKO_ALIAS_TYPES, MARKO_TYPES } from "../types/definitions"; MARKO_TYPES.forEach((typeName) => { @@ -75,7 +75,7 @@ Scope.prototype.crawl = function () { } } }, - }) + }), ); } @@ -95,7 +95,7 @@ Scope.prototype.crawl = function () { if (hoistableBinding) { if (hoistableBinding === true) { throw ref.buildCodeFrameError( - "Ambiguous reference, variable was defined in multiple places and was not shadowed." + "Ambiguous reference, variable was defined in multiple places and was not shadowed.", ); } diff --git a/packages/compiler/src/babel-types/types/definitions.js b/packages/compiler/src/babel-types/types/definitions.js index 14de36c771..29602227de 100644 --- a/packages/compiler/src/babel-types/types/definitions.js +++ b/packages/compiler/src/babel-types/types/definitions.js @@ -118,7 +118,7 @@ const MarkoDefinitions = { arguments: { validate: chain( assertValueType("array"), - assertEach(assertNodeType("Expression", "SpreadElement")) + assertEach(assertNodeType("Expression", "SpreadElement")), ), optional: true, }, @@ -152,7 +152,7 @@ const MarkoDefinitions = { params: { validate: chain( assertValueType("array"), - assertEach(assertNodeType("Identifier", "Pattern", "RestElement")) + assertEach(assertNodeType("Identifier", "Pattern", "RestElement")), ), default: [], }, @@ -199,7 +199,7 @@ const MarkoDefinitions = { arguments: { validate: chain( assertValueType("array"), - assertEach(assertNodeType("Expression", "SpreadElement")) + assertEach(assertNodeType("Expression", "SpreadElement")), ), optional: true, }, @@ -223,6 +223,6 @@ export default MarkoDefinitions; export const MARKO_TYPES = Object.keys(MarkoDefinitions); export const MARKO_ALIAS_TYPES = Array.from( new Set( - MARKO_TYPES.reduce((all, t) => all.concat(MarkoDefinitions[t].aliases), []) - ) + MARKO_TYPES.reduce((all, t) => all.concat(MarkoDefinitions[t].aliases), []), + ), ); diff --git a/packages/compiler/src/babel-types/types/patch.js b/packages/compiler/src/babel-types/types/patch.js index 6d0af95df0..57f91c7563 100644 --- a/packages/compiler/src/babel-types/types/patch.js +++ b/packages/compiler/src/babel-types/types/patch.js @@ -1,9 +1,9 @@ /* eslint-disable no-import-assign */ import * as babelTypes from "@babel/types"; import defineType from "@babel/types/lib/definitions/utils"; -import validate from "@babel/types/lib/validators/validate"; import * as generatedValidators from "@babel/types/lib/validators/generated"; import * as referencedValidators from "@babel/types/lib/validators/isReferenced"; +import validate from "@babel/types/lib/validators/validate"; import definitions, { MARKO_ALIAS_TYPES, MARKO_TYPES } from "./definitions"; const { @@ -64,8 +64,8 @@ function assert(typeName, node, opts) { if (!is(typeName, node, opts)) { throw new Error( `Expected type "${typeName}" with option ${JSON.stringify( - opts - )}, but instead got "${node.type}".` + opts, + )}, but instead got "${node.type}".`, ); } } @@ -76,7 +76,7 @@ function builder(type, args) { const countArgs = args.length; if (countArgs > keys.length) { throw new Error( - `${type}: Too many arguments passed. Received ${countArgs} but can receive no more than ${keys.length}` + `${type}: Too many arguments passed. Received ${countArgs} but can receive no more than ${keys.length}`, ); } diff --git a/packages/compiler/src/index.js b/packages/compiler/src/index.js index 8cb725e057..f353595937 100644 --- a/packages/compiler/src/index.js +++ b/packages/compiler/src/index.js @@ -1,17 +1,17 @@ export * as types from "./babel-types"; import path from "path"; import * as babel from "@babel/core"; -import cjsPlugin from "@babel/plugin-transform-modules-commonjs"; import tsSyntaxPlugin from "@babel/plugin-syntax-typescript"; +import cjsPlugin from "@babel/plugin-transform-modules-commonjs"; import tsTransformPlugin from "@babel/plugin-transform-typescript"; import { DiagnosticType } from "@marko/babel-utils"; import corePlugin from "./babel-plugin"; import defaultConfig from "./config"; import * as taglib from "./taglib"; -import shouldOptimize from "./util/should-optimize"; -import tryLoadTranslator from "./util/try-load-translator"; import { buildCodeFrameError } from "./util/build-code-frame"; import throwAggregateError from "./util/merge-errors"; +import shouldOptimize from "./util/should-optimize"; +import tryLoadTranslator from "./util/try-load-translator"; export { taglib }; const CWD = process.cwd(); diff --git a/packages/compiler/src/register.js b/packages/compiler/src/register.js index da36e006f4..ce7d8a7c55 100644 --- a/packages/compiler/src/register.js +++ b/packages/compiler/src/register.js @@ -1,7 +1,7 @@ "use strict"; -const compiler = require("."); const shouldOptimize = require("./util/should-optimize").default; +const compiler = require("."); const requiredOptions = { modules: "cjs" }; const isDev = !shouldOptimize(); const sourceMaps = new Map(); @@ -35,8 +35,8 @@ function register({ extensions = require.extensions, ...options } = {}) { sourceMaps: isDev ? "both" : false, }, options, - requiredOptions - ) + requiredOptions, + ), ); if (compiled.map) { diff --git a/packages/compiler/src/taglib/finder/index.js b/packages/compiler/src/taglib/finder/index.js index fc123387f6..a755a0b1ed 100644 --- a/packages/compiler/src/taglib/finder/index.js +++ b/packages/compiler/src/taglib/finder/index.js @@ -1,9 +1,9 @@ "use strict"; var nodePath = require("path"); +var lassoPackageRoot = require("lasso-package-root"); var resolveFrom = require("resolve-from").silent; var taglibConfig = require("../config"); var taglibLoader = require("../loader"); -var lassoPackageRoot = require("lasso-package-root"); var findCache = {}; var excludedDirs = {}; var excludedPackages = {}; @@ -117,7 +117,7 @@ function find(dirname, registeredTaglibs) { if (!excludedPackages[name]) { let taglibPath = resolveFrom( rootPkg.__dirname, - nodePath.join(name, "marko.json") + nodePath.join(name, "marko.json"), ); if (taglibPath) { var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true); diff --git a/packages/compiler/src/taglib/index.js b/packages/compiler/src/taglib/index.js index f822d78d42..77f27b216d 100644 --- a/packages/compiler/src/taglib/index.js +++ b/packages/compiler/src/taglib/index.js @@ -1,17 +1,17 @@ import path from "path"; -import loader from "./loader"; -import finder from "./finder"; -import Lookup from "./lookup"; -import taglibConfig from "./config"; import markoModules from "../../modules"; import tryLoadTranslator from "../util/try-load-translator"; +import taglibConfig from "./config"; +import finder from "./finder"; +import loader from "./loader"; +import Lookup from "./lookup"; export const excludeDir = finder.excludeDir; export const excludePackage = finder.excludePackage; import markoHTMLTaglib from "./marko-html.json"; -import markoSVGTaglib from "./marko-svg.json"; import markoMathTaglib from "./marko-math.json"; +import markoSVGTaglib from "./marko-svg.json"; const registeredTaglibs = []; const loadedTranslatorsTaglibs = new Map(); @@ -25,7 +25,7 @@ export function buildLookup(dirname, requestedTranslator, onError) { const translator = tryLoadTranslator(requestedTranslator); if (!translator || !Array.isArray(translator.taglibs)) { throw new Error( - "@marko/compiler: Invalid translator provided to buildLookup(dir, translator)" + "@marko/compiler: Invalid translator provided to buildLookup(dir, translator)", ); } @@ -35,8 +35,8 @@ export function buildLookup(dirname, requestedTranslator, onError) { loadedTranslatorsTaglibs.set( translator, (taglibsForDir = registeredTaglibs.concat( - translator.taglibs.map(([id, props]) => loadTaglib(id, props)) - )) + translator.taglibs.map(([id, props]) => loadTaglib(id, props)), + )), ); } diff --git a/packages/compiler/src/taglib/loader/Taglib.js b/packages/compiler/src/taglib/loader/Taglib.js index c169cfd258..c43113febf 100644 --- a/packages/compiler/src/taglib/loader/Taglib.js +++ b/packages/compiler/src/taglib/loader/Taglib.js @@ -48,7 +48,7 @@ class Taglib { if (!attribute.pattern && !attribute.name) { throw new Error( - "Invalid attribute: " + require("util").inspect(attribute) + "Invalid attribute: " + require("util").inspect(attribute), ); } diff --git a/packages/compiler/src/taglib/loader/index.js b/packages/compiler/src/taglib/loader/index.js index 2fd12b7996..d84ead2a61 100644 --- a/packages/compiler/src/taglib/loader/index.js +++ b/packages/compiler/src/taglib/loader/index.js @@ -1,8 +1,8 @@ var cache = require("./cache"); -var types = require("./types"); -var loaders = require("./loaders"); var DependencyChain = require("./DependencyChain"); +var loaders = require("./loaders"); +var types = require("./types"); function loadTaglibFromProps(taglib, taglibProps) { return loaders.loadTaglibFromProps(taglib, taglibProps); @@ -29,7 +29,7 @@ function loadTag(tagProps, filePath) { loaders.loadTagFromProps( tag, tagProps, - new DependencyChain(filePath ? [filePath] : []) + new DependencyChain(filePath ? [filePath] : []), ); return tag; } diff --git a/packages/compiler/src/taglib/loader/json-file-reader.js b/packages/compiler/src/taglib/loader/json-file-reader.js index 8eb27b1e57..b333ce486f 100644 --- a/packages/compiler/src/taglib/loader/json-file-reader.js +++ b/packages/compiler/src/taglib/loader/json-file-reader.js @@ -1,5 +1,5 @@ -var taglibConfig = require("../config"); var stripJsonComments = require("@luxass/strip-json-comments").strip; +var taglibConfig = require("../config"); var fsReadOptions = { encoding: "utf8" }; exports.readFileSync = function (path) { @@ -10,7 +10,7 @@ exports.readFileSync = function (path) { return taglibProps; } catch (e) { throw new Error( - 'Unable to parse JSON file at path "' + path + '". Error: ' + e + 'Unable to parse JSON file at path "' + path + '". Error: ' + e, ); } }; diff --git a/packages/compiler/src/taglib/loader/loadAttributeFromProps.js b/packages/compiler/src/taglib/loader/loadAttributeFromProps.js index 8f0af45ebc..c7a60e9edf 100644 --- a/packages/compiler/src/taglib/loader/loadAttributeFromProps.js +++ b/packages/compiler/src/taglib/loader/loadAttributeFromProps.js @@ -2,9 +2,9 @@ var assert = require("assert"); var raptorRegexp = require("raptor-regexp"); +var createError = require("raptor-util/createError"); var propertyHandlers = require("./property-handlers"); var types = require("./types"); -var createError = require("raptor-util/createError"); var hasOwnProperty = Object.prototype.hasOwnProperty; class AttrLoader { @@ -229,7 +229,7 @@ function loadAttributeFromProps(attrName, attrProps, dependencyChain) { dependencyChain + "): " + err, - err + err, ); } diff --git a/packages/compiler/src/taglib/loader/loadAttributes.js b/packages/compiler/src/taglib/loader/loadAttributes.js index 845f487d46..10d7123a7c 100644 --- a/packages/compiler/src/taglib/loader/loadAttributes.js +++ b/packages/compiler/src/taglib/loader/loadAttributes.js @@ -10,7 +10,7 @@ module.exports = function loadAttributes(value, parent, dependencyChain) { var attr = loaders.loadAttributeFromProps( attrName, attrProps, - dependencyChain.append("@" + attrName) + dependencyChain.append("@" + attrName), ); parent.addAttribute(attr); diff --git a/packages/compiler/src/taglib/loader/loadTagFromFile.js b/packages/compiler/src/taglib/loader/loadTagFromFile.js index bb63fe2176..6c42c4030e 100644 --- a/packages/compiler/src/taglib/loader/loadTagFromFile.js +++ b/packages/compiler/src/taglib/loader/loadTagFromFile.js @@ -1,9 +1,8 @@ -var jsonFileReader = require("./json-file-reader"); -var types = require("./types"); +var ok = require("assert").ok; var cache = require("./cache"); +var jsonFileReader = require("./json-file-reader"); var loaders = require("./loaders"); - -var ok = require("assert").ok; +var types = require("./types"); function loadTagFromFile(filePath) { ok(filePath, '"filePath" is required'); diff --git a/packages/compiler/src/taglib/loader/loadTagFromProps.js b/packages/compiler/src/taglib/loader/loadTagFromProps.js index aa3387a002..292741f9c5 100644 --- a/packages/compiler/src/taglib/loader/loadTagFromProps.js +++ b/packages/compiler/src/taglib/loader/loadTagFromProps.js @@ -1,15 +1,15 @@ "use strict"; var ok = require("assert").ok; -var resolveFrom = require("resolve-from").silent; -var propertyHandlers = require("./property-handlers"); -var isObjectEmpty = require("raptor-util/isObjectEmpty"); var nodePath = require("path"); var createError = require("raptor-util/createError"); +var isObjectEmpty = require("raptor-util/isObjectEmpty"); +var resolveFrom = require("resolve-from").silent; +var markoModules = require("../../../modules"); var taglibConfig = require("../config"); -var types = require("./types"); var loaders = require("./loaders"); -var markoModules = require("../../../modules"); +var propertyHandlers = require("./property-handlers"); +var types = require("./types"); var hasOwnProperty = Object.prototype.hasOwnProperty; function resolveRelative(dirname, value) { @@ -123,14 +123,14 @@ class TagLoader { nestedVariable.nameFromAttribute = value; }, }, - dependencyChain.toString() + dependencyChain.toString(), ); if (!nestedVariable.name && !nestedVariable.nameFromAttribute) { throw new Error( 'The "name" or "name-from-attribute" attribute is required for a nested variable (' + dependencyChain + - ")" + ")", ); } } @@ -221,7 +221,7 @@ class TagLoader { // with the user's taglib. if (!isObjectEmpty(value)) { throw new Error( - "Unsupported properties of [" + Object.keys(value).join(", ") + "]" + "Unsupported properties of [" + Object.keys(value).join(", ") + "]", ); } @@ -258,7 +258,7 @@ class TagLoader { var attr = loaders.loadAttributeFromProps( attrName, attrProps, - dependencyChain.append(part) + dependencyChain.append(part), ); tag.addAttribute(attr); @@ -289,7 +289,7 @@ class TagLoader { let attr = loaders.loadAttributeFromProps( nestedTag.targetProperty, { type: "object" }, - dependencyChain.append(part) + dependencyChain.append(part), ); tag.addAttribute(attr); @@ -367,7 +367,7 @@ class TagLoader { loaders.loadAttributes( value, tag, - this.dependencyChain.append("attributes") + this.dependencyChain.append("attributes"), ); } @@ -492,7 +492,7 @@ class TagLoader { for (const nestedTagName in value) { const nestedTagDef = value[nestedTagName]; var dependencyChain = this.dependencyChain.append( - `nestedTags["${nestedTagName}"]` + `nestedTags["${nestedTagName}"]`, ); var nestedTag = new types.Tag(filePath); @@ -504,8 +504,8 @@ class TagLoader { loaders.loadAttributeFromProps( nestedTag.targetProperty, { type: "expression" }, - dependencyChain - ) + dependencyChain, + ), ); } } @@ -571,7 +571,7 @@ function loadTagFromProps(tag, tagProps, dependencyChain) { } catch (err) { throw createError( "Unable to load tag (" + dependencyChain + "): " + err, - err + err, ); } diff --git a/packages/compiler/src/taglib/loader/loadTaglibFromDir.js b/packages/compiler/src/taglib/loader/loadTaglibFromDir.js index 1da1dd142c..918f191699 100644 --- a/packages/compiler/src/taglib/loader/loadTaglibFromDir.js +++ b/packages/compiler/src/taglib/loader/loadTaglibFromDir.js @@ -1,10 +1,9 @@ +var ok = require("assert").ok; var nodePath = require("path"); -var types = require("./types"); var cache = require("./cache"); var DependencyChain = require("./DependencyChain"); var scanTagsDir = require("./scanTagsDir"); - -var ok = require("assert").ok; +var types = require("./types"); function loadFromDir(dir) { ok(dir, '"dir" is required'); @@ -22,7 +21,7 @@ function loadFromDir(dir) { dir, "components", taglib, - new DependencyChain([componentsPath]) + new DependencyChain([componentsPath]), ); } diff --git a/packages/compiler/src/taglib/loader/loadTaglibFromFile.js b/packages/compiler/src/taglib/loader/loadTaglibFromFile.js index 62ec78653b..79577a6d6c 100644 --- a/packages/compiler/src/taglib/loader/loadTaglibFromFile.js +++ b/packages/compiler/src/taglib/loader/loadTaglibFromFile.js @@ -1,9 +1,8 @@ -var jsonFileReader = require("./json-file-reader"); -var types = require("./types"); +var ok = require("assert").ok; var cache = require("./cache"); +var jsonFileReader = require("./json-file-reader"); var loaders = require("./loaders"); - -var ok = require("assert").ok; +var types = require("./types"); function loadFromFile(filePath, isFromPackageJson) { ok(filePath, '"filePath" is required'); diff --git a/packages/compiler/src/taglib/loader/loadTaglibFromProps.js b/packages/compiler/src/taglib/loader/loadTaglibFromProps.js index da4445304e..109a3812a5 100644 --- a/packages/compiler/src/taglib/loader/loadTaglibFromProps.js +++ b/packages/compiler/src/taglib/loader/loadTaglibFromProps.js @@ -1,17 +1,17 @@ "use strict"; var ok = require("assert").ok; -var resolveFrom = require("resolve-from").silent; var nodePath = require("path"); -var types = require("./types"); +var createError = require("raptor-util/createError"); +var resolveFrom = require("resolve-from").silent; +var markoModules = require("../../../modules"); var taglibFS = require("../config"); -var scanTagsDir = require("./scanTagsDir"); -var propertyHandlers = require("./property-handlers"); -var jsonFileReader = require("./json-file-reader"); var DependencyChain = require("./DependencyChain"); -var createError = require("raptor-util/createError"); +var jsonFileReader = require("./json-file-reader"); var loaders = require("./loaders"); -var markoModules = require("../../../modules"); +var propertyHandlers = require("./property-handlers"); +var scanTagsDir = require("./scanTagsDir"); +var types = require("./types"); var hasOwnProperty = Object.prototype.hasOwnProperty; function resolveRelative(dirname, value) { @@ -44,7 +44,7 @@ class TaglibLoader { constructor(taglib, dependencyChain) { ok( dependencyChain instanceof DependencyChain, - '"dependencyChain" is not valid' + '"dependencyChain" is not valid', ); this.dependencyChain = dependencyChain; @@ -105,7 +105,7 @@ class TaglibLoader { tagFilePath + '" does not exist. (' + dependencyChain + - ")" + ")", ); } @@ -142,7 +142,7 @@ class TaglibLoader { var attr = loaders.loadAttributeFromProps( attrKey, value, - this.dependencyChain.append("@" + attrKey) + this.dependencyChain.append("@" + attrKey), ); attr.filePath = filePath; @@ -176,7 +176,7 @@ class TaglibLoader { var attr = loaders.loadAttributeFromProps( attrName, attrDef, - this.dependencyChain.append("@" + attrName) + this.dependencyChain.append("@" + attrName), ); attr.key = attrName; @@ -205,7 +205,7 @@ class TaglibLoader { this._handleTag( tagName, tags[tagName], - this.dependencyChain.append("tags." + tagName) + this.dependencyChain.append("tags." + tagName), ); } } @@ -237,7 +237,7 @@ class TaglibLoader { dirname, dir[i], taglib, - this.dependencyChain.append(`tags-dir[${i}]`) + this.dependencyChain.append(`tags-dir[${i}]`), ); } } else { @@ -246,7 +246,7 @@ class TaglibLoader { dirname, dir, taglib, - this.dependencyChain.append(`tags-dir`) + this.dependencyChain.append(`tags-dir`), ); } } @@ -265,7 +265,7 @@ class TaglibLoader { dirname, dir, taglib, - this.dependencyChain.append(`exports`) + this.dependencyChain.append(`exports`), ); } } @@ -300,7 +300,7 @@ class TaglibLoader { importPath = resolveFrom( packageDir, - nodePath.join(dependencyName, "marko.json") + nodePath.join(dependencyName, "marko.json"), ); if (importPath) { @@ -314,7 +314,7 @@ class TaglibLoader { taglib.addImport(importPath); } else { throw new Error( - "Import not found: " + curImport + " (from " + dirname + ")" + "Import not found: " + curImport + " (from " + dirname + ")", ); } } @@ -399,7 +399,7 @@ class TaglibLoader { let attr = loaders.loadAttributeFromProps( attrName, rawAttrDef, - attrGroupDependencyChain.append("@" + attrName) + attrGroupDependencyChain.append("@" + attrName), ); attrGroup[attrName] = attr; @@ -424,7 +424,7 @@ function loadTaglibFromProps(taglib, taglibProps, dependencyChain) { } catch (err) { throw createError( "Unable to load taglib (" + dependencyChain + "): " + err, - err + err, ); } diff --git a/packages/compiler/src/taglib/loader/property-handlers.js b/packages/compiler/src/taglib/loader/property-handlers.js index 89996b1067..4f0e22de11 100644 --- a/packages/compiler/src/taglib/loader/property-handlers.js +++ b/packages/compiler/src/taglib/loader/property-handlers.js @@ -57,7 +57,7 @@ module.exports = function invokeHandlers(config, handlers, path) { "Invalid option of " + badProperty + ". Allowed: " + - Object.keys(handlers).join(", ") + Object.keys(handlers).join(", "), ); } diff --git a/packages/compiler/src/taglib/loader/scanTagsDir.js b/packages/compiler/src/taglib/loader/scanTagsDir.js index 3db14ea371..5be3eb0f3f 100644 --- a/packages/compiler/src/taglib/loader/scanTagsDir.js +++ b/packages/compiler/src/taglib/loader/scanTagsDir.js @@ -117,7 +117,7 @@ module.exports = function scanTagsDir( tagsConfigDirname, dir, taglib, - dependencyChain + dependencyChain, ) { let prefix; @@ -179,7 +179,7 @@ module.exports = function scanTagsDir( "Invalid tag file: " + tagJsonPath + ". Neither a renderer or a template was found for tag. " + - JSON.stringify(tagDef, null, 2) + JSON.stringify(tagDef, null, 2), ); } else { // Skip this directory... there doesn't appear to be anything in it diff --git a/packages/compiler/src/taglib/lookup/index.js b/packages/compiler/src/taglib/lookup/index.js index 5fc995d1ed..05df76e612 100644 --- a/packages/compiler/src/taglib/lookup/index.js +++ b/packages/compiler/src/taglib/lookup/index.js @@ -1,8 +1,8 @@ "use strict"; var ok = require("assert").ok; -var taglibTypes = require("../loader/types"); var extend = require("raptor-util/extend"); +var taglibTypes = require("../loader/types"); var hasOwnProperty = Object.prototype.hasOwnProperty; function TAG_COMPARATOR(a, b) { @@ -27,8 +27,8 @@ function merge(target, source) { target[key] = Array.isArray(targetVal) ? targetVal.concat(sourceVal) : Array.isArray(sourceVal) - ? [targetVal].concat(sourceVal) - : merge(merge(new targetVal.constructor(), targetVal), sourceVal); + ? [targetVal].concat(sourceVal) + : merge(merge(new targetVal.constructor(), targetVal), sourceVal); continue; } } diff --git a/packages/compiler/src/util/build-code-frame.js b/packages/compiler/src/util/build-code-frame.js index 92a8d20d49..0b7adef199 100644 --- a/packages/compiler/src/util/build-code-frame.js +++ b/packages/compiler/src/util/build-code-frame.js @@ -1,6 +1,6 @@ import path from "path"; -import color from "kleur"; import { codeFrameColumns } from "@babel/code-frame"; +import color from "kleur"; const CWD = process.cwd(); const indent = " "; @@ -12,7 +12,7 @@ class CompileError extends Error { this.stack = loc ? `CompileError\n${indent}at ${prettyFileName}\n${prettyMessage.replace( /^/gm, - indent + indent, )}` : `CompileError: ${prettyMessage}\n${indent}at ${prettyFileName}`; @@ -71,7 +71,7 @@ function buildMessage(code, loc, message) { } : undefined, }, - { highlightCode: true, message } + { highlightCode: true, message }, ) : message; } diff --git a/packages/marko/bin/markoc.js b/packages/marko/bin/markoc.js index 53e1d40394..346c6125f7 100644 --- a/packages/marko/bin/markoc.js +++ b/packages/marko/bin/markoc.js @@ -5,35 +5,7 @@ var fs = require("fs"); var nodePath = require("path"); var cwd = process.cwd(); -var resolveFrom = require("resolve-from").silent; - -// Try to use the Marko compiler installed with the project -var markoCompilerPath = resolveFrom(process.cwd(), "marko/compiler"); -const markocPkgVersion = require("../package.json").version; - -var markoPkgPath = resolveFrom(process.cwd(), "marko/package.json"); -var markoPkgVersion = markoPkgPath && require(markoPkgPath).version; - -var markoCompiler = markoCompilerPath - ? require(markoCompilerPath) - : require("../compiler"); - -var Minimatch = require("minimatch").Minimatch; - var appModulePath = require("app-module-path"); - -var mmOptions = { - matchBase: true, - dot: true, - flipNegate: true, -}; - -function relPath(path) { - if (path.startsWith(cwd)) { - return path.substring(cwd.length + 1); - } -} - var args = require("argly") .createParser({ "--help": { @@ -94,7 +66,7 @@ var args = require("argly") .example("Compile multiple templates", "$0 template.marko src/ foo/") .example( "Delete all *.marko.js files in the current directory", - "$0 . --clean" + "$0 . --clean", ) .validate(function (result) { if (result.help) { @@ -124,6 +96,31 @@ var args = require("argly") process.exit(1); }) .parse(); +var Minimatch = require("minimatch").Minimatch; +var resolveFrom = require("resolve-from").silent; + +// Try to use the Marko compiler installed with the project +var markoCompilerPath = resolveFrom(process.cwd(), "marko/compiler"); +const markocPkgVersion = require("../package.json").version; + +var markoPkgPath = resolveFrom(process.cwd(), "marko/package.json"); +var markoPkgVersion = markoPkgPath && require(markoPkgPath).version; + +var markoCompiler = markoCompilerPath + ? require(markoCompilerPath) + : require("../compiler"); + +var mmOptions = { + matchBase: true, + dot: true, + flipNegate: true, +}; + +function relPath(path) { + if (path.startsWith(cwd)) { + return path.substring(cwd.length + 1); + } +} var output = "html"; @@ -324,7 +321,7 @@ if (args.clean) { } else { console.log("Deleted " + deleteCount + " file(s)"); } - } + }, ); } else { var found = {}; @@ -345,7 +342,7 @@ if (args.clean) { relPath(path) + "\n Output: " + relPath(outPath) + - "\n" + "\n", ); context.beginAsync(); @@ -356,7 +353,7 @@ if (args.clean) { 'Failed to compile "' + relPath(path) + '". Error: ' + - (err.stack || err) + (err.stack || err), ); context.endAsync(err); return; @@ -367,7 +364,7 @@ if (args.clean) { fs.writeFile(outPath, src, "utf8", function (err) { if (err) { failed.push( - 'Failed to write "' + path + '". Error: ' + (err.stack || err) + 'Failed to write "' + path + '". Error: ' + (err.stack || err), ); context.endAsync(err); return; @@ -384,7 +381,7 @@ if (args.clean) { 'Failed to write sourcemap"' + path + '". Error: ' + - (err.stack || err) + (err.stack || err), ); context.endAsync(err); return; @@ -392,7 +389,7 @@ if (args.clean) { compileCount++; context.endAsync(); - } + }, ); return; @@ -426,7 +423,7 @@ if (args.clean) { if (err) { if (failed.length) { console.error( - "The following errors occurred:\n- " + failed.join("\n- ") + "The following errors occurred:\n- " + failed.join("\n- "), ); } else { console.error(err); @@ -440,7 +437,7 @@ if (args.clean) { } else { console.log("Compiled " + compileCount + " templates(s)"); } - } + }, ); } } diff --git a/packages/marko/docs/10-awesome-marko-features.md b/packages/marko/docs/10-awesome-marko-features.md index 391398f74f..ee0b38a44c 100644 --- a/packages/marko/docs/10-awesome-marko-features.md +++ b/packages/marko/docs/10-awesome-marko-features.md @@ -261,7 +261,7 @@ http count: 30, colors: ["red", "green", "blue"], }, - res + res, ); }) .listen(8080); diff --git a/packages/marko/docs/class-components.md b/packages/marko/docs/class-components.md index da88940a8d..acda52f67f 100644 --- a/packages/marko/docs/class-components.md +++ b/packages/marko/docs/class-components.md @@ -782,7 +782,7 @@ Marko uses [`listener-tracker`](https://github.com/patrick-steele-idem/listener- ```js this.subscribeTo(window).on("scroll", () => - console.log("The user scrolled the window!") + console.log("The user scrolled the window!"), ); ``` diff --git a/packages/marko/docs/compiler.md b/packages/marko/docs/compiler.md index 46052cd5b9..d3c2001a22 100644 --- a/packages/marko/docs/compiler.md +++ b/packages/marko/docs/compiler.md @@ -70,7 +70,7 @@ import * as compiler from "@marko/compiler"; const asyncResult = await compiler.compile( "

Hello!", "./src/index.marko", - { modules: "cjs" } + { modules: "cjs" }, ); const syncResult = compiler.compileSync("

Hello!", "./src/index.marko", { modules: "cjs", @@ -217,7 +217,7 @@ Type: code: string; virtualPath: string; map?: SourceMap; - } + }, ) => string; ``` diff --git a/packages/marko/docs/http.md b/packages/marko/docs/http.md index fbe75c86dc..d9543f26fe 100644 --- a/packages/marko/docs/http.md +++ b/packages/marko/docs/http.md @@ -19,7 +19,7 @@ server.on("request", (req, res) => { count: 30, colors: ["red", "green", "blue"], }, - res + res, ); }); diff --git a/packages/marko/docs/lasso.md b/packages/marko/docs/lasso.md index 07d59da870..7cb650c52e 100644 --- a/packages/marko/docs/lasso.md +++ b/packages/marko/docs/lasso.md @@ -38,7 +38,7 @@ npm install @lasso/marko-taglib After installing, the lasso custom tags can be used in your templates: ```html - + diff --git a/packages/marko/docs/marko-vs-react.md b/packages/marko/docs/marko-vs-react.md index 80c8f8d1bb..c4ee93278f 100644 --- a/packages/marko/docs/marko-vs-react.md +++ b/packages/marko/docs/marko-vs-react.md @@ -643,7 +643,7 @@ import ReactDOM from "react-dom"; ReactDOM.render( , - document.getElementById("container") + document.getElementById("container"), ); ``` diff --git a/packages/marko/docs/rendering.md b/packages/marko/docs/rendering.md index c7f1fe2d47..e830c92f41 100644 --- a/packages/marko/docs/rendering.md +++ b/packages/marko/docs/rendering.md @@ -258,7 +258,7 @@ app.get("/", (req, res) => { }, }, }, - res + res, ); }); ``` diff --git a/packages/marko/docs/rollup.md b/packages/marko/docs/rollup.md index 874f9d5860..6c21c8b123 100644 --- a/packages/marko/docs/rollup.md +++ b/packages/marko/docs/rollup.md @@ -118,7 +118,7 @@ export default (async () => [ }, external: (id) => externalDependencies.some( - (dependency) => id === dependency || id.startsWith(dependency + "/") + (dependency) => id === dependency || id.startsWith(dependency + "/"), ), plugins: [isWatch && runPlugin({ execArgv: ["--enable-source-maps"] })], }), @@ -167,8 +167,8 @@ export default (async () => [ `📊 Bundle visualizer at \x1b[4;36mfile://${path.join( __dirname, "../../", - bundleAnalyzerFilename - )}\x1b[0m` + bundleAnalyzerFilename, + )}\x1b[0m`, ); }, }, @@ -345,7 +345,7 @@ marko.browser({ fileName, // only inline code chunks below 1kB inline: code.trim().length < 1024 && code, - } + }, ); }, }); diff --git a/packages/marko/docs/why-is-marko-fast.md b/packages/marko/docs/why-is-marko-fast.md index 8698250866..c2fbd6d767 100644 --- a/packages/marko/docs/why-is-marko-fast.md +++ b/packages/marko/docs/why-is-marko-fast.md @@ -113,7 +113,7 @@ function render(input, out) { }), }, 0, - 4 + 4, ); } ``` diff --git a/packages/marko/index.d.ts b/packages/marko/index.d.ts index 591521e8f9..ed4d6277eb 100644 --- a/packages/marko/index.d.ts +++ b/packages/marko/index.d.ts @@ -58,11 +58,11 @@ declare global { once(eventName: PropertyKey, listener: (...args: any[]) => any): this; prependListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; removeListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; /** Register a callback executed when the last async out has completed. */ onLast(listener: (next: () => void) => unknown): this; @@ -84,7 +84,7 @@ declare global { // eslint-disable-next-line @typescript-eslint/no-unused-vars in Params extends readonly any[] = [], // eslint-disable-next-line @typescript-eslint/no-unused-vars - out Return = void + out Return = void, > {} /** Valid data types which can be passed in as a <${dynamic}/> tag name. */ @@ -125,7 +125,7 @@ declare global { * cleaned up once this component is destroyed * */ subscribeTo( - emitter: unknown + emitter: unknown, ): Omit; /** Emits an event on the component instance. */ emit(eventName: PropertyKey, ...args: any[]): boolean; @@ -136,12 +136,12 @@ declare global { /** Listen to an event on the component instance before all other listeners. */ prependListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; /** Remove a listener from the component instance. */ removeListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; /** Remove all listeners from the component instance. */ removeAllListeners(eventName?: PropertyKey): this; @@ -156,14 +156,14 @@ declare global { /** Gets an element reference by its `key` attribute in the template. */ getEl( key?: string, - index?: number + index?: number, ): T; /** Gets all element references by their `key` attribute in the template. */ getEls(key: string): T; /** Gets a component reference by its `key` attribute in the template. */ getComponent( key: string, - index?: number + index?: number, ): T; /** Gets all component references by their `key` attribute in the template. */ getComponents(key: string): T; @@ -178,14 +178,14 @@ declare global { */ setState( name: Key & keyof this["state"], - value: (this["state"] & Record)[Key] + value: (this["state"] & Record)[Key], ): void; setState(value: Partial): void; /** Schedules an update related to a specific state property and optionally updates the value. */ setStateDirty( name: Key & keyof this["state"], - value?: (this["state"] & Record)[Key] + value?: (this["state"] & Record)[Key], ): void; /** Synchronously flush any scheduled updates. */ update(): void; @@ -238,7 +238,7 @@ declare global { stream?: { write: (chunk: string) => void; end: (chunk?: string) => void; - } + }, ): Marko.Out; /** Asynchronously render the template in buffered mode. */ @@ -246,13 +246,13 @@ declare global { input: Marko.TemplateInput, cb?: ( err: Error | null, - result: Marko.RenderResult - ) => void + result: Marko.RenderResult, + ) => void, ): Marko.Out; /** Synchronously render the template. */ abstract renderSync( - input: Marko.TemplateInput + input: Marko.TemplateInput, ): Marko.RenderResult; /** Synchronously render a template to a string. */ @@ -260,13 +260,13 @@ declare global { /** Render a template and return a stream.Readable in nodejs or a ReadableStream in a web worker environment. */ abstract stream( - input: Marko.TemplateInput + input: Marko.TemplateInput, ): ReadableStream & NodeJS.ReadableStream; /** @marko-overload-end */ } export interface RenderResult< - out Component extends Marko.Component = Marko.Component + out Component extends Marko.Component = Marko.Component, > { /** Returns the component created as a result of rendering the template. */ getComponent(): Component; @@ -307,11 +307,11 @@ declare global { once(eventName: PropertyKey, listener: (...args: any[]) => any): this; prependListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; removeListener( eventName: PropertyKey, - listener: (...args: any[]) => any + listener: (...args: any[]) => any, ): this; removeAllListeners(eventName?: PropertyKey): this; } @@ -323,7 +323,7 @@ declare global { export interface NativeTag< Input extends Record, - Return extends Element + Return extends Element, > { input: Input; return: () => Return; @@ -335,37 +335,37 @@ declare global { export type Input = 0 extends 1 & Name ? any : Name extends string - ? Name extends keyof NativeTags - ? NativeTags[Name]["input"] - : Record - : Name extends - | Template - | { _(): () => (input: infer Input) => any } - ? Input - : Name extends Body - ? Args extends { - length: infer Length; - } - ? number extends Length - ? { value?: Args } - : 0 extends Length - ? { value?: [] } - : { value: Args } - : never - : never; + ? Name extends keyof NativeTags + ? NativeTags[Name]["input"] + : Record + : Name extends + | Template + | { _(): () => (input: infer Input) => any } + ? Input + : Name extends Body + ? Args extends { + length: infer Length; + } + ? number extends Length + ? { value?: Args } + : 0 extends Length + ? { value?: [] } + : { value: Args } + : never + : never; export type Return = 0 extends 1 & Name ? any : Name extends string - ? Name extends keyof NativeTags - ? NativeTags[Name]["return"] - : () => Element - : Name extends - | { _(): () => (input: any) => { return: infer Return } } - | Template - | Body - ? Return - : never; + ? Name extends keyof NativeTags + ? NativeTags[Name]["return"] + : () => Element + : Name extends + | { _(): () => (input: any) => { return: infer Return } } + | Template + | Body + ? Return + : never; /** @deprecated @see {@link Marko.Input} */ export type NativeTagInput = diff --git a/packages/marko/src/compiler/index.js b/packages/marko/src/compiler/index.js index 7bd1b42e88..b98062b42f 100644 --- a/packages/marko/src/compiler/index.js +++ b/packages/marko/src/compiler/index.js @@ -1,12 +1,12 @@ "use strict"; +var ok = require("assert").ok; +var fs = require("fs"); var complain = "MARKO_DEBUG" && require("complain"); var compiler = require("@marko/compiler"); var extend = require("raptor-util/extend"); -var globalConfig = require("./config"); -var ok = require("assert").ok; -var fs = require("fs"); var taglib = require("../taglib"); +var globalConfig = require("./config"); var defaults = extend({}, globalConfig); // eslint-disable-next-line no-constant-condition @@ -16,7 +16,7 @@ if ("MARKO_DEBUG") { require.main.filename !== require.resolve("../../bin/markoc") ) { complain( - "Using `marko/compiler` has been deprecated, please upgrade to the `@marko/compiler` module." + "Using `marko/compiler` has been deprecated, please upgrade to the `@marko/compiler` module.", ); } } @@ -67,7 +67,7 @@ function _compile(src, filename, userConfig, callback) { if (callback) { compiler.compile(src, filename, options).then( (result) => callback(null, resultCompat(result, options)), - (error) => callback(error) + (error) => callback(error), ); } else { return resultCompat(compiler.compileSync(src, filename, options), options); @@ -98,7 +98,7 @@ function compileForBrowser(src, filename, options, callback) { meta: false, sourceOnly: false, }, - options + options, ); return compile(src, filename, options, callback); diff --git a/packages/marko/src/core-tags/core/await/AsyncValue.js b/packages/marko/src/core-tags/core/await/AsyncValue.js index 94e350cc29..a12f2b4d89 100644 --- a/packages/marko/src/core-tags/core/await/AsyncValue.js +++ b/packages/marko/src/core-tags/core/await/AsyncValue.js @@ -98,7 +98,7 @@ AsyncValue.prototype = { }, function onRejected(err) { queueMicrotask(asyncValue.___reject.bind(asyncValue, err)); - } + }, ); if (finalPromise.done) { diff --git a/packages/marko/src/core-tags/core/await/client-reorder-runtime.js b/packages/marko/src/core-tags/core/await/client-reorder-runtime.js index 6356dc5597..a54e2710c4 100644 --- a/packages/marko/src/core-tags/core/await/client-reorder-runtime.js +++ b/packages/marko/src/core-tags/core/await/client-reorder-runtime.js @@ -8,7 +8,7 @@ function $af( childNodes, i, len, - af + af, ) { af = $af; diff --git a/packages/marko/src/core-tags/core/await/renderer.js b/packages/marko/src/core-tags/core/await/renderer.js index 69ca4a0244..89a2e8a2a2 100644 --- a/packages/marko/src/core-tags/core/await/renderer.js +++ b/packages/marko/src/core-tags/core/await/renderer.js @@ -18,7 +18,7 @@ function requestData(provider, timeout) { if ("MARKO_DEBUG") { complain( "Passing a callback function to the tag has been deprecated, please use a promise instead.", - { level: 1, locationIndex: 3 } + { level: 1, locationIndex: 3 }, ); } diff --git a/packages/marko/src/core-tags/core/await/reorderer-renderer.js b/packages/marko/src/core-tags/core/await/reorderer-renderer.js index be92bb06d8..4b8ecedce8 100644 --- a/packages/marko/src/core-tags/core/await/reorderer-renderer.js +++ b/packages/marko/src/core-tags/core/await/reorderer-renderer.js @@ -52,7 +52,7 @@ module.exports = function (input, out) { if (!global._afRuntime) { // Minified version of ./client-reorder-runtime.js asyncOut.script( - `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b' + result.toString() + - "" + "", ); } else { asyncOut.write( @@ -78,7 +78,7 @@ module.exports = function (input, out) { awaitInfo.id + '" style="display:none">' + result.toString() + - "" + "", ); } @@ -88,7 +88,7 @@ module.exports = function (input, out) { ? awaitInfo.id : '"' + awaitInfo.id + '"') + (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") + - ")" + ")", ); awaitInfo.out.writer = asyncOut.writer; diff --git a/packages/marko/src/node-require/browser-refresh.js b/packages/marko/src/node-require/browser-refresh.js index a9d98f2ad0..568954ae81 100644 --- a/packages/marko/src/node-require/browser-refresh.js +++ b/packages/marko/src/node-require/browser-refresh.js @@ -9,7 +9,7 @@ if ("MARKO_DEBUG") { .enableSpecialReload( `${extensions .map((ext) => `*${ext}`) - .join(" ")} marko.json marko-tag.json` + .join(" ")} marko.json marko-tag.json`, ) .onFileModified((path) => { hotReload.handleFileModified(path); diff --git a/packages/marko/src/node-require/hot-reload.js b/packages/marko/src/node-require/hot-reload.js index d51a63c5d1..6094e7806c 100644 --- a/packages/marko/src/node-require/hot-reload.js +++ b/packages/marko/src/node-require/hot-reload.js @@ -9,7 +9,7 @@ exports.handleFileModified = function (filename) { if (!fs.existsSync(filename)) { console.log( "[marko/hot-reload] WARNING cannot resolve template path: ", - filename + filename, ); return; } @@ -35,7 +35,7 @@ function tryReload(filename) { delete require.cache[filename]; require(filename); console.log( - `[marko] Template successfully reloaded: ${cwdRelative(filename)}` + `[marko] Template successfully reloaded: ${cwdRelative(filename)}`, ); } catch (e) { console.error(e); diff --git a/packages/marko/src/node-require/index.js b/packages/marko/src/node-require/index.js index 3b11c28435..4ef4d8d306 100644 --- a/packages/marko/src/node-require/index.js +++ b/packages/marko/src/node-require/index.js @@ -14,7 +14,7 @@ const MARKO_EXTENSIONS = Symbol("MARKO_EXTENSIONS"); // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - 'Using "marko/node-require" has been replaced with "@marko/compiler/register".' + 'Using "marko/node-require" has been replaced with "@marko/compiler/register".', ); } @@ -32,8 +32,8 @@ function compile(templatePath, markoCompiler, userCompilerOptions) { {}, defaultCompilerOptions, userCompilerOptions, - requiredCompilerOptions - ) + requiredCompilerOptions, + ), ).code; } diff --git a/packages/marko/src/runtime/RenderResult.js b/packages/marko/src/runtime/RenderResult.js index fc5090fbe4..e67000fd9d 100644 --- a/packages/marko/src/runtime/RenderResult.js +++ b/packages/marko/src/runtime/RenderResult.js @@ -74,7 +74,7 @@ Object.defineProperty(proto, "html", { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - 'The "html" property is deprecated. Please use "toString" instead.' + 'The "html" property is deprecated. Please use "toString" instead.', ); } return this.toString(); @@ -86,7 +86,7 @@ Object.defineProperty(proto, "context", { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - 'The "context" property is deprecated. Please use "out" instead.' + 'The "context" property is deprecated. Please use "out" instead.', ); } return this.___out; @@ -107,5 +107,5 @@ domInsert( }, function afterInsert(renderResult, referenceEl) { return renderResult.afterInsert(getRootNode(referenceEl)); - } + }, ); diff --git a/packages/marko/src/runtime/components/Component.js b/packages/marko/src/runtime/components/Component.js index 2929c7e199..37bc1d79a6 100644 --- a/packages/marko/src/runtime/components/Component.js +++ b/packages/marko/src/runtime/components/Component.js @@ -2,22 +2,21 @@ /* jshint newcap:false */ var complain = "MARKO_DEBUG" && require("complain"); - -var domInsert = require("../dom-insert"); -var defaultCreateOut = require("../createOut"); -var getComponentsContext = - require("./ComponentsContext").___getComponentsContext; +var EventEmitter = require("events-light"); +var SubscriptionTracker = require("listener-tracker"); +var inherit = require("raptor-util/inherit"); var componentsUtil = require("@internal/components-util"); var componentLookup = componentsUtil.___componentLookup; var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive; -var EventEmitter = require("events-light"); +var defaultCreateOut = require("../createOut"); +var domInsert = require("../dom-insert"); var RenderResult = require("../RenderResult"); -var SubscriptionTracker = require("listener-tracker"); -var inherit = require("raptor-util/inherit"); -var updateManager = require("./update-manager"); var morphdom = require("../vdom/morphdom"); -var eventDelegation = require("./event-delegation"); +var getComponentsContext = + require("./ComponentsContext").___getComponentsContext; var domData = require("./dom-data"); +var eventDelegation = require("./event-delegation"); +var updateManager = require("./update-manager"); var componentsByDOMNode = domData.___componentByDOMNode; var keyedElementsByComponentId = domData.___ssrKeyedElementsByComponentId; var CONTEXT_KEY = "__subtree_context__"; @@ -57,7 +56,7 @@ function handleCustomEventWithMethodListener( component, targetMethodName, args, - extraArgs + extraArgs, ) { // Remove the "eventType" argument args.push(component); @@ -229,7 +228,7 @@ Component.prototype = componentProto = { this, targetMethodName, args, - extraArgs + extraArgs, ); if (isOnce) { @@ -253,7 +252,7 @@ Component.prototype = componentProto = { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Accessing the elements of a child component using 'component.getEl' is deprecated." + "Accessing the elements of a child component using 'component.getEl' is deprecated.", ); } @@ -283,7 +282,7 @@ Component.prototype = componentProto = { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "A repeated key[] was passed to getComponent. Use a non-repeating key if there is only one of these components." + "A repeated key[] was passed to getComponent. Use a non-repeating key if there is only one of these components.", ); } rootNode = rootNode && rootNode[Object.keys(rootNode)[0]]; @@ -403,7 +402,7 @@ Component.prototype = componentProto = { name, value, true /* ensure:true */, - true /* forceDirty:true */ + true /* forceDirty:true */, ); }, @@ -600,14 +599,14 @@ Component.prototype = componentProto = { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - 'The "this.els" attribute is deprecated. Please use "this.getEls(key)" instead.' + 'The "this.els" attribute is deprecated. Please use "this.getEls(key)" instead.', ); } - return (this.___rootNode ? this.___rootNode.nodes : []).filter(function ( - el - ) { - return el.nodeType === ELEMENT_NODE; - }); + return (this.___rootNode ? this.___rootNode.nodes : []).filter( + function (el) { + return el.nodeType === ELEMENT_NODE; + }, + ); }, ___emit: emit, @@ -655,7 +654,7 @@ domInsert( }, function afterInsert(component) { return component; - } + }, ); inherit(Component, EventEmitter); diff --git a/packages/marko/src/runtime/components/ComponentDef.js b/packages/marko/src/runtime/components/ComponentDef.js index e6602e606a..53b22e608b 100644 --- a/packages/marko/src/runtime/components/ComponentDef.js +++ b/packages/marko/src/runtime/components/ComponentDef.js @@ -1,11 +1,11 @@ "use strict"; var complain = "MARKO_DEBUG" && require("complain"); +var extend = require("raptor-util/extend"); var w10Noop = require("warp10/constants").NOOP; var componentUtil = require("@internal/components-util"); var attachBubblingEvent = componentUtil.___attachBubblingEvent; var addDelegatedEventHandler = require("./event-delegation").___addDelegatedEventHandler; -var extend = require("raptor-util/extend"); var KeySequence = require("./KeySequence"); var EMPTY_OBJECT = {}; diff --git a/packages/marko/src/runtime/components/State.js b/packages/marko/src/runtime/components/State.js index 2c20f8bcc9..8963461f42 100644 --- a/packages/marko/src/runtime/components/State.js +++ b/packages/marko/src/runtime/components/State.js @@ -48,7 +48,7 @@ State.prototype = { key, undefined, false /* ensure:false */, - false /* forceDirty:false */ + false /* forceDirty:false */, ); } } @@ -58,7 +58,7 @@ State.prototype = { key, newState[key], true /* ensure:true */, - false /* forceDirty:false */ + false /* forceDirty:false */, ); } }, diff --git a/packages/marko/src/runtime/components/defineComponent.js b/packages/marko/src/runtime/components/defineComponent.js index e484b095c8..16bd11bbc0 100644 --- a/packages/marko/src/runtime/components/defineComponent.js +++ b/packages/marko/src/runtime/components/defineComponent.js @@ -1,9 +1,9 @@ "use strict"; /* jshint newcap:false */ -var BaseState = require("./State"); -var BaseComponent = require("./Component"); var inherit = require("raptor-util/inherit"); +var BaseComponent = require("./Component"); +var BaseState = require("./State"); module.exports = function defineComponent(def, renderer) { if (def.___isComponent) { diff --git a/packages/marko/src/runtime/components/event-delegation.js b/packages/marko/src/runtime/components/event-delegation.js index c289c8880e..648fa2723e 100644 --- a/packages/marko/src/runtime/components/event-delegation.js +++ b/packages/marko/src/runtime/components/event-delegation.js @@ -125,7 +125,7 @@ function addDelegatedEventHandlerToHost(eventType, host) { delegateEvent(curNode, propName, target, event); } }), - true + true, ); } } diff --git a/packages/marko/src/runtime/components/legacy/defineRenderer-legacy.js b/packages/marko/src/runtime/components/legacy/defineRenderer-legacy.js index b9340f31cc..a3385ea8bd 100644 --- a/packages/marko/src/runtime/components/legacy/defineRenderer-legacy.js +++ b/packages/marko/src/runtime/components/legacy/defineRenderer-legacy.js @@ -1,10 +1,10 @@ var complain = "MARKO_DEBUG" && require("complain"); +var componentLookup = require("@internal/components-util").___componentLookup; +var req = require("@internal/require"); var makeRenderable = require("../../renderable"); var getComponentsContext = require("../ComponentsContext").___getComponentsContext; -var componentLookup = require("@internal/components-util").___componentLookup; var modernRenderer = require("../renderer"); -var req = require("@internal/require"); var resolveComponentKey = modernRenderer.___resolveComponentKey; module.exports = function defineRenderer(renderingLogic) { @@ -117,7 +117,7 @@ module.exports = function defineRenderer(renderingLogic) { var templateData = clone( getTemplateData ? getTemplateData(widgetState, newProps, out) - : widgetState || newProps + : widgetState || newProps, ); if (isReceivingNewInput && getWidgetConfig) { diff --git a/packages/marko/src/runtime/components/legacy/dependencies/html.js b/packages/marko/src/runtime/components/legacy/dependencies/html.js index bbdf44d925..23b5c123ad 100644 --- a/packages/marko/src/runtime/components/legacy/dependencies/html.js +++ b/packages/marko/src/runtime/components/legacy/dependencies/html.js @@ -1,3 +1,3 @@ -var patch = require("./").patch; var Template = require("../../../html").Template; +var patch = require("./").patch; patch(Template); diff --git a/packages/marko/src/runtime/components/legacy/dependencies/index.js b/packages/marko/src/runtime/components/legacy/dependencies/index.js index 16bd93b2bd..41a6bcaafa 100644 --- a/packages/marko/src/runtime/components/legacy/dependencies/index.js +++ b/packages/marko/src/runtime/components/legacy/dependencies/index.js @@ -11,7 +11,7 @@ function getRootDeps(template, context) { attachDepsAndComponentsToTemplate(template, context); var deps = (template.___depsArray = Object.keys(template.___deps).map( - (key) => template.___deps[key] + (key) => template.___deps[key], )); var initModule = getInitModule(template.path, template.___components); @@ -103,7 +103,7 @@ function getInitModule(path, components) { (component) => `components.register('${component.id}', require('.${ nodePath.sep - }${nodePath.relative(root, component.path)}'));` + }${nodePath.relative(root, component.path)}'));`, ); var code = ` var components = require('marko/components'); diff --git a/packages/marko/src/runtime/components/legacy/dependencies/vdom.js b/packages/marko/src/runtime/components/legacy/dependencies/vdom.js index e74211941d..6c4609e9a1 100644 --- a/packages/marko/src/runtime/components/legacy/dependencies/vdom.js +++ b/packages/marko/src/runtime/components/legacy/dependencies/vdom.js @@ -1,3 +1,3 @@ -var patch = require("./").patch; var Template = require("../../../vdom").Template; +var patch = require("./").patch; patch(Template); diff --git a/packages/marko/src/runtime/components/legacy/renderer-legacy.js b/packages/marko/src/runtime/components/legacy/renderer-legacy.js index b3f35103ee..0531cdd6c5 100644 --- a/packages/marko/src/runtime/components/legacy/renderer-legacy.js +++ b/packages/marko/src/runtime/components/legacy/renderer-legacy.js @@ -1,13 +1,13 @@ +var beginComponent = require("@internal/components-beginComponent"); +var endComponent = require("@internal/components-endComponent"); +var registry = require("@internal/components-registry"); +var componentsUtil = require("@internal/components-util"); var getComponentsContext = require("../ComponentsContext").___getComponentsContext; -var componentsUtil = require("@internal/components-util"); var componentLookup = componentsUtil.___componentLookup; -var registry = require("@internal/components-registry"); var modernRenderer = require("../renderer"); var resolveComponentKey = modernRenderer.___resolveComponentKey; var trackAsyncComponents = modernRenderer.___trackAsyncComponents; -var beginComponent = require("@internal/components-beginComponent"); -var endComponent = require("@internal/components-endComponent"); var complain = "MARKO_DEBUG" && require("complain"); function createRendererFunc(templateRenderFunc, componentProps) { @@ -29,7 +29,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { parentLegacyComponentDef, parentLegacyComponentDef.___component, parentLegacyComponentDef.___component.___rawState, - out.global + out.global, ); return; } @@ -74,7 +74,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { out, typeName, customEvents, - ownerComponentId + ownerComponentId, ); if (isSplit || widgetState) { component.input = null; @@ -83,7 +83,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { if ("MARKO_DEBUG") { complain( "Possible performance impact: this widget does not contain state, but is marked as a stateful widget. This will result in additional hydration data serialized. In order for marko to identify this as a split widget, w-bind should use a widget.js with defineWidget rather than index.js with defineComponent.", - { location: typeName, level: 1 } + { location: typeName, level: 1 }, ); } component.input = input.widgetProps; @@ -135,7 +135,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { key, ownerComponentDef, isSplit, - isFakeComponent + isFakeComponent, ); componentsContext.___legacyComponentDef = componentDef; @@ -158,7 +158,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { out, typeName, customEvents, - ownerComponentId + ownerComponentId, ); if (isSplit || widgetState) { component.input = null; @@ -167,7 +167,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { if ("MARKO_DEBUG") { complain( "Possible performance impact: this widget does not contain state, but is marked as a stateful widget. This will result in additional hydration data serialized. In order for marko to identify this as a split widget, w-bind should use a widget.js with defineWidget rather than index.js with defineComponent.", - { location: typeName, level: 1 } + { location: typeName, level: 1 }, ); } component.input = input.widgetProps; @@ -180,12 +180,12 @@ function createRendererFunc(templateRenderFunc, componentProps) { ownerComponentDef, isSplit, false, - this + this, ); } else { vComponentNode.___component = component = registry.___createComponent( typeName, - component.id + component.id, ); } this.___component = component; @@ -206,7 +206,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { componentDef, component, component.___rawState, - out.global + out.global, ); if (customEvents && componentDef.___component) { @@ -216,7 +216,7 @@ function createRendererFunc(templateRenderFunc, componentProps) { } else { componentDef.___component.___setCustomEvents( customEvents, - ownerComponentId + ownerComponentId, ); } } diff --git a/packages/marko/src/runtime/components/renderer.js b/packages/marko/src/runtime/components/renderer.js index a7f704ae4f..57de50ace7 100644 --- a/packages/marko/src/runtime/components/renderer.js +++ b/packages/marko/src/runtime/components/renderer.js @@ -1,13 +1,13 @@ +var copyProps = require("raptor-util/copyProps"); +var beginComponent = require("@internal/components-beginComponent"); +var endComponent = require("@internal/components-endComponent"); +var registry = require("@internal/components-registry"); var componentsUtil = require("@internal/components-util"); var componentLookup = componentsUtil.___componentLookup; var ComponentsContext = require("./ComponentsContext"); var getComponentsContext = ComponentsContext.___getComponentsContext; -var registry = require("@internal/components-registry"); -var copyProps = require("raptor-util/copyProps"); var isServer = componentsUtil.___isServer === true; -var beginComponent = require("@internal/components-beginComponent"); -var endComponent = require("@internal/components-endComponent"); var COMPONENT_BEGIN_ASYNC_ADDED_KEY = "$wa"; @@ -42,7 +42,7 @@ function handleBeginAsync(event) { asyncOut.c( parentOut.___assignedComponentDef, parentOut.___assignedKey, - parentOut.___assignedCustomEvents + parentOut.___assignedCustomEvents, ); } @@ -56,7 +56,7 @@ function handleBeginDetachedAsync(event) { function createRendererFunc( templateRenderFunc, componentProps, - renderingLogic + renderingLogic, ) { var onInput = renderingLogic && renderingLogic.onInput; var typeName = componentProps.t; @@ -69,7 +69,7 @@ function createRendererFunc( if ("MARKO_DEBUG") { if (!componentProps.d) { throw new Error( - "Component was compiled in a different NODE_ENV than the Marko runtime is using." + "Component was compiled in a different NODE_ENV than the Marko runtime is using.", ); } } else if (componentProps.d) { @@ -130,7 +130,7 @@ function createRendererFunc( out, typeName, customEvents, - ownerComponentId + ownerComponentId, ); // This is the final input after running the lifecycle methods. @@ -208,7 +208,7 @@ function createRendererFunc( key, ownerComponentDef, isSplit, - isImplicitComponent + isImplicitComponent, ); componentDef.___isExisting = isExisting; @@ -221,7 +221,7 @@ function createRendererFunc( componentDef, component, component.___rawState, - out.global + out.global, ); endComponent(out, componentDef); diff --git a/packages/marko/src/runtime/helpers/_change-case.js b/packages/marko/src/runtime/helpers/_change-case.js index a95023ed3c..240ec3b1ab 100644 --- a/packages/marko/src/runtime/helpers/_change-case.js +++ b/packages/marko/src/runtime/helpers/_change-case.js @@ -29,7 +29,7 @@ exports.___dashToCamelCase = function dashToCamelCase(name) { if (!nameCamel) { nameCamel = dashToCamelLookup[name] = name.replace( /-([a-z])/g, - matchToUpperCase + matchToUpperCase, ); if (nameCamel !== name) { diff --git a/packages/marko/src/runtime/helpers/dynamic-tag.js b/packages/marko/src/runtime/helpers/dynamic-tag.js index aaded6fadd..9cb4bc351f 100644 --- a/packages/marko/src/runtime/helpers/dynamic-tag.js +++ b/packages/marko/src/runtime/helpers/dynamic-tag.js @@ -1,11 +1,11 @@ "use strict"; var complain = "MARKO_DEBUG" && require("complain"); -var changeCase = require("./_change-case"); +var w10NOOP = require("warp10/constants").NOOP; +var ComponentDef = require("../components/ComponentDef"); var ComponentsContext = require("../components/ComponentsContext"); +var changeCase = require("./_change-case"); var getComponentsContext = ComponentsContext.___getComponentsContext; -var ComponentDef = require("../components/ComponentDef"); -var w10NOOP = require("warp10/constants").NOOP; var RENDER_BODY_TO_JSON = function () { return w10NOOP; }; @@ -26,7 +26,7 @@ module.exports = function dynamicTag( props, componentDef, key, - customEvents + customEvents, ) { if (tag) { if (tag.default) { @@ -42,7 +42,7 @@ module.exports = function dynamicTag( attrs, key, componentDef, - addEvents(componentDef, customEvents, props) + addEvents(componentDef, customEvents, props), ); renderBody(out); out.___endElement(); @@ -52,7 +52,7 @@ module.exports = function dynamicTag( attrs, key, componentDef, - addEvents(componentDef, customEvents, props) + addEvents(componentDef, customEvents, props), ); } } else { @@ -73,7 +73,7 @@ module.exports = function dynamicTag( if ("MARKO_DEBUG") { if (tag.renderer && tag.renderer.renderer) { complain( - "An object with a 'renderer' was passed to the dynamic tag, but renderer was another template." + "An object with a 'renderer' was passed to the dynamic tag, but renderer was another template.", ); } } @@ -90,7 +90,7 @@ module.exports = function dynamicTag( if ("MARKO_DEBUG") { if (render.safeHTML || render.toHTML) { throw new Error( - "Using `` or the `<${dynamic}/>` tags with a `{ safeHTML: ... }` object is no longer supported. Use the unescaped text placeholder syntax instead." + "Using `` or the `<${dynamic}/>` tags with a `{ safeHTML: ... }` object is no longer supported. Use the unescaped text placeholder syntax instead.", ); } } @@ -107,7 +107,7 @@ module.exports = function dynamicTag( componentsContext.___componentDef = new ComponentDef( component, parentComponentDef.id + "-" + parentComponentDef.___nextKey(key), - globalContext + globalContext, ); render.toJSON = RENDER_BODY_TO_JSON; @@ -131,7 +131,7 @@ module.exports = function dynamicTag( component, IS_SERVER && componentDef && - componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER + componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER, ); renderBody(out); out.ef(); @@ -164,7 +164,7 @@ function addEvents(componentDef, customEvents, props) { event[0], event[1], event[2], - event[3] + event[3], ); } diff --git a/packages/marko/src/runtime/helpers/render-tag.js b/packages/marko/src/runtime/helpers/render-tag.js index 5a8d77dd05..7c143d2a48 100644 --- a/packages/marko/src/runtime/helpers/render-tag.js +++ b/packages/marko/src/runtime/helpers/render-tag.js @@ -9,12 +9,12 @@ module.exports = function renderTagHelper( out, componentDef, key, - customEvents + customEvents, ) { out.c(componentDef, key, customEvents); (handler._ || (handler._ = handler.render || handler.renderer || handler))( input, - out + out, ); out.___assignedComponentDef = null; }; diff --git a/packages/marko/src/runtime/html/AsyncStream.js b/packages/marko/src/runtime/html/AsyncStream.js index 64f77581fb..ce12c14369 100644 --- a/packages/marko/src/runtime/html/AsyncStream.js +++ b/packages/marko/src/runtime/html/AsyncStream.js @@ -1,15 +1,15 @@ "use strict"; var EventEmitter = require("events-light"); -var StringWriter = require("./StringWriter"); -var BufferedWriter = require("./BufferedWriter"); +var selfClosingTags = require("self-closing-tags"); var RenderResult = require("../RenderResult"); +var parseHTML = require("../vdom/parse-html"); +var BufferedWriter = require("./BufferedWriter"); var attrsHelper = require("./helpers/attrs"); var markoAttr = require("./helpers/data-marko"); var escapeXmlHelper = require("./helpers/escape-xml"); -var parseHTML = require("../vdom/parse-html"); +var StringWriter = require("./StringWriter"); var escapeXmlOrNullish = escapeXmlHelper.x; var escapeXmlString = escapeXmlHelper.___escapeXML; -var selfClosingTags = require("self-closing-tags"); function noop() {} @@ -227,8 +227,8 @@ var proto = (AsyncStream.prototype = { (name ? "(" + name + ") " : "") + "timed out after " + timeout + - "ms" - ) + "ms", + ), ); }, timeout); } @@ -508,7 +508,7 @@ var proto = (AsyncStream.prototype = { elementAttrs, key, componentDef, - props + props, ) { var str = "<" + @@ -542,7 +542,7 @@ var proto = (AsyncStream.prototype = { elementAttrs, key, componentDef, - props + props, ) { var str = "<" + diff --git a/packages/marko/src/runtime/html/BufferedWriter.js b/packages/marko/src/runtime/html/BufferedWriter.js index 129ba45d3a..79fa1c957b 100644 --- a/packages/marko/src/runtime/html/BufferedWriter.js +++ b/packages/marko/src/runtime/html/BufferedWriter.js @@ -32,7 +32,7 @@ BufferedWriter.prototype = Object.assign( } }, }, - StringWriter.prototype + StringWriter.prototype, ); function flush(writer) { diff --git a/packages/marko/src/runtime/html/helpers/attr.js b/packages/marko/src/runtime/html/helpers/attr.js index f6f828cc31..136d6a8c05 100644 --- a/packages/marko/src/runtime/html/helpers/attr.js +++ b/packages/marko/src/runtime/html/helpers/attr.js @@ -34,7 +34,7 @@ function notEmptyAttr(name, value) { if ("MARKO_DEBUG") { complain( "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead.", - { locationIndex: 2 } + { locationIndex: 2 }, ); } diff --git a/packages/marko/src/runtime/html/helpers/attrs.js b/packages/marko/src/runtime/html/helpers/attrs.js index df69ae8131..a8fab8d7a7 100644 --- a/packages/marko/src/runtime/html/helpers/attrs.js +++ b/packages/marko/src/runtime/html/helpers/attrs.js @@ -15,7 +15,7 @@ module.exports = function attrs(arg) { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value" + "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value", ); } return arg; diff --git a/packages/marko/src/runtime/html/helpers/class-attr.js b/packages/marko/src/runtime/html/helpers/class-attr.js index d8f87f735c..dc705a5754 100644 --- a/packages/marko/src/runtime/html/helpers/class-attr.js +++ b/packages/marko/src/runtime/html/helpers/class-attr.js @@ -1,7 +1,7 @@ "use strict"; -var attr = require("./attr"); var classHelper = require("../../helpers/class-value"); +var attr = require("./attr"); module.exports = function classAttr(value) { return attr("class", classHelper(value)); diff --git a/packages/marko/src/runtime/html/helpers/data-marko.js b/packages/marko/src/runtime/html/helpers/data-marko.js index fc12203890..06f131d395 100644 --- a/packages/marko/src/runtime/html/helpers/data-marko.js +++ b/packages/marko/src/runtime/html/helpers/data-marko.js @@ -27,7 +27,7 @@ module.exports = function dataMarko(out, componentDef, props, key) { result += ' data-marko-key="' + escapeDoubleQuotes( - componentDef.___nextKey(key) + " " + componentDef.id + componentDef.___nextKey(key) + " " + componentDef.id, ) + '"'; } diff --git a/packages/marko/src/runtime/html/helpers/merge-attrs.js b/packages/marko/src/runtime/html/helpers/merge-attrs.js index cb3a9f1e46..63a94a3ece 100644 --- a/packages/marko/src/runtime/html/helpers/merge-attrs.js +++ b/packages/marko/src/runtime/html/helpers/merge-attrs.js @@ -17,7 +17,7 @@ module.exports = function mergeAttrs() { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Passing a string as dynamic attributes ('
' or '
') is deprecated, use an object instead." + "Passing a string as dynamic attributes ('
' or '
') is deprecated, use an object instead.", ); } @@ -35,7 +35,7 @@ module.exports = function mergeAttrs() { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Passing a string as dynamic attributes ('
' or '
') is deprecated, use an object instead." + "Passing a string as dynamic attributes ('
' or '
') is deprecated, use an object instead.", ); } diff --git a/packages/marko/src/runtime/html/helpers/style-attr.js b/packages/marko/src/runtime/html/helpers/style-attr.js index 9bfce297f3..faff0742f7 100644 --- a/packages/marko/src/runtime/html/helpers/style-attr.js +++ b/packages/marko/src/runtime/html/helpers/style-attr.js @@ -1,7 +1,7 @@ "use strict"; -var attr = require("./attr"); var styleHelper = require("../../helpers/style-value"); +var attr = require("./attr"); module.exports = function styleAttr(value) { return attr("style", styleHelper(value)); diff --git a/packages/marko/src/runtime/html/index.js b/packages/marko/src/runtime/html/index.js index f6f8eb665c..89f752b519 100644 --- a/packages/marko/src/runtime/html/index.js +++ b/packages/marko/src/runtime/html/index.js @@ -26,10 +26,10 @@ require("../createOut").___setCreateOut( globalData, writer, parentOut, - buffer + buffer, ) { return new AsyncStream(globalData, writer, parentOut, buffer); - }) + }), ); require("../renderable")(Template.prototype); diff --git a/packages/marko/src/runtime/queueMicrotask.js b/packages/marko/src/runtime/queueMicrotask.js index 3eef98310c..c425466833 100644 --- a/packages/marko/src/runtime/queueMicrotask.js +++ b/packages/marko/src/runtime/queueMicrotask.js @@ -3,10 +3,10 @@ module.exports = typeof queueMicrotask === "function" ? queueMicrotask : typeof Promise === "function" && (promise = Promise.resolve()) - ? function (cb) { - promise.then(cb).catch(rethrow); - } - : setTimeout; + ? function (cb) { + promise.then(cb).catch(rethrow); + } + : setTimeout; function rethrow(err) { setTimeout(function () { throw err; diff --git a/packages/marko/src/runtime/renderable.js b/packages/marko/src/runtime/renderable.js index b43e5a8f65..1076ed8597 100644 --- a/packages/marko/src/runtime/renderable.js +++ b/packages/marko/src/runtime/renderable.js @@ -1,8 +1,8 @@ "use strict"; -var defaultCreateOut = require("./createOut"); -var setImmediate = require("@internal/set-immediate").___setImmediate; var extend = require("raptor-util/extend"); +var setImmediate = require("@internal/set-immediate").___setImmediate; +var defaultCreateOut = require("./createOut"); function safeRender(renderFunc, finalData, finalOut, shouldEnd) { try { @@ -123,7 +123,7 @@ module.exports = function (target, renderer) { globalData, // global out, // writer(AsyncStream) or parentNode(AsyncVDOMBuilder) undefined, // parentOut - shouldBuffer // ignored by AsyncVDOMBuilder + shouldBuffer, // ignored by AsyncVDOMBuilder ); } diff --git a/packages/marko/src/runtime/vdom/AsyncVDOMBuilder.js b/packages/marko/src/runtime/vdom/AsyncVDOMBuilder.js index 5535fc92d5..24b365d9cf 100644 --- a/packages/marko/src/runtime/vdom/AsyncVDOMBuilder.js +++ b/packages/marko/src/runtime/vdom/AsyncVDOMBuilder.js @@ -1,4 +1,7 @@ var EventEmitter = require("events-light"); +var RenderResult = require("../RenderResult"); +var attrsHelper = require("./helpers/attrs"); +var morphdom = require("./morphdom"); var vdom = require("./vdom"); var VElement = vdom.___VElement; var VDocumentFragment = vdom.___VDocumentFragment; @@ -6,9 +9,6 @@ var VText = vdom.___VText; var VComponent = vdom.___VComponent; var VFragment = vdom.___VFragment; var virtualizeHTML = vdom.___virtualizeHTML; -var RenderResult = require("../RenderResult"); -var morphdom = require("./morphdom"); -var attrsHelper = require("./helpers/attrs"); var EVENT_UPDATE = "update"; var EVENT_FINISH = "finish"; @@ -82,7 +82,7 @@ var proto = (AsyncVDOMBuilder.prototype = { component, childCount, flags, - props + props, ); return this.___beginNode(element, childCount); }, @@ -95,7 +95,7 @@ var proto = (AsyncVDOMBuilder.prototype = { componentDef.___component, 0, 0, - props + props, ); }, @@ -149,7 +149,7 @@ var proto = (AsyncVDOMBuilder.prototype = { component, childCount, flags, - props + props, ) { var element = new VElement( tagName, @@ -158,7 +158,7 @@ var proto = (AsyncVDOMBuilder.prototype = { component, childCount, flags, - props + props, ); this.___beginNode(element, childCount, true); return this; @@ -172,7 +172,7 @@ var proto = (AsyncVDOMBuilder.prototype = { componentDef.___component, 0, 0, - props + props, ); }, @@ -269,7 +269,7 @@ var proto = (AsyncVDOMBuilder.prototype = { beginAsync: function (options) { if (this.___sync) { throw Error( - "Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942)." + "Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942).", ); } diff --git a/packages/marko/src/runtime/vdom/VComponent.js b/packages/marko/src/runtime/vdom/VComponent.js index 190b441f1d..d51691bcc4 100644 --- a/packages/marko/src/runtime/vdom/VComponent.js +++ b/packages/marko/src/runtime/vdom/VComponent.js @@ -1,5 +1,5 @@ -var VNode = require("./VNode"); var inherit = require("raptor-util/inherit"); +var VNode = require("./VNode"); function VComponent(component, key, ownerComponent, preserve) { this.___VNode(null /* childCount */, ownerComponent); diff --git a/packages/marko/src/runtime/vdom/VDocumentFragment.js b/packages/marko/src/runtime/vdom/VDocumentFragment.js index 5dc0d8a146..d7edc1dda8 100644 --- a/packages/marko/src/runtime/vdom/VDocumentFragment.js +++ b/packages/marko/src/runtime/vdom/VDocumentFragment.js @@ -1,6 +1,6 @@ -var VNode = require("./VNode"); -var inherit = require("raptor-util/inherit"); var extend = require("raptor-util/extend"); +var inherit = require("raptor-util/inherit"); +var VNode = require("./VNode"); function VDocumentFragmentClone(other) { extend(this, other); diff --git a/packages/marko/src/runtime/vdom/VElement.js b/packages/marko/src/runtime/vdom/VElement.js index 771b810ec1..15e8e9dae1 100644 --- a/packages/marko/src/runtime/vdom/VElement.js +++ b/packages/marko/src/runtime/vdom/VElement.js @@ -1,11 +1,11 @@ /* jshint newcap:false */ var complain = "MARKO_DEBUG" && require("complain"); -var domData = require("../components/dom-data"); +var inherit = require("raptor-util/inherit"); var componentsUtil = require("@internal/components-util"); +var domData = require("../components/dom-data"); var vElementByDOMNode = domData.___vElementByDOMNode; var VNode = require("./VNode"); -var inherit = require("raptor-util/inherit"); var ATTR_XLINK_HREF = "xlink:href"; var xmlnsRegExp = /^xmlns(:|$)/; var hasOwnProperty = Object.prototype.hasOwnProperty; @@ -37,7 +37,7 @@ function convertAttrValue(type, value) { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead." + "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead.", ); } return JSON.stringify(value); @@ -94,7 +94,7 @@ function VElement( ownerComponent, childCount, flags, - props + props, ) { this.___VNode(childCount, ownerComponent); @@ -138,8 +138,8 @@ VElement.prototype = { ownerComponent, childCount, flags, - props - ) + props, + ), ); if (childCount === 0) { @@ -170,7 +170,7 @@ VElement.prototype = { var flags = this.___flags; var el = (host.ownerDocument || host).createElementNS( namespaceURI, - tagName + tagName, ); if (flags & FLAG_CUSTOM_ELEMENT) { @@ -237,9 +237,9 @@ defineProperty(proto, "___value", { return value != null && value !== false ? value + "" : this.___attributes.type === "checkbox" || - this.___attributes.type === "radio" - ? "on" - : ""; + this.___attributes.type === "radio" + ? "on" + : ""; }, }); @@ -288,7 +288,7 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) { ownerComponent, 0 /*child count*/, 0 /*flags*/, - props + props, ); if (vdomEl.___nodeName === "textarea") { diff --git a/packages/marko/src/runtime/vdom/VFragment.js b/packages/marko/src/runtime/vdom/VFragment.js index 78bcf142ac..5f1873ebae 100644 --- a/packages/marko/src/runtime/vdom/VFragment.js +++ b/packages/marko/src/runtime/vdom/VFragment.js @@ -1,9 +1,9 @@ +var inherit = require("raptor-util/inherit"); var domData = require("../components/dom-data"); var keysByDOMNode = domData.___keyByDOMNode; var vElementByDOMNode = domData.___vElementByDOMNode; -var VNode = require("./VNode"); -var inherit = require("raptor-util/inherit"); var createFragmentNode = require("./morphdom/fragment").___createFragmentNode; +var VNode = require("./VNode"); function VFragment(key, ownerComponent, preserve) { this.___VNode(null /* childCount */, ownerComponent); diff --git a/packages/marko/src/runtime/vdom/VText.js b/packages/marko/src/runtime/vdom/VText.js index d4da6fa6c4..7950e82355 100644 --- a/packages/marko/src/runtime/vdom/VText.js +++ b/packages/marko/src/runtime/vdom/VText.js @@ -1,5 +1,5 @@ -var VNode = require("./VNode"); var inherit = require("raptor-util/inherit"); +var VNode = require("./VNode"); function VText(value, ownerComponent) { this.___VNode(-1 /* no children */, ownerComponent); diff --git a/packages/marko/src/runtime/vdom/helpers/attrs.js b/packages/marko/src/runtime/vdom/helpers/attrs.js index 4ed0777cb8..8cba844f73 100644 --- a/packages/marko/src/runtime/vdom/helpers/attrs.js +++ b/packages/marko/src/runtime/vdom/helpers/attrs.js @@ -13,7 +13,7 @@ module.exports = function (attributes) { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value" + "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value", ); } return parseAttrs(attributes); diff --git a/packages/marko/src/runtime/vdom/helpers/v-element.js b/packages/marko/src/runtime/vdom/helpers/v-element.js index 72f1bbc4b8..92b336bb4f 100644 --- a/packages/marko/src/runtime/vdom/helpers/v-element.js +++ b/packages/marko/src/runtime/vdom/helpers/v-element.js @@ -9,7 +9,7 @@ module.exports = function ( component, childCount, flags, - props + props, ) { return new VElement(tagName, attrs, key, component, childCount, flags, props); }; diff --git a/packages/marko/src/runtime/vdom/hot-reload.js b/packages/marko/src/runtime/vdom/hot-reload.js index 9b09b291c0..03fa351879 100644 --- a/packages/marko/src/runtime/vdom/hot-reload.js +++ b/packages/marko/src/runtime/vdom/hot-reload.js @@ -1,7 +1,7 @@ -var runtime = require("."); -var queueMicrotask = require("../queueMicrotask"); var registry = require("@internal/components-registry"); var updateManager = require("../components/update-manager"); +var queueMicrotask = require("../queueMicrotask"); +var runtime = require("."); var createTemplate = runtime.t; var createComponent = registry.___createComponent; diff --git a/packages/marko/src/runtime/vdom/index.js b/packages/marko/src/runtime/vdom/index.js index b81074049c..18f02ae619 100644 --- a/packages/marko/src/runtime/vdom/index.js +++ b/packages/marko/src/runtime/vdom/index.js @@ -23,10 +23,10 @@ require("../createOut").___setCreateOut( (Template.prototype.createOut = function createOut( globalData, parent, - parentOut + parentOut, ) { return new AsyncVDOMBuilder(globalData, parent, parentOut); - }) + }), ); require("../renderable")(Template.prototype); diff --git a/packages/marko/src/runtime/vdom/morphdom/fragment.js b/packages/marko/src/runtime/vdom/morphdom/fragment.js index 6cfb115ffc..15fdd840d2 100644 --- a/packages/marko/src/runtime/vdom/morphdom/fragment.js +++ b/packages/marko/src/runtime/vdom/morphdom/fragment.js @@ -42,7 +42,7 @@ var fragmentPrototype = { return insertBefore( newChildNode, actualReference, - this.startNode.parentNode + this.startNode.parentNode, ); }, insertInto: function (newParentNode, referenceNode) { @@ -85,7 +85,7 @@ function beginFragmentNode(startNode, parentNode) { insertBefore( fragment.endNode, nextNode, - parentNode || startNode.parentNode + parentNode || startNode.parentNode, ); }; return fragment; diff --git a/packages/marko/src/runtime/vdom/morphdom/helpers.js b/packages/marko/src/runtime/vdom/morphdom/helpers.js index 845e7481ff..29af73d873 100644 --- a/packages/marko/src/runtime/vdom/morphdom/helpers.js +++ b/packages/marko/src/runtime/vdom/morphdom/helpers.js @@ -4,7 +4,7 @@ function insertBefore(node, referenceNode, parentNode) { } return parentNode.insertBefore( node, - (referenceNode && referenceNode.startNode) || referenceNode + (referenceNode && referenceNode.startNode) || referenceNode, ); } @@ -12,7 +12,7 @@ function insertAfter(node, referenceNode, parentNode) { return insertBefore( node, referenceNode && referenceNode.nextSibling, - parentNode + parentNode, ); } diff --git a/packages/marko/src/runtime/vdom/morphdom/index.js b/packages/marko/src/runtime/vdom/morphdom/index.js index fc443460b8..666597c194 100644 --- a/packages/marko/src/runtime/vdom/morphdom/index.js +++ b/packages/marko/src/runtime/vdom/morphdom/index.js @@ -1,19 +1,19 @@ "use strict"; -var specialElHandlers = require("./specialElHandlers"); -var KeySequence = require("../../components/KeySequence"); var componentsUtil = require("@internal/components-util"); var existingComponentLookup = componentsUtil.___componentLookup; var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive; var addComponentRootToKeyedElements = componentsUtil.___addComponentRootToKeyedElements; var normalizeComponentKey = componentsUtil.___normalizeComponentKey; -var VElement = require("../vdom").___VElement; -var virtualizeElement = VElement.___virtualize; -var morphAttrs = VElement.___morphAttrs; +var domData = require("../../components/dom-data"); var eventDelegation = require("../../components/event-delegation"); +var KeySequence = require("../../components/KeySequence"); +var VElement = require("../vdom").___VElement; var fragment = require("./fragment"); var helpers = require("./helpers"); -var domData = require("../../components/dom-data"); +var specialElHandlers = require("./specialElHandlers"); +var virtualizeElement = VElement.___virtualize; +var morphAttrs = VElement.___morphAttrs; var keysByDOMNode = domData.___keyByDOMNode; var componentByDOMNode = domData.___componentByDOMNode; var vElementByDOMNode = domData.___vElementByDOMNode; @@ -72,7 +72,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { referenceEl, parentEl, ownerComponent, - parentComponent + parentComponent, ) { var realNode = vNode.___actualize(host, parentEl.namespaceURI); insertBefore(realNode, referenceEl, parentEl); @@ -103,12 +103,12 @@ function morphdom(fromNode, toNode, host, componentsContext) { component, key, ownerComponent, - parentComponent + parentComponent, ) { var rootNode = (component.___rootNode = insertBefore( createFragmentNode(), referenceNode, - referenceNodeParentEl + referenceNodeParentEl, )); componentByDOMNode.set(rootNode, component); @@ -118,7 +118,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { ownerComponent.___keyedElements, key, rootNode, - component.id + component.id, ); keysByDOMNode.set(rootNode, key); } @@ -188,13 +188,13 @@ function morphdom(fromNode, toNode, host, componentsContext) { if (ownerComponent && curToNodeKey) { curToNodeKey = normalizeComponentKey( curToNodeKey, - parentComponent.id + parentComponent.id, ); addComponentRootToKeyedElements( ownerComponent.___keyedElements, curToNodeKey, rootNode, - component.id + component.id, ); keysByDOMNode.set(rootNode, curToNodeKey); @@ -211,7 +211,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { component, curToNodeKey, ownerComponent, - parentComponent + parentComponent, ); } } else { @@ -235,7 +235,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { insertBefore( matchingFromComponent.___rootNode, curFromNodeChild, - fromNode + fromNode, ); } else { curFromNodeChild = @@ -286,7 +286,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, curVFromNodeChild, curToNodeChild, - parentComponent + parentComponent, ); } else { // Remove the old node @@ -299,7 +299,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, fromNode, ownerComponent, - parentComponent + parentComponent, ); } } @@ -315,7 +315,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { (curToNodeChild.___preserve || caseInsensitiveCompare( curFromNodeChild.nodeName, - curToNodeChild.___nodeName || "" + curToNodeChild.___nodeName || "", )) ) { curVFromNodeChild = virtualizeElement(curFromNodeChild); @@ -331,7 +331,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, curVFromNodeChild, curToNodeChild, - parentComponent + parentComponent, ); } @@ -368,7 +368,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { var fragment = createFragmentNode( curFromNodeChild, endNode.nextSibling, - fromNode + fromNode, ); keysByDOMNode.set(fragment, curToNodeKey); vElementByDOMNode.set(fragment, curToNodeChild); @@ -393,7 +393,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, fromNode, ownerComponent, - parentComponent + parentComponent, ); fromNextSibling = curFromNodeChild; } else { @@ -459,7 +459,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { matchingFromEl, curVFromNodeChild, curToNodeChild, - parentComponent + parentComponent, ); } else { insertVirtualNodeBefore( @@ -468,7 +468,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, fromNode, ownerComponent, - parentComponent + parentComponent, ); detachNode(matchingFromEl, fromNode, ownerComponent); } @@ -525,7 +525,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { if ( caseInsensitiveCompare( curVFromNodeChild.___nodeName, - curToNodeChild.___nodeName + curToNodeChild.___nodeName, ) ) { curVFromNodeChild.___nodeName = curToNodeChild.___nodeName; @@ -553,7 +553,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, curVFromNodeChild, curToNodeChild, - parentComponent + parentComponent, ); } } else if ( @@ -572,7 +572,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { toNextSibling.___nodeType === TEXT_NODE ) { fromNextSibling = curFromNodeChild.splitText( - curToNodeChild.___nodeValue.length + curToNodeChild.___nodeValue.length, ); } if (curFromNodeChild.nodeValue !== curToNodeChild.___nodeValue) { @@ -602,7 +602,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { curFromNodeChild, fromNode, ownerComponent, - parentComponent + parentComponent, ); curToNodeChild = toNextSibling; @@ -695,7 +695,7 @@ function morphdom(fromNode, toNode, host, componentsContext) { } else if (node.parentNode) { destroyNodeRecursive( node, - detachedFromComponent !== true && detachedFromComponent + detachedFromComponent !== true && detachedFromComponent, ); if (eventDelegation.___handleNodeDetach(node) != false) { diff --git a/packages/marko/src/runtime/vdom/morphdom/specialElHandlers.js b/packages/marko/src/runtime/vdom/morphdom/specialElHandlers.js index fca5d5782b..01462eea74 100644 --- a/packages/marko/src/runtime/vdom/morphdom/specialElHandlers.js +++ b/packages/marko/src/runtime/vdom/morphdom/specialElHandlers.js @@ -93,7 +93,7 @@ SpecialElHandlers.prototype = { selected = i; } }, - -1 + -1, ); if (fromEl.selectedIndex !== selected) { diff --git a/packages/marko/src/runtime/vdom/vdom.js b/packages/marko/src/runtime/vdom/vdom.js index 349161e90e..5d6403e6ff 100644 --- a/packages/marko/src/runtime/vdom/vdom.js +++ b/packages/marko/src/runtime/vdom/vdom.js @@ -1,10 +1,10 @@ -var VNode = require("./VNode"); +var parseHTML = require("./parse-html"); +var VComponent = require("./VComponent"); var VDocumentFragment = require("./VDocumentFragment"); var VElement = require("./VElement"); -var VText = require("./VText"); -var VComponent = require("./VComponent"); var VFragment = require("./VFragment"); -var parseHTML = require("./parse-html"); +var VNode = require("./VNode"); +var VText = require("./VText"); var specialHtmlRegexp = /[&<]/; diff --git a/packages/marko/src/taglib/index.js b/packages/marko/src/taglib/index.js index f572d8e18d..db9e693e71 100644 --- a/packages/marko/src/taglib/index.js +++ b/packages/marko/src/taglib/index.js @@ -14,7 +14,7 @@ function register(taglibProps, taglibPath) { function registerFromFile(taglibPath) { return register( compiler.taglib._loader.loadTaglibFromFile(taglibPath), - taglibPath + taglibPath, ); } @@ -33,7 +33,7 @@ exports.lookup = { // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('@marko/translator-default'))`." + "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('@marko/translator-default'))`.", ); } } diff --git a/packages/marko/test/__util__/BrowserHelpers.js b/packages/marko/test/__util__/BrowserHelpers.js index 788e46de3d..da6b563359 100644 --- a/packages/marko/test/__util__/BrowserHelpers.js +++ b/packages/marko/test/__util__/BrowserHelpers.js @@ -1,5 +1,5 @@ -var expect = require("chai").expect; var assert = require("assert"); +var expect = require("chai").expect; var markoComponents = require("marko/components"); var getComponentsFromMeta = require("./components-from-meta"); @@ -38,7 +38,7 @@ BrowserHelpers.prototype = { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); }, @@ -113,7 +113,7 @@ BrowserHelpers.prototype = { " do not match. child 1: " + child1 + " child 2: " + - child2 + child2, ); } }, diff --git a/packages/marko/test/__util__/async-helpers.js b/packages/marko/test/__util__/async-helpers.js index a9e888516e..b985b67370 100644 --- a/packages/marko/test/__util__/async-helpers.js +++ b/packages/marko/test/__util__/async-helpers.js @@ -13,7 +13,7 @@ exports.callbackProvider = (delay, value) => { return function (callback) { exports.promiseProvider(delay, value).then( (resolved) => callback(null, resolved), - (rejected) => callback(rejected) + (rejected) => callback(rejected), ); }; }; diff --git a/packages/marko/test/__util__/create-marko-jsdom-module.js b/packages/marko/test/__util__/create-marko-jsdom-module.js index d78de04e32..54734c1e52 100644 --- a/packages/marko/test/__util__/create-marko-jsdom-module.js +++ b/packages/marko/test/__util__/create-marko-jsdom-module.js @@ -58,6 +58,6 @@ function compileMarkoModule(module, filename) { browserslistConfigFile: false, }, }), - filename + filename, ); } diff --git a/packages/marko/test/__util__/domToHTML.js b/packages/marko/test/__util__/domToHTML.js index 49ce2ba2bc..97637fdfb4 100644 --- a/packages/marko/test/__util__/domToHTML.js +++ b/packages/marko/test/__util__/domToHTML.js @@ -75,7 +75,7 @@ function vdomToHTML(node, options) { continue; } attributesArray.push( - " " + attrName + '="' + escapeXmlAttr(attr.value) + '"' + " " + attrName + '="' + escapeXmlAttr(attr.value) + '"', ); } } else { @@ -97,7 +97,7 @@ function vdomToHTML(node, options) { attrName = "http://www.w3.org/1999/xlink:href"; } attributesArray.push( - " " + attrName + '="' + escapeXmlAttr(attrValue) + '"' + " " + attrName + '="' + escapeXmlAttr(attrValue) + '"', ); } } @@ -122,8 +122,8 @@ function vdomToHTML(node, options) { tag === "SCRIPT" ? escapeScript : tag === "STYLE" - ? escapeStyle - : escapeXml; + ? escapeStyle + : escapeXml; serializeTextHelper(curChild, escapeText); } else { serializeHelper(curChild); diff --git a/packages/marko/test/__util__/domToString.js b/packages/marko/test/__util__/domToString.js index 9f58af7198..8309b865a3 100644 --- a/packages/marko/test/__util__/domToString.js +++ b/packages/marko/test/__util__/domToString.js @@ -115,8 +115,7 @@ function vdomToHTML(node, options) { html += indent + JSON.stringify( - getNodeValue(node) - .replace(/s\d+(-\d+)*/g, "s-normalized") + getNodeValue(node).replace(/s\d+(-\d+)*/g, "s-normalized"), ) + "\n"; } @@ -126,7 +125,7 @@ function vdomToHTML(node, options) { indent + "\n"; } diff --git a/packages/marko/test/__util__/patch-module.js b/packages/marko/test/__util__/patch-module.js index 068f4ad57e..e789603194 100644 --- a/packages/marko/test/__util__/patch-module.js +++ b/packages/marko/test/__util__/patch-module.js @@ -1,7 +1,7 @@ var fs = require("fs"); +var Module = require("module").Module; var nodePath = require("path"); -var Module = require("module").Module; var oldResolveFilename = Module._resolveFilename; var isDebug = require("../../env").isDebug; @@ -16,7 +16,7 @@ try { if (fs.existsSync(markoInstalledDir)) { fs.renameSync( markoInstalledDir, - markoInstalledDir.replace("node_modules/marko", "node_modules/~marko") + markoInstalledDir.replace("node_modules/marko", "node_modules/~marko"), ); } } catch (e) { diff --git a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js index 7f1aea9f6a..12b86dc23d 100644 --- a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js +++ b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js @@ -22,6 +22,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { } catch (err) { done(err); } - } + }, ); }; diff --git a/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js b/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js index 52400e9990..bc6c4b0e86 100644 --- a/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js +++ b/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js @@ -26,6 +26,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { } catch (err) { done(err); } - } + }, ); }; diff --git a/packages/marko/test/api-compiler/index.test.js b/packages/marko/test/api-compiler/index.test.js index 4c385fff4e..086297c962 100644 --- a/packages/marko/test/api-compiler/index.test.js +++ b/packages/marko/test/api-compiler/index.test.js @@ -20,7 +20,7 @@ autotest("fixtures", (fixture) => { markoCompiler, expect, snapshot, - done + done, ); }); }); diff --git a/packages/marko/test/api/fixtures/load-render-callback/test.js b/packages/marko/test/api/fixtures/load-render-callback/test.js index 382ae65b1f..1c42836aeb 100644 --- a/packages/marko/test/api/fixtures/load-render-callback/test.js +++ b/packages/marko/test/api/fixtures/load-render-callback/test.js @@ -13,6 +13,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { snapshot(html); done(); - } + }, ); }; diff --git a/packages/marko/test/api/fixtures/no-write-to-disk-load/test.js b/packages/marko/test/api/fixtures/no-write-to-disk-load/test.js index 52a855bcd6..f8a67349fa 100644 --- a/packages/marko/test/api/fixtures/no-write-to-disk-load/test.js +++ b/packages/marko/test/api/fixtures/no-write-to-disk-load/test.js @@ -1,5 +1,5 @@ -var nodePath = require("path"); var fs = require("fs"); +var nodePath = require("path"); exports.check = function (marko, markoCompiler, expect, snapshot, done) { markoCompiler.defaultOptions.writeToDisk = false; diff --git a/packages/marko/test/api/fixtures/no-write-to-disk-require/test.js b/packages/marko/test/api/fixtures/no-write-to-disk-require/test.js index 116f668b80..05171ef017 100644 --- a/packages/marko/test/api/fixtures/no-write-to-disk-require/test.js +++ b/packages/marko/test/api/fixtures/no-write-to-disk-require/test.js @@ -1,5 +1,5 @@ -var nodePath = require("path"); var fs = require("fs"); +var nodePath = require("path"); exports.check = function (marko, markoCompiler, expect, snapshot, done) { markoCompiler.defaultOptions.writeToDisk = false; diff --git a/packages/marko/test/api/fixtures/render-await-client-reorder-unhandled-rejected-promise/test.js b/packages/marko/test/api/fixtures/render-await-client-reorder-unhandled-rejected-promise/test.js index 12ef287264..2077df8f81 100644 --- a/packages/marko/test/api/fixtures/render-await-client-reorder-unhandled-rejected-promise/test.js +++ b/packages/marko/test/api/fixtures/render-await-client-reorder-unhandled-rejected-promise/test.js @@ -10,12 +10,12 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { { userPromise: promiseProvider(1, new Error("User Promise Rejected Error")), }, - out + out, ); out.on("error", (err) => { expect(err.message.indexOf("User Promise Rejected Error") !== -1).to.equal( - true + true, ); done(); }); diff --git a/packages/marko/test/api/fixtures/render-writable-stream-global-data/test.js b/packages/marko/test/api/fixtures/render-writable-stream-global-data/test.js index 16a47b4bd8..ef6030b4dd 100644 --- a/packages/marko/test/api/fixtures/render-writable-stream-global-data/test.js +++ b/packages/marko/test/api/fixtures/render-writable-stream-global-data/test.js @@ -24,6 +24,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { foo: "bar", }, }, - stream + stream, ); }; diff --git a/packages/marko/test/api/fixtures/require-compiled-template/test.js b/packages/marko/test/api/fixtures/require-compiled-template/test.js index fe62fe6a7d..3070853a03 100644 --- a/packages/marko/test/api/fixtures/require-compiled-template/test.js +++ b/packages/marko/test/api/fixtures/require-compiled-template/test.js @@ -16,6 +16,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { snapshot(result.toString()); done(); - } + }, ); }; diff --git a/packages/marko/test/api/fixtures/require-render-callback/test.js b/packages/marko/test/api/fixtures/require-render-callback/test.js index 0fb919c06f..036da8bc62 100644 --- a/packages/marko/test/api/fixtures/require-render-callback/test.js +++ b/packages/marko/test/api/fixtures/require-render-callback/test.js @@ -14,6 +14,6 @@ exports.check = function (marko, markoCompiler, expect, snapshot, done) { snapshot(result.toString()); done(); - } + }, ); }; diff --git a/packages/marko/test/api/index.test.js b/packages/marko/test/api/index.test.js index 0f1541ebed..715478a196 100644 --- a/packages/marko/test/api/index.test.js +++ b/packages/marko/test/api/index.test.js @@ -21,7 +21,7 @@ autotest("fixtures", (fixture) => { markoCompiler, expect, snapshot, - done + done, ); }); }); diff --git a/packages/marko/test/async-stream/index.test.js b/packages/marko/test/async-stream/index.test.js index e64c3e19b1..e533871ef2 100644 --- a/packages/marko/test/async-stream/index.test.js +++ b/packages/marko/test/async-stream/index.test.js @@ -1,12 +1,12 @@ "use strict"; require("../__util__/test-init"); +var fs = require("fs"); +var nodePath = require("path"); var chai = require("chai"); chai.config.includeStack = true; -var expect = require("chai").expect; -var nodePath = require("path"); -var fs = require("fs"); +var expect = chai.expect; var fsReadOptions = { encoding: "utf8" }; var AsyncStream = require("marko/runtime/html/AsyncStream"); @@ -328,14 +328,12 @@ describe("AsyncStream", function () { it("should support writing to a through2 stream", function (done) { var output = ""; - var through2 = require("through2")(function write( - data, - encoding, - callback - ) { - output += data; - callback(null, data); - }); + var through2 = require("through2")( + function write(data, encoding, callback) { + output += data; + callback(null, data); + }, + ); var errors = []; var out = createAsyncStream(through2) @@ -423,7 +421,7 @@ describe("AsyncStream", function () { var helloReadStream = fs.createReadStream( nodePath.join(__dirname, "fixtures/hello.txt"), - fsReadOptions + fsReadOptions, ); helloReadStream.pipe(asyncOut); @@ -455,7 +453,7 @@ describe("AsyncStream", function () { var helloReadStream = fs.createReadStream( nodePath.join(__dirname, "fixtures/hello.txt"), - fsReadOptions + fsReadOptions, ); helloReadStream.pipe(asyncOut); diff --git a/packages/marko/test/async-vdom-builder/index.test.js b/packages/marko/test/async-vdom-builder/index.test.js index 2832e76a26..a43d42f3a2 100644 --- a/packages/marko/test/async-vdom-builder/index.test.js +++ b/packages/marko/test/async-vdom-builder/index.test.js @@ -1,7 +1,7 @@ require("../__util__/test-init"); +var expect = require("chai").expect; var AsyncVDOMBuilder = require("marko/runtime/vdom/AsyncVDOMBuilder"); var VElement = require("marko/runtime/vdom/VElement"); -var expect = require("chai").expect; function getChildNodes(parentNode) { var childNodes = []; @@ -51,7 +51,7 @@ describe("AsyncVDOMBuilder", function () { expect(tree.___firstChild.___nodeName).to.equal("div"); expect(tree.___firstChild.___nextSibling.___nodeName).to.equal("span"); expect( - tree.___firstChild.___nextSibling.___nextSibling.___nodeName + tree.___firstChild.___nextSibling.___nextSibling.___nodeName, ).to.equal("section"); done(); }); diff --git a/packages/marko/test/components-browser/fixtures/append-prepend/test.js b/packages/marko/test/components-browser/fixtures/append-prepend/test.js index fe356d3ac8..864284e096 100644 --- a/packages/marko/test/components-browser/fixtures/append-prepend/test.js +++ b/packages/marko/test/components-browser/fixtures/append-prepend/test.js @@ -10,6 +10,6 @@ module.exports = function (helpers) { hello.renderSync({ value: "before" }).prependTo(renderTarget); hello.renderSync({ value: "after" }).appendTo(renderTarget); expect(renderTarget.innerHTML).to.equal( - "
Hello before
ref
Hello after
" + "
Hello before
ref
Hello after
", ); }; diff --git a/packages/marko/test/components-browser/fixtures/component-destroy-unsubscribe-custom-events/test.js b/packages/marko/test/components-browser/fixtures/component-destroy-unsubscribe-custom-events/test.js index 58c3bc4ca8..166b13a22b 100644 --- a/packages/marko/test/components-browser/fixtures/component-destroy-unsubscribe-custom-events/test.js +++ b/packages/marko/test/components-browser/fixtures/component-destroy-unsubscribe-custom-events/test.js @@ -4,7 +4,7 @@ module.exports = function (helpers) { var component = helpers.mount(require.resolve("./index"), {}); var customEventsComponent = helpers.mount( require.resolve("./components/app-custom-events"), - {} + {}, ); var receivedEvents = []; diff --git a/packages/marko/test/components-browser/fixtures/component-dom-events/test.js b/packages/marko/test/components-browser/fixtures/component-dom-events/test.js index ddd84bacf6..ab454ad598 100644 --- a/packages/marko/test/components-browser/fixtures/component-dom-events/test.js +++ b/packages/marko/test/components-browser/fixtures/component-dom-events/test.js @@ -16,7 +16,7 @@ module.exports = function (helpers) { component.clearLog(); helpers.triggerMouseEvent( component.getEl("button").firstElementChild, - "click" + "click", ); expect(component.logOutput).to.deep.equal(["button:click", "el:click"]); @@ -27,7 +27,7 @@ module.exports = function (helpers) { component.clearLog(); helpers.triggerMouseEvent( component.getEl("button").firstElementChild, - "mousemove" + "mousemove", ); expect(component.logOutput).to.deep.equal([ "button>span:mousemove", diff --git a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rendered-in-loop/test.js b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rendered-in-loop/test.js index 15f95af666..47727097b2 100644 --- a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rendered-in-loop/test.js +++ b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rendered-in-loop/test.js @@ -47,16 +47,16 @@ module.exports = function (helpers) { var fullPath = path + " " + key; expect( lookupA[key].el === lookupB[key].el, - 'unpreserved element "' + fullPath + '"' + 'unpreserved element "' + fullPath + '"', ).to.equal(true); expect( lookupA[key].component === lookupB[key].component, - 'unpreserved component "' + fullPath + '"' + 'unpreserved component "' + fullPath + '"', ).to.equal(true); ensurePreservedKeys( lookupA[key].children, lookupB[key].children, - fullPath + fullPath, ); } } diff --git a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered-setTimeout/test.js b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered-setTimeout/test.js index 403bd2e747..4b72a98bd3 100644 --- a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered-setTimeout/test.js +++ b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered-setTimeout/test.js @@ -13,7 +13,7 @@ module.exports = function (helpers, done) { component.update(); expect(component.state.count).to.equal(100); expect(targetEl.innerHTML).to.contain( - "Hello Frank! You have 100 new messages." + "Hello Frank! You have 100 new messages.", ); }, 100); @@ -22,7 +22,7 @@ module.exports = function (helpers, done) { component.update(); expect(component.state.count).to.equal(200); expect(targetEl.innerHTML).to.contain( - "Hello Frank! You have 200 new messages." + "Hello Frank! You have 200 new messages.", ); done(); }, 200); @@ -32,7 +32,7 @@ module.exports = function (helpers, done) { component.update(); expect(component.state.count).to.equal(1); expect(targetEl.innerHTML).to.contain( - "Hello Frank! You have 1 new messages." + "Hello Frank! You have 1 new messages.", ); }, 1); }; diff --git a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered/test.js b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered/test.js index bcb3ba2bc8..f329ce440f 100644 --- a/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered/test.js +++ b/packages/marko/test/components-browser/fixtures/component-preserve-all-state-when-rerendered/test.js @@ -9,7 +9,7 @@ module.exports = function (helpers) { var targetEl = component.el; expect(targetEl.innerHTML).to.contain( - "Hello Frank! You have 30 new messages." + "Hello Frank! You have 30 new messages.", ); expect(targetEl.innerHTML).to.contain("foo: bar"); expect(targetEl.innerHTML).to.contain("hello: world"); @@ -20,7 +20,7 @@ module.exports = function (helpers) { component.update(); expect(targetEl.innerHTML).to.contain( - "Hello John! You have 30 new messages." + "Hello John! You have 30 new messages.", ); expect(targetEl.innerHTML).to.contain("foo: bar"); expect(targetEl.innerHTML).to.contain("hello: world"); diff --git a/packages/marko/test/components-browser/fixtures/component-preserve-dom-if/test.js b/packages/marko/test/components-browser/fixtures/component-preserve-dom-if/test.js index 89a88455db..3ebb407cf3 100644 --- a/packages/marko/test/components-browser/fixtures/component-preserve-dom-if/test.js +++ b/packages/marko/test/components-browser/fixtures/component-preserve-dom-if/test.js @@ -22,7 +22,7 @@ module.exports = function (helpers) { preserveBodyClassBody: component.el.querySelector(".preserve-body").innerHTML, componentClass: require("marko/components").getComponentForEl( - component.el.querySelector(".component-no-id") + component.el.querySelector(".component-no-id"), ).state.name, }; } diff --git a/packages/marko/test/components-browser/fixtures/component-render-to-iframe/component.js b/packages/marko/test/components-browser/fixtures/component-render-to-iframe/component.js index d171435d55..3516fdb3c9 100644 --- a/packages/marko/test/components-browser/fixtures/component-render-to-iframe/component.js +++ b/packages/marko/test/components-browser/fixtures/component-render-to-iframe/component.js @@ -13,7 +13,7 @@ module.exports = { test: function (helpers) { var contentComponent = this.renderIntoIframe(); expect(contentComponent.el.ownerDocument).to.equal( - this.getEl("frame").contentWindow.document + this.getEl("frame").contentWindow.document, ); expect(contentComponent.getEl("input").value).to.equal("test"); expect(contentComponent.getComponent("more").getValue()).to.equal("hello"); diff --git a/packages/marko/test/components-browser/fixtures/component-renderToString-callback-sync/component.js b/packages/marko/test/components-browser/fixtures/component-renderToString-callback-sync/component.js index 65de13e862..e8757450ae 100644 --- a/packages/marko/test/components-browser/fixtures/component-renderToString-callback-sync/component.js +++ b/packages/marko/test/components-browser/fixtures/component-renderToString-callback-sync/component.js @@ -13,7 +13,7 @@ module.exports = { } else { self.emit("html", html); } - } + }, ); }, }; diff --git a/packages/marko/test/components-browser/fixtures/component-renderToString/test.js b/packages/marko/test/components-browser/fixtures/component-renderToString/test.js index 1333f45b0c..cc19239845 100644 --- a/packages/marko/test/components-browser/fixtures/component-renderToString/test.js +++ b/packages/marko/test/components-browser/fixtures/component-renderToString/test.js @@ -6,6 +6,6 @@ module.exports = function (helpers) { }); expect(component.renderedHtml).to.equal( - '
john
' + '
john
', ); }; diff --git a/packages/marko/test/components-browser/fixtures/component-rerender-stateless-new-props/test.js b/packages/marko/test/components-browser/fixtures/component-rerender-stateless-new-props/test.js index 826fb767fe..0577303927 100644 --- a/packages/marko/test/components-browser/fixtures/component-rerender-stateless-new-props/test.js +++ b/packages/marko/test/components-browser/fixtures/component-rerender-stateless-new-props/test.js @@ -9,7 +9,7 @@ module.exports = function (helpers) { }); expect(targetEl.innerHTML).to.contain( - "Hello Frank! You have 10 new messages." + "Hello Frank! You have 10 new messages.", ); component.input = { @@ -20,7 +20,7 @@ module.exports = function (helpers) { component.update(); expect(targetEl.innerHTML).to.contain( - "Hello John! You have 20 new messages." + "Hello John! You have 20 new messages.", ); component.input = { @@ -29,12 +29,12 @@ module.exports = function (helpers) { }; expect(targetEl.innerHTML).to.contain( - "Hello John! You have 20 new messages." + "Hello John! You have 20 new messages.", ); component.update(); expect(targetEl.innerHTML).to.contain( - "Hello Jane! You have 30 new messages." + "Hello Jane! You have 30 new messages.", ); }; diff --git a/packages/marko/test/components-browser/fixtures/component-transclusion/test.js b/packages/marko/test/components-browser/fixtures/component-transclusion/test.js index aa5996b2eb..96dde1ea1d 100644 --- a/packages/marko/test/components-browser/fixtures/component-transclusion/test.js +++ b/packages/marko/test/components-browser/fixtures/component-transclusion/test.js @@ -15,7 +15,7 @@ module.exports = function (helpers) { expect(el.querySelector("h1").innerHTML).to.equal(originalH1Html); expect(el.querySelector("h1").innerHTML).to.contain("success"); expect(el.querySelector(".alert").className).to.contain( - "alert alert-success" + "alert alert-success", ); // The inner HTML for the H1 should change since the state of the alert component changed @@ -25,6 +25,6 @@ module.exports = function (helpers) { expect(el.querySelector("h1").innerHTML).to.not.equal(originalH1Html); expect(el.querySelector("h1").innerHTML).to.contain("failure"); expect(el.querySelector(".alert").className).to.contain( - "alert alert-failure" + "alert alert-failure", ); }; diff --git a/packages/marko/test/components-browser/fixtures/custom-events-declarative-function/test.js b/packages/marko/test/components-browser/fixtures/custom-events-declarative-function/test.js index 1cdfb9d621..933170c8d1 100644 --- a/packages/marko/test/components-browser/fixtures/custom-events-declarative-function/test.js +++ b/packages/marko/test/components-browser/fixtures/custom-events-declarative-function/test.js @@ -11,7 +11,7 @@ module.exports = function (helpers) { expect(window.received1.length).to.equal(1); expect(window.received1[0].args.length).to.equal(3); // ['a', 'b', sourceComponent] expect(window.received1[0].component).to.equal( - component.getComponent("customEvents") + component.getComponent("customEvents"), ); pubsub.channel("customEvents-" + component.id).emit("emitTestEvent2"); diff --git a/packages/marko/test/components-browser/fixtures/custom-events-declarative/test.js b/packages/marko/test/components-browser/fixtures/custom-events-declarative/test.js index b95fde45e4..b4ce669ee4 100644 --- a/packages/marko/test/components-browser/fixtures/custom-events-declarative/test.js +++ b/packages/marko/test/components-browser/fixtures/custom-events-declarative/test.js @@ -25,7 +25,7 @@ module.exports = function (helpers) { expect(received1.length).to.equal(1); expect(received1[0].args.length).to.equal(3); // ['a', 'b', sourceComponent] expect(received1[0].component).to.equal( - component.getComponent("customEvents") + component.getComponent("customEvents"), ); pubsub.channel("customEvents-" + component.id).emit("emitTestEvent2"); diff --git a/packages/marko/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js b/packages/marko/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js index a4e4f19ff4..f86f286783 100644 --- a/packages/marko/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js +++ b/packages/marko/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js @@ -5,7 +5,7 @@ module.exports = function (helpers) { // var rootEl = component.el; var helloComponent = component.getComponent("hello"); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); // expect(helloComponent.el.parentNode).to.equal(rootEl); @@ -14,7 +14,7 @@ module.exports = function (helpers) { component.update(); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); expect(component.getComponent("hello")).to.equal(helloComponent); diff --git a/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js b/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js index a4e4f19ff4..f86f286783 100644 --- a/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js +++ b/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js @@ -5,7 +5,7 @@ module.exports = function (helpers) { // var rootEl = component.el; var helloComponent = component.getComponent("hello"); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); // expect(helloComponent.el.parentNode).to.equal(rootEl); @@ -14,7 +14,7 @@ module.exports = function (helpers) { component.update(); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); expect(component.getComponent("hello")).to.equal(helloComponent); diff --git a/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js b/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js index a4e4f19ff4..f86f286783 100644 --- a/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js +++ b/packages/marko/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js @@ -5,7 +5,7 @@ module.exports = function (helpers) { // var rootEl = component.el; var helloComponent = component.getComponent("hello"); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); // expect(helloComponent.el.parentNode).to.equal(rootEl); @@ -14,7 +14,7 @@ module.exports = function (helpers) { component.update(); expect(component.getEl("root").querySelector(".hello") != null).to.equal( - true + true, ); expect(component.getComponent("hello")).to.equal(helloComponent); diff --git a/packages/marko/test/components-browser/fixtures/dynamic-tag-preserve-old/test.js b/packages/marko/test/components-browser/fixtures/dynamic-tag-preserve-old/test.js index edb966d3d5..f6826ff827 100644 --- a/packages/marko/test/components-browser/fixtures/dynamic-tag-preserve-old/test.js +++ b/packages/marko/test/components-browser/fixtures/dynamic-tag-preserve-old/test.js @@ -9,10 +9,10 @@ module.exports = function (helpers) { var fooComponent = component.getComponent("foo"); expect(fooComponent.el.querySelector(".body").innerHTML).to.equal( - "Current index: 0" + "Current index: 0", ); expect(fooComponent.el.querySelector("span").innerHTML).to.equal( - "Hello Frank!" + "Hello Frank!", ); fooComponent.state.name = "Jane"; @@ -20,9 +20,9 @@ module.exports = function (helpers) { fooComponent.update(); expect(fooComponent.el.querySelector(".body").innerHTML).to.equal( - "Current index: 0" + "Current index: 0", ); expect(fooComponent.el.querySelector("span").innerHTML).to.equal( - "Hello Jane!" + "Hello Jane!", ); }; diff --git a/packages/marko/test/components-browser/fixtures/event-attach-el-function/test.js b/packages/marko/test/components-browser/fixtures/event-attach-el-function/test.js index 86f3162cee..4bbe5ca0d6 100644 --- a/packages/marko/test/components-browser/fixtures/event-attach-el-function/test.js +++ b/packages/marko/test/components-browser/fixtures/event-attach-el-function/test.js @@ -24,7 +24,7 @@ module.exports = function (helpers) { expect(events.length).to.equal(OFFSET + 2); expect(events[OFFSET + 1].color).to.equal("blue"); expect(events[OFFSET + 1].node).to.equal( - component.el.querySelectorAll("li")[1] + component.el.querySelectorAll("li")[1], ); component.input = { @@ -36,6 +36,6 @@ module.exports = function (helpers) { expect(events.length).to.equal(OFFSET + 3); expect(events[OFFSET + 2].color).to.equal("green"); expect(events[OFFSET + 2].node).to.equal( - component.el.querySelectorAll("li")[1] + component.el.querySelectorAll("li")[1], ); }; diff --git a/packages/marko/test/components-browser/fixtures/event-attach-el/test.js b/packages/marko/test/components-browser/fixtures/event-attach-el/test.js index 713868769e..8fc1399deb 100644 --- a/packages/marko/test/components-browser/fixtures/event-attach-el/test.js +++ b/packages/marko/test/components-browser/fixtures/event-attach-el/test.js @@ -12,7 +12,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(1); expect(component.events[0].color).to.equal("red"); expect(component.events[0].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); } @@ -25,7 +25,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(OFFSET + 2); expect(component.events[OFFSET + 1].color).to.equal("blue"); expect(component.events[OFFSET + 1].node).to.equal( - component.el.querySelectorAll("li")[1] + component.el.querySelectorAll("li")[1], ); component.input = { @@ -37,6 +37,6 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(OFFSET + 3); expect(component.events[OFFSET + 2].color).to.equal("green"); expect(component.events[OFFSET + 2].node).to.equal( - component.el.querySelectorAll("li")[1] + component.el.querySelectorAll("li")[1], ); }; diff --git a/packages/marko/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js b/packages/marko/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js index 0a2765bf7f..25be70b6a8 100644 --- a/packages/marko/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js +++ b/packages/marko/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js @@ -15,7 +15,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(1); expect(component.events[0].color).to.equal("blue"); expect(component.events[0].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); } @@ -25,7 +25,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(2); expect(component.events[1].color).to.equal(colors[1]); expect(component.events[1].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); component.input = { color: colors[2] }; @@ -34,7 +34,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(3); expect(component.events[2].color).to.equal(colors[2]); expect(component.events[2].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); component.input = { color: colors[0] }; @@ -43,7 +43,7 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(4); expect(component.events[3].color).to.equal(colors[0]); expect(component.events[3].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); component.input = { color: colors[2] }; @@ -52,6 +52,6 @@ module.exports = function (helpers) { expect(component.events.length).to.equal(5); expect(component.events[4].color).to.equal(colors[2]); expect(component.events[4].node).to.equal( - component.el.querySelectorAll("li")[0] + component.el.querySelectorAll("li")[0], ); }; diff --git a/packages/marko/test/components-browser/fixtures/event-handler-custom-args/test.js b/packages/marko/test/components-browser/fixtures/event-handler-custom-args/test.js index e10aca29fe..10484d14c0 100644 --- a/packages/marko/test/components-browser/fixtures/event-handler-custom-args/test.js +++ b/packages/marko/test/components-browser/fixtures/event-handler-custom-args/test.js @@ -7,13 +7,13 @@ module.exports = function (helpers) { expect(component.pressEvent[0].type).to.equal("ok"); expect(component.pressEvent[1].component).to.equal( - component.getComponent("ok") + component.getComponent("ok"), ); component.getComponent("cancel").emitPressEvent(); expect(component.pressEvent[0].type).to.equal("cancel"); expect(component.pressEvent[1].component).to.equal( - component.getComponent("cancel") + component.getComponent("cancel"), ); }; diff --git a/packages/marko/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js b/packages/marko/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js index 991670c653..1c719d0d57 100644 --- a/packages/marko/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js +++ b/packages/marko/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js @@ -11,7 +11,7 @@ module.exports = function (helpers) { expect(component.mouseMoveEventCalls.length).to.equal(1); expect(component.mouseMoveEventCalls[0][0]).to.equal("ok"); expect(component.mouseMoveEventCalls[0][1].stopPropagation).to.be.a( - "function" + "function", ); expect(component.mouseMoveEventCalls[0][2].innerHTML).to.equal("OK"); @@ -24,7 +24,7 @@ module.exports = function (helpers) { expect(component.mouseMoveEventCalls.length).to.equal(2); expect(component.mouseMoveEventCalls[1][0]).to.equal("cancel"); expect(component.mouseMoveEventCalls[1][1].stopPropagation).to.be.a( - "function" + "function", ); expect(component.mouseMoveEventCalls[1][2].innerHTML).to.equal("Cancel"); diff --git a/packages/marko/test/components-browser/fixtures/for-first-el-key-cache-value/test.js b/packages/marko/test/components-browser/fixtures/for-first-el-key-cache-value/test.js index 41720bd3e6..15e081db11 100644 --- a/packages/marko/test/components-browser/fixtures/for-first-el-key-cache-value/test.js +++ b/packages/marko/test/components-browser/fixtures/for-first-el-key-cache-value/test.js @@ -18,7 +18,7 @@ module.exports = function (helpers) { expect(component.callCount).to.equal(4); expect(component.getEl("bar").nextElementSibling.nextElementSibling).to.equal( - component.getEl("foo") + component.getEl("foo"), ); expect(component.getEl("foo")).to.equal(fooEl); expect(component.getEl("foo").nextElementSibling).to.equal(fooNextSibling); diff --git a/packages/marko/test/components-browser/fixtures/include-preserve-old/test.js b/packages/marko/test/components-browser/fixtures/include-preserve-old/test.js index edb966d3d5..f6826ff827 100644 --- a/packages/marko/test/components-browser/fixtures/include-preserve-old/test.js +++ b/packages/marko/test/components-browser/fixtures/include-preserve-old/test.js @@ -9,10 +9,10 @@ module.exports = function (helpers) { var fooComponent = component.getComponent("foo"); expect(fooComponent.el.querySelector(".body").innerHTML).to.equal( - "Current index: 0" + "Current index: 0", ); expect(fooComponent.el.querySelector("span").innerHTML).to.equal( - "Hello Frank!" + "Hello Frank!", ); fooComponent.state.name = "Jane"; @@ -20,9 +20,9 @@ module.exports = function (helpers) { fooComponent.update(); expect(fooComponent.el.querySelector(".body").innerHTML).to.equal( - "Current index: 0" + "Current index: 0", ); expect(fooComponent.el.querySelector("span").innerHTML).to.equal( - "Hello Jane!" + "Hello Jane!", ); }; diff --git a/packages/marko/test/components-browser/fixtures/input-no-change-nested/test.js b/packages/marko/test/components-browser/fixtures/input-no-change-nested/test.js index 3234cb108b..68109e733b 100644 --- a/packages/marko/test/components-browser/fixtures/input-no-change-nested/test.js +++ b/packages/marko/test/components-browser/fixtures/input-no-change-nested/test.js @@ -6,10 +6,10 @@ module.exports = function (helpers) { }); expect( - component.getComponent("foo").el.querySelector(".render-count").innerHTML + component.getComponent("foo").el.querySelector(".render-count").innerHTML, ).to.equal("0"); expect( - component.getComponent("foo").el.querySelector(".name").innerHTML + component.getComponent("foo").el.querySelector(".name").innerHTML, ).to.equal("Frank"); // Rerender with a new props object that has the shallow properties @@ -20,10 +20,10 @@ module.exports = function (helpers) { component.update(); expect( - component.getComponent("foo").el.querySelector(".render-count").innerHTML + component.getComponent("foo").el.querySelector(".render-count").innerHTML, ).to.equal("0"); expect( - component.getComponent("foo").el.querySelector(".name").innerHTML + component.getComponent("foo").el.querySelector(".name").innerHTML, ).to.equal("Frank"); // Rerender with a new props object that has the shallow properties @@ -34,9 +34,9 @@ module.exports = function (helpers) { component.update(); expect( - component.getComponent("foo").el.querySelector(".render-count").innerHTML + component.getComponent("foo").el.querySelector(".render-count").innerHTML, ).to.equal("1"); expect( - component.getComponent("foo").el.querySelector(".name").innerHTML + component.getComponent("foo").el.querySelector(".name").innerHTML, ).to.equal("John"); }; diff --git a/packages/marko/test/components-browser/fixtures/input-persisted-nested-component/test.js b/packages/marko/test/components-browser/fixtures/input-persisted-nested-component/test.js index 5c95aa5f82..3ea5b34293 100644 --- a/packages/marko/test/components-browser/fixtures/input-persisted-nested-component/test.js +++ b/packages/marko/test/components-browser/fixtures/input-persisted-nested-component/test.js @@ -7,10 +7,10 @@ module.exports = function (helpers) { expect(component.el.getAttribute("style")).to.equal("color:red"); expect(component.getComponent("counter").el.getAttribute("style")).to.equal( - "color:red" + "color:red", ); expect( - component.getComponent("counter").el.querySelector(".count").innerHTML + component.getComponent("counter").el.querySelector(".count").innerHTML, ).to.equal("0"); component.getComponent("counter").increment(); @@ -18,10 +18,10 @@ module.exports = function (helpers) { expect(component.el.getAttribute("style")).to.equal("color:red"); expect(component.getComponent("counter").el.getAttribute("style")).to.equal( - "color:red" + "color:red", ); expect( - component.getComponent("counter").el.querySelector(".count").innerHTML + component.getComponent("counter").el.querySelector(".count").innerHTML, ).to.equal("1"); component.updateColor("green"); @@ -29,10 +29,10 @@ module.exports = function (helpers) { expect(component.el.getAttribute("style")).to.equal("color: green;"); expect(component.getComponent("counter").el.getAttribute("style")).to.equal( - "color: green;" + "color: green;", ); expect( - component.getComponent("counter").el.querySelector(".count").innerHTML + component.getComponent("counter").el.querySelector(".count").innerHTML, ).to.equal("1"); // diff --git a/packages/marko/test/components-browser/fixtures/input-persisted/test.js b/packages/marko/test/components-browser/fixtures/input-persisted/test.js index 3d11c07bcb..c4339de09c 100644 --- a/packages/marko/test/components-browser/fixtures/input-persisted/test.js +++ b/packages/marko/test/components-browser/fixtures/input-persisted/test.js @@ -6,13 +6,13 @@ module.exports = function (helpers) { }); expect(component.getEl("current").getAttribute("style")).to.equal( - "color:#09c" + "color:#09c", ); component.increment(); component.update(); expect(component.getEl("current").getAttribute("style")).to.equal( - "color:#09c" + "color:#09c", ); }; diff --git a/packages/marko/test/components-browser/fixtures/insert-before-after/test.js b/packages/marko/test/components-browser/fixtures/insert-before-after/test.js index 8e84cfdffa..6eae26f640 100644 --- a/packages/marko/test/components-browser/fixtures/insert-before-after/test.js +++ b/packages/marko/test/components-browser/fixtures/insert-before-after/test.js @@ -11,6 +11,6 @@ module.exports = function (helpers) { hello.renderSync({ value: "before" }).insertBefore(referenceElement); hello.renderSync({ value: "after" }).insertAfter(referenceElement); expect(renderTarget.innerHTML).to.equal( - "
Hello before
ref
Hello after
" + "
Hello before
ref
Hello after
", ); }; diff --git a/packages/marko/test/components-browser/fixtures/keyed-matching-transcluded/test.js b/packages/marko/test/components-browser/fixtures/keyed-matching-transcluded/test.js index 33646899db..ea4a89288d 100644 --- a/packages/marko/test/components-browser/fixtures/keyed-matching-transcluded/test.js +++ b/packages/marko/test/components-browser/fixtures/keyed-matching-transcluded/test.js @@ -5,6 +5,6 @@ module.exports = function (helpers) { var targetEl = helpers.targetEl; var innerHTML = targetEl.innerHTML; expect(innerHTML).to.equal( - '
1
2
3
4
' + '
1
2
3
4
', ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-autokey/test.js b/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-autokey/test.js index f0303a18d4..b52509b0b6 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-autokey/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-autokey/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-userkey/test.js b/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-userkey/test.js index f0303a18d4..b52509b0b6 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-userkey/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-component-transcluded-userkey/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-body-no-id/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-body-no-id/test.js index 41e8e16067..87cfab9ebb 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-body-no-id/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-body-no-id/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect( - component.el.querySelector(".preserve").getAttribute("data-counter") + component.el.querySelector(".preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect( - component.el.querySelector(".preserve").getAttribute("data-counter") + component.el.querySelector(".preserve").getAttribute("data-counter"), ).to.equal("1"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-body-shared-key/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-body-shared-key/test.js index 25a0d92379..6d628d2a96 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-body-shared-key/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-body-shared-key/test.js @@ -8,7 +8,7 @@ module.exports = function (helpers) { }); expect( - helpers.targetEl.querySelector(".unpreserved-counter").innerHTML + helpers.targetEl.querySelector(".unpreserved-counter").innerHTML, ).to.equal("0"); component.input = { @@ -18,6 +18,6 @@ module.exports = function (helpers) { component.update(); expect( - helpers.targetEl.querySelector(".unpreserved-counter").innerHTML + helpers.targetEl.querySelector(".unpreserved-counter").innerHTML, ).to.equal("1"); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-body/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-body/test.js index 1d00df343a..61afb5abd5 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-body/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-body/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -24,12 +24,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "1" + "1", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-conditional-before/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-conditional-before/test.js index 1e5cb4c73a..6289d2d698 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-conditional-before/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-conditional-before/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-loop/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-loop/test.js index 9791a9da20..9dc1d4e3f6 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-loop/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-loop/test.js @@ -10,7 +10,7 @@ module.exports = function (helpers) { }); expect( - helpers.targetEl.firstElementChild.getAttribute("data-count") + helpers.targetEl.firstElementChild.getAttribute("data-count"), ).to.equal("0"); Array.from(helpers.targetEl.firstElementChild.childNodes).forEach((child) => { @@ -28,7 +28,7 @@ module.exports = function (helpers) { component.update(); expect( - helpers.targetEl.firstElementChild.getAttribute("data-count") + helpers.targetEl.firstElementChild.getAttribute("data-count"), ).to.equal("1"); Array.from(helpers.targetEl.firstElementChild.childNodes).forEach((child) => { diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-no-id/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-no-id/test.js index 3f6c0dc93d..620a4afc58 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-no-id/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-no-id/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect( - component.el.querySelector(".preserve").getAttribute("data-counter") + component.el.querySelector(".preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect( - component.el.querySelector(".preserve").getAttribute("data-counter") + component.el.querySelector(".preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-autokey/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-autokey/test.js index f0303a18d4..b52509b0b6 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-autokey/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-autokey/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect( - component.el.querySelector("#preserve").getAttribute("data-counter") + component.el.querySelector("#preserve").getAttribute("data-counter"), ).to.equal("0"); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-userkey/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-userkey/test.js index 1e5cb4c73a..6289d2d698 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-userkey/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom-transcluded-userkey/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-dom/test.js b/packages/marko/test/components-browser/fixtures/preserve-dom/test.js index 1e5cb4c73a..6289d2d698 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-dom/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-dom/test.js @@ -8,13 +8,13 @@ module.exports = function (helpers) { }); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "0" + "0", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); component.input = { @@ -23,12 +23,12 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector(".unpreserved-counter").innerHTML).to.equal( - "1" + "1", ); expect(component.getEl("preserve").getAttribute("data-counter")).to.equal( - "0" + "0", ); expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal( - "0" + "0", ); }; diff --git a/packages/marko/test/components-browser/fixtures/preserve-nodes-update-scoped-elements/test.js b/packages/marko/test/components-browser/fixtures/preserve-nodes-update-scoped-elements/test.js index 488afd1a75..45b425f63d 100644 --- a/packages/marko/test/components-browser/fixtures/preserve-nodes-update-scoped-elements/test.js +++ b/packages/marko/test/components-browser/fixtures/preserve-nodes-update-scoped-elements/test.js @@ -10,10 +10,10 @@ module.exports = function (helpers) { expect( null === rootEl.querySelector("label"), - "label should have been removed" + "label should have been removed", ).to.equal(true); expect( inputEl === rootEl.querySelector("input"), - "input should not have been removed" + "input should not have been removed", ).to.equal(true); }; diff --git a/packages/marko/test/components-browser/fixtures/server-client-mismatch/test.js b/packages/marko/test/components-browser/fixtures/server-client-mismatch/test.js index 326063e2fe..a651dda41c 100644 --- a/packages/marko/test/components-browser/fixtures/server-client-mismatch/test.js +++ b/packages/marko/test/components-browser/fixtures/server-client-mismatch/test.js @@ -4,13 +4,13 @@ module.exports = function (helpers) { var component = helpers.mount(require.resolve("./index"), {}); expect(helpers.targetEl.innerHTML).to.equal( - '
eBay' + '
eBay', ); component.forceUpdate(); component.update(); expect(helpers.targetEl.innerHTML).to.equal( - '
eBay' + '
eBay', ); }; diff --git a/packages/marko/test/components-browser/fixtures/tag-empty/test.js b/packages/marko/test/components-browser/fixtures/tag-empty/test.js index a164dd78c7..ec49d2c728 100644 --- a/packages/marko/test/components-browser/fixtures/tag-empty/test.js +++ b/packages/marko/test/components-browser/fixtures/tag-empty/test.js @@ -9,7 +9,7 @@ module.exports = function (helpers) { const openTag = tag ? `<${tag}>` : ""; const closeTag = tag ? `` : ""; expect(helpers.targetEl.innerHTML).to.contain( - `
${openTag}${innerHTML}${closeTag}
` + `
${openTag}${innerHTML}${closeTag}
`, ); } diff --git a/packages/marko/test/components-browser/fixtures/textarea/test.js b/packages/marko/test/components-browser/fixtures/textarea/test.js index ffccef431a..552526437e 100644 --- a/packages/marko/test/components-browser/fixtures/textarea/test.js +++ b/packages/marko/test/components-browser/fixtures/textarea/test.js @@ -9,6 +9,6 @@ module.exports = function (helpers) { component.update(); expect(component.el.querySelector("pre").innerHTML).to.equal( - "Placeholder error" + "Placeholder error", ); }; diff --git a/packages/marko/test/components-browser/index.test.js b/packages/marko/test/components-browser/index.test.js index 2bee8689e4..f8f5b0b34e 100644 --- a/packages/marko/test/components-browser/index.test.js +++ b/packages/marko/test/components-browser/index.test.js @@ -64,7 +64,7 @@ function runHydrateTest(fixture) { throw new Error("No components rendered by client version of test"); var $global = components.reduce( ($g, c) => Object.assign($g, c.$global), - {} + {}, ); ssrTemplate .render({ components: components, $global: $global }) diff --git a/packages/marko/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js b/packages/marko/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js index 3da7cb62c0..cb411224d9 100644 --- a/packages/marko/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js +++ b/packages/marko/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js @@ -7,7 +7,7 @@ module.exports = function (input, out) { { name: input.name, }, - asyncOut + asyncOut, ); asyncOut.end(); }, 10); diff --git a/packages/marko/test/components-pages/fixtures/component-globals-async/tests.js b/packages/marko/test/components-pages/fixtures/component-globals-async/tests.js index 483ac34720..b3d766ee39 100644 --- a/packages/marko/test/components-pages/fixtures/component-globals-async/tests.js +++ b/packages/marko/test/components-pages/fixtures/component-globals-async/tests.js @@ -3,7 +3,7 @@ var expect = require("chai").expect; it("should allow attributes to not be updated", function () { function testHelloComponent(helloComponent) { expect(helloComponent.el.querySelector(".name").innerHTML).to.equal( - "Frank" + "Frank", ); expect(helloComponent.el.querySelector(".count").innerHTML).to.equal("1"); @@ -11,7 +11,7 @@ it("should allow attributes to not be updated", function () { helloComponent.update(); expect(helloComponent.el.querySelector(".name").innerHTML).to.equal( - "Frank" + "Frank", ); expect(helloComponent.el.querySelector(".count").innerHTML).to.equal("2"); } diff --git a/packages/marko/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js b/packages/marko/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js index 80965f73f7..93e663768c 100644 --- a/packages/marko/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js +++ b/packages/marko/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js @@ -17,7 +17,7 @@ function triggerMouseEvent(el, type) { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); } diff --git a/packages/marko/test/components-pages/fixtures/component-mount-root-renderBody/tests.js b/packages/marko/test/components-pages/fixtures/component-mount-root-renderBody/tests.js index 80965f73f7..93e663768c 100644 --- a/packages/marko/test/components-pages/fixtures/component-mount-root-renderBody/tests.js +++ b/packages/marko/test/components-pages/fixtures/component-mount-root-renderBody/tests.js @@ -17,7 +17,7 @@ function triggerMouseEvent(el, type) { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); } diff --git a/packages/marko/test/components-pages/fixtures/custom-events/tests.js b/packages/marko/test/components-pages/fixtures/custom-events/tests.js index 6fdf7c4055..5b97c20996 100644 --- a/packages/marko/test/components-pages/fixtures/custom-events/tests.js +++ b/packages/marko/test/components-pages/fixtures/custom-events/tests.js @@ -9,13 +9,13 @@ it("should invoke event handler method for custom events with extra args", funct expect(component.pressEvent[0].type).to.equal("ok"); expect(component.pressEvent[1].component).to.equal( - component.getComponent("ok") + component.getComponent("ok"), ); component.getComponent("cancel").emitPressEvent(); expect(component.pressEvent[0].type).to.equal("cancel"); expect(component.pressEvent[1].component).to.equal( - component.getComponent("cancel") + component.getComponent("cancel"), ); }); diff --git a/packages/marko/test/components-pages/fixtures/dom-events-bubbling/tests.js b/packages/marko/test/components-pages/fixtures/dom-events-bubbling/tests.js index 1fd810995d..da1f05c178 100644 --- a/packages/marko/test/components-pages/fixtures/dom-events-bubbling/tests.js +++ b/packages/marko/test/components-pages/fixtures/dom-events-bubbling/tests.js @@ -15,7 +15,7 @@ function triggerMouseEvent(el, type) { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); } diff --git a/packages/marko/test/components-pages/fixtures/dom-events/tests.js b/packages/marko/test/components-pages/fixtures/dom-events/tests.js index 15d6ce420d..a6536b2fba 100644 --- a/packages/marko/test/components-pages/fixtures/dom-events/tests.js +++ b/packages/marko/test/components-pages/fixtures/dom-events/tests.js @@ -17,7 +17,7 @@ function triggerMouseEvent(el, type) { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); } @@ -33,7 +33,7 @@ it("should invoke event handler method for non-bubbling events", function () { expect(window.fooComponent.mouseMoveEvent[0].type).to.equal("mousemove"); expect(window.fooComponent.mouseMoveEvent[1]).to.equal( - window.fooComponent.getEl("button") + window.fooComponent.getEl("button"), ); }); @@ -46,7 +46,7 @@ it("should invoke event handler method for non-bubbling events with extra args", expect(window.fooComponent.mouseMoveEvent[0].type).to.equal("ok"); expect(window.fooComponent.mouseMoveEvent[1].type).to.equal("mousemove"); expect(window.fooComponent.mouseMoveEvent[2]).to.equal( - window.fooComponent.getEl("ok") + window.fooComponent.getEl("ok"), ); triggerMouseEvent(window.fooComponent.getEl("cancel"), "mousemove"); @@ -55,7 +55,7 @@ it("should invoke event handler method for non-bubbling events with extra args", expect(window.fooComponent.mouseMoveEvent[0].type).to.equal("cancel"); expect(window.fooComponent.mouseMoveEvent[1].type).to.equal("mousemove"); expect(window.fooComponent.mouseMoveEvent[2]).to.equal( - window.fooComponent.getEl("cancel") + window.fooComponent.getEl("cancel"), ); }); @@ -65,7 +65,7 @@ it("should invoke event handler method for bubbling events", function () { expect(window.fooComponent.clickEvent != null).to.equal(true); expect(window.fooComponent.clickEvent[0].type).to.equal("click"); expect(window.fooComponent.clickEvent[1]).to.equal( - window.fooComponent.getEl("button") + window.fooComponent.getEl("button"), ); }); diff --git a/packages/marko/test/components-pages/fixtures/getRenderedComponents/tests.js b/packages/marko/test/components-pages/fixtures/getRenderedComponents/tests.js index 06ad80385f..7eb61b3801 100644 --- a/packages/marko/test/components-pages/fixtures/getRenderedComponents/tests.js +++ b/packages/marko/test/components-pages/fixtures/getRenderedComponents/tests.js @@ -19,7 +19,7 @@ it("should serialize component config down to the browser", function () { expect(window.simpleComponents[0].state.name).to.equal("John"); expect(window.simpleComponents[0].state.messageCount).to.equal(10); expect(window.simpleComponents[0].componentConfig.type).to.equal( - "component config" + "component config", ); expect(window.simpleComponents[0].componentConfig.name).to.equal("John"); expect(window.simpleComponents[0].componentConfig.messageCount).to.equal(10); @@ -28,7 +28,7 @@ it("should serialize component config down to the browser", function () { expect(window.simpleComponents[1].state.name).to.equal("Frank"); expect(window.simpleComponents[1].state.messageCount).to.equal(20); expect(window.simpleComponents[1].componentConfig.type).to.equal( - "component config" + "component config", ); expect(window.simpleComponents[1].componentConfig.name).to.equal("Frank"); expect(window.simpleComponents[1].componentConfig.messageCount).to.equal(20); diff --git a/packages/marko/test/components-pages/fixtures/implicit-component-root/tests.js b/packages/marko/test/components-pages/fixtures/implicit-component-root/tests.js index 6e73025cf0..53a9c7be21 100644 --- a/packages/marko/test/components-pages/fixtures/implicit-component-root/tests.js +++ b/packages/marko/test/components-pages/fixtures/implicit-component-root/tests.js @@ -6,6 +6,6 @@ it("should mount explicit components", function () { it("should mount implicit components nested in an explicit component", function () { expect(window.helloExplicitComponent.getComponent("nested") != null).to.equal( - true + true, ); }); diff --git a/packages/marko/test/components-pages/fixtures/no-update/tests.js b/packages/marko/test/components-pages/fixtures/no-update/tests.js index bc00530903..7449ba7b44 100644 --- a/packages/marko/test/components-pages/fixtures/no-update/tests.js +++ b/packages/marko/test/components-pages/fixtures/no-update/tests.js @@ -20,7 +20,7 @@ it("should allow a root element to not be updated", function () { var noUpdateComponent = app.getComponent("no-update-el"); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "server" + "server", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); @@ -31,7 +31,7 @@ it("should allow a root element to not be updated", function () { noUpdateComponent.update(); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "server" + "server", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); }); @@ -41,7 +41,7 @@ it("should allow a nested element to not be updated", function () { var noUpdateComponent = app.getComponent("no-update-el-nested"); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "server" + "server", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); @@ -52,7 +52,7 @@ it("should allow a nested element to not be updated", function () { noUpdateComponent.update(); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "server" + "server", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); }); @@ -62,7 +62,7 @@ it("should allow a body element to not be updated", function () { var noUpdateComponent = app.getComponent("no-update-body-el"); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "server" + "server", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); @@ -73,7 +73,7 @@ it("should allow a body element to not be updated", function () { noUpdateComponent.update(); expect(noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")).to.equal( - "browser" + "browser", ); expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server"); }); diff --git a/packages/marko/test/components-pages/fixtures/preserve-no-update-for-loop/tests.js b/packages/marko/test/components-pages/fixtures/preserve-no-update-for-loop/tests.js index 66f2f43491..953bafe9d0 100644 --- a/packages/marko/test/components-pages/fixtures/preserve-no-update-for-loop/tests.js +++ b/packages/marko/test/components-pages/fixtures/preserve-no-update-for-loop/tests.js @@ -13,6 +13,6 @@ it("should update correctly", function () { component.append("b"); component.update(); expect($el.innerHTML).to.eql( - '
  • a
  • b
    • ' + '
  • a
  • b
    • ', ); }); diff --git a/packages/marko/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js b/packages/marko/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js index 57ec2f97d0..ef44887d69 100644 --- a/packages/marko/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js +++ b/packages/marko/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js @@ -3,22 +3,22 @@ var expect = require("chai").expect; it("should update correctly", function () { var listItemsComponent = window.listItemsComponent; expect( - listItemsComponent.getEl("root").querySelectorAll("li").length + listItemsComponent.getEl("root").querySelectorAll("li").length, ).to.equal(4); expect( - listItemsComponent.getEl("root").querySelectorAll("a").length + listItemsComponent.getEl("root").querySelectorAll("a").length, ).to.equal(4); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML, ).to.equal("apples"); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML, ).to.equal("bananas"); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[2].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[2].innerHTML, ).to.equal("cherries"); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[3].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[3].innerHTML, ).to.equal("dates"); listItemsComponent.input = { @@ -27,16 +27,16 @@ it("should update correctly", function () { listItemsComponent.update(); expect( - listItemsComponent.getEl("root").querySelectorAll("li").length + listItemsComponent.getEl("root").querySelectorAll("li").length, ).to.equal(2); expect( - listItemsComponent.getEl("root").querySelectorAll("a").length + listItemsComponent.getEl("root").querySelectorAll("a").length, ).to.equal(2); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML, ).to.equal("apples"); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML, ).to.equal("bananas"); listItemsComponent.input = { @@ -45,10 +45,10 @@ it("should update correctly", function () { listItemsComponent.update(); expect( - listItemsComponent.getEl("root").querySelectorAll("li").length + listItemsComponent.getEl("root").querySelectorAll("li").length, ).to.equal(0); expect( - listItemsComponent.getEl("root").querySelectorAll("a").length + listItemsComponent.getEl("root").querySelectorAll("a").length, ).to.equal(0); listItemsComponent.input = { @@ -57,15 +57,15 @@ it("should update correctly", function () { listItemsComponent.update(); expect( - listItemsComponent.getEl("root").querySelectorAll("li").length + listItemsComponent.getEl("root").querySelectorAll("li").length, ).to.equal(2); expect( - listItemsComponent.getEl("root").querySelectorAll("a").length + listItemsComponent.getEl("root").querySelectorAll("a").length, ).to.equal(2); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML, ).to.equal("apples"); expect( - listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML + listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML, ).to.equal("bananas"); }); diff --git a/packages/marko/test/components-pages/fixtures/split-emit-multi-args/tests.js b/packages/marko/test/components-pages/fixtures/split-emit-multi-args/tests.js index 597a72e69e..b465689ccd 100644 --- a/packages/marko/test/components-pages/fixtures/split-emit-multi-args/tests.js +++ b/packages/marko/test/components-pages/fixtures/split-emit-multi-args/tests.js @@ -17,7 +17,7 @@ function triggerMouseEvent(el, type) { false, false /* modifier keys */, 0 /*left*/, - null + null, ); el.dispatchEvent(ev); } diff --git a/packages/marko/test/components-pages/fixtures/xss/tests.js b/packages/marko/test/components-pages/fixtures/xss/tests.js index 0c6c68a730..a5b97e5b67 100644 --- a/packages/marko/test/components-pages/fixtures/xss/tests.js +++ b/packages/marko/test/components-pages/fixtures/xss/tests.js @@ -3,9 +3,9 @@ var expect = require("chai").expect; it("should handle ending tag", function () { expect(document.readyState).to.equal("complete"); expect(window.fooComponent.state.evil).to.equal( - '' + '', ); expect(window.fooComponent.componentConfig.evil).to.equal( - '' + '', ); }); diff --git a/packages/marko/test/components-pages/index.test.js b/packages/marko/test/components-pages/index.test.js index e179fe1672..17c27898ec 100644 --- a/packages/marko/test/components-pages/index.test.js +++ b/packages/marko/test/components-pages/index.test.js @@ -32,7 +32,7 @@ function run(fixture) { end() { resolve(html); }, - } + }, ) .once("error", reject); }); diff --git a/packages/marko/test/components-server/fixtures/scriptConcat/test.js b/packages/marko/test/components-server/fixtures/scriptConcat/test.js index 06675b2dc2..3d4787044d 100644 --- a/packages/marko/test/components-server/fixtures/scriptConcat/test.js +++ b/packages/marko/test/components-server/fixtures/scriptConcat/test.js @@ -5,7 +5,7 @@ module.exports = function (helpers, done) { template.render({}, function (err, html) { expect(html.toString()).to.include( - "console.log('hello');console.log('world');console.log('again');console.log('and again')" + "console.log('hello');console.log('world');console.log('again');console.log('and again')", ); done(); }); diff --git a/packages/marko/test/hot-reload/index.test.js b/packages/marko/test/hot-reload/index.test.js index 6220aca66d..747ef52044 100644 --- a/packages/marko/test/hot-reload/index.test.js +++ b/packages/marko/test/hot-reload/index.test.js @@ -7,10 +7,9 @@ chai.config.includeStack = true; var expect = require("chai").expect; -var autotest = require("mocha-autotest").default; var marko = require("marko"); - var hotReload = require("marko/src/node-require/hot-reload"); +var autotest = require("mocha-autotest").default; autotest("fixtures", (fixture) => { let test = fixture.test; diff --git a/packages/marko/test/marko-debug-babel-plugin/fixtures/compiles/test.js b/packages/marko/test/marko-debug-babel-plugin/fixtures/compiles/test.js index 2e3630f0ab..8e13befb42 100644 --- a/packages/marko/test/marko-debug-babel-plugin/fixtures/compiles/test.js +++ b/packages/marko/test/marko-debug-babel-plugin/fixtures/compiles/test.js @@ -2,7 +2,7 @@ const fs = require("fs"); const path = require("path"); const babel = require("@babel/core"); const pluginPath = require.resolve( - "../../../../../../scripts/babel-plugin-marko-debug" + "../../../../../../scripts/babel-plugin-marko-debug", ); exports.check = function (expect, helpers, done) { diff --git a/packages/marko/test/markoc/fixtures/single-template-write-version-comment/test.js b/packages/marko/test/markoc/fixtures/single-template-write-version-comment/test.js index 99d286292c..39ac46317f 100644 --- a/packages/marko/test/markoc/fixtures/single-template-write-version-comment/test.js +++ b/packages/marko/test/markoc/fixtures/single-template-write-version-comment/test.js @@ -5,6 +5,6 @@ exports.test = function (helpers) { helpers.spawnSync(["template.marko"]); var compiledFile = helpers.readSync("template.marko.js").toString(); expect(compiledFile).to.contain( - "Compiled using marko@" + markoVersion + " - DO NOT EDIT" + "Compiled using marko@" + markoVersion + " - DO NOT EDIT", ); }; diff --git a/packages/marko/test/morphdom/index.test.js b/packages/marko/test/morphdom/index.test.js index 44bc63b6f7..d263b70507 100644 --- a/packages/marko/test/morphdom/index.test.js +++ b/packages/marko/test/morphdom/index.test.js @@ -2,14 +2,13 @@ require("../__util__/test-init"); -var chai = require("chai"); -chai.config.includeStack = true; - -var autotest = require("mocha-autotest").default; const fs = require("fs"); const path = require("path"); -const morphdom = require("marko/runtime/vdom/morphdom"); +var chai = require("chai"); const createBrowser = require("jsdom-context-require"); +const morphdom = require("marko/runtime/vdom/morphdom"); +var autotest = require("mocha-autotest").default; +chai.config.includeStack = true; autotest("fixtures", (fixture) => { let dir = fixture.dir; @@ -36,7 +35,7 @@ autotest("fixtures", (fixture) => { let fromNode = fromDocument.body; let realToNode = toDocument.body; var targetVEl = require("marko/runtime/vdom/vdom").___virtualize( - realToNode + realToNode, ); var expectedHTML = serializeNode(realToNode); fs.writeFileSync(resolve("expected.html"), expectedHTML, { diff --git a/packages/marko/test/node-require/index.test.js b/packages/marko/test/node-require/index.test.js index d26ba2d79d..2488f8d74d 100644 --- a/packages/marko/test/node-require/index.test.js +++ b/packages/marko/test/node-require/index.test.js @@ -36,7 +36,7 @@ describe("node-require", function () { extension: ".marko.xml", extensions: [".marko", ".html"], }, - [".marko.xml", ".marko", ".html"] + [".marko.xml", ".marko", ".html"], ); }); @@ -45,7 +45,7 @@ describe("node-require", function () { { extensions: [".marko", ".html"], }, - [".marko", ".html"] + [".marko", ".html"], ); }); @@ -54,7 +54,7 @@ describe("node-require", function () { { extension: ".marko.xml", }, - [".marko.xml"] + [".marko.xml"], ); }); @@ -64,7 +64,7 @@ describe("node-require", function () { extension: ".marko.xml", extensions: [], }, - [".marko.xml"] + [".marko.xml"], ); }); @@ -78,7 +78,7 @@ describe("node-require", function () { extension: "marko.xml", extensions: ["html"], }, - [".marko.xml", ".html"] + [".marko.xml", ".html"], ); }); }); diff --git a/packages/marko/test/render/fixtures-async-callback/await-args-merge/test.js b/packages/marko/test/render/fixtures-async-callback/await-args-merge/test.js index 0689b05382..fb7b4e1f89 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-args-merge/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-args-merge/test.js @@ -26,6 +26,6 @@ var users = { exports.templateData = { userInfo: callbackProviderWithArgs( 1, - (arg) => users[arg.userId][arg.property] + (arg) => users[arg.userId][arg.property], ), }; diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-cspnonce/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-cspnonce/test.js index 5b285bc5a4..12e67e0077 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-cspnonce/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-cspnonce/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); const { callbackProvider } = require("../../../__util__/async-helpers"); exports.templateData = { diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-invoked-once/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-invoked-once/test.js index 79a39fbfa8..e5c3337f84 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-invoked-once/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-invoked-once/test.js @@ -1,5 +1,5 @@ -const extend = require("raptor-util/extend"); const expect = require("chai").expect; +const extend = require("raptor-util/extend"); const { callbackProvider } = require("../../../__util__/async-helpers"); exports.templateData = { diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-mixed/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-mixed/test.js index 9a98ea3519..e4f1fbc3f5 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-mixed/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-mixed/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); const { callbackProvider } = require("../../../__util__/async-helpers"); exports.templateData = { diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-nested/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-nested/test.js index 256651fd45..4080efc3e4 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-nested/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-nested/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); const { callbackProvider } = require("../../../__util__/async-helpers"); exports.templateData = { diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-sync/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-sync/test.js index 9c7b985ac5..95903796de 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder-sync/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder-sync/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { userDataProvider: function (callback) { diff --git a/packages/marko/test/render/fixtures-async-callback/await-client-reorder/test.js b/packages/marko/test/render/fixtures-async-callback/await-client-reorder/test.js index 7377e7ad00..bea8a82c3e 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-client-reorder/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-client-reorder/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); const { callbackProvider } = require("../../../__util__/async-helpers"); exports.templateData = { diff --git a/packages/marko/test/render/fixtures-async-callback/await-timeout/test.js b/packages/marko/test/render/fixtures-async-callback/await-timeout/test.js index b93d1cdcff..d76c3941c8 100644 --- a/packages/marko/test/render/fixtures-async-callback/await-timeout/test.js +++ b/packages/marko/test/render/fixtures-async-callback/await-timeout/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { userInfoShort: function (done) { diff --git a/packages/marko/test/render/fixtures/await-client-reorder-cspnonce/test.js b/packages/marko/test/render/fixtures/await-client-reorder-cspnonce/test.js index 2191857fc8..9e904cbf6e 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder-cspnonce/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder-cspnonce/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { outer: Promise.resolve(), diff --git a/packages/marko/test/render/fixtures/await-client-reorder-invoked-once/test.js b/packages/marko/test/render/fixtures/await-client-reorder-invoked-once/test.js index acac380c5d..76724d6ebe 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder-invoked-once/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder-invoked-once/test.js @@ -1,5 +1,5 @@ -const extend = require("raptor-util/extend"); const expect = require("chai").expect; +const extend = require("raptor-util/extend"); exports.templateData = { outer: Promise.resolve(), diff --git a/packages/marko/test/render/fixtures/await-client-reorder-mixed/test.js b/packages/marko/test/render/fixtures/await-client-reorder-mixed/test.js index 77dbe60ed5..c7b9086dca 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder-mixed/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder-mixed/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { outer: Promise.resolve(), diff --git a/packages/marko/test/render/fixtures/await-client-reorder-nested/test.js b/packages/marko/test/render/fixtures/await-client-reorder-nested/test.js index 4d6361204a..9ae4c77921 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder-nested/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder-nested/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { outer: Promise.resolve(), diff --git a/packages/marko/test/render/fixtures/await-client-reorder-sync/test.js b/packages/marko/test/render/fixtures/await-client-reorder-sync/test.js index 15d6f8df30..db29efcf5b 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder-sync/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder-sync/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { userDataProvider: { name: "Frank" }, diff --git a/packages/marko/test/render/fixtures/await-client-reorder/test.js b/packages/marko/test/render/fixtures/await-client-reorder/test.js index e359f29b02..5bb53fd73d 100644 --- a/packages/marko/test/render/fixtures/await-client-reorder/test.js +++ b/packages/marko/test/render/fixtures/await-client-reorder/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { outer: Promise.resolve(), diff --git a/packages/marko/test/render/fixtures/await-timeout/test.js b/packages/marko/test/render/fixtures/await-timeout/test.js index 4aa8e7e531..d7498e8575 100644 --- a/packages/marko/test/render/fixtures/await-timeout/test.js +++ b/packages/marko/test/render/fixtures/await-timeout/test.js @@ -1,5 +1,5 @@ -var extend = require("raptor-util/extend"); var expect = require("chai").expect; +var extend = require("raptor-util/extend"); exports.templateData = { getUserInfoShort: () => diff --git a/packages/marko/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js b/packages/marko/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js index 714ccc6922..cfb09cedbc 100644 --- a/packages/marko/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js +++ b/packages/marko/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js @@ -2,6 +2,6 @@ exports.render = function (input, out) { out.write( "[" + [input.prop1, input.prop2, input.default1, input.default2].join(",") + - "]" + "]", ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js b/packages/marko/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js b/packages/marko/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js b/packages/marko/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js index d7afd2c85b..466b7329d0 100644 --- a/packages/marko/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js @@ -11,6 +11,6 @@ exports.renderer = function (input, out) { body: body, footer: footer, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js b/packages/marko/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js b/packages/marko/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js b/packages/marko/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js index d7afd2c85b..466b7329d0 100644 --- a/packages/marko/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js +++ b/packages/marko/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js @@ -11,6 +11,6 @@ exports.renderer = function (input, out) { body: body, footer: footer, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/syntax-concise/tabs/renderer.js b/packages/marko/test/render/fixtures/syntax-concise/tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/syntax-concise/tabs/renderer.js +++ b/packages/marko/test/render/fixtures/syntax-concise/tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/syntax-mixed/tabs/renderer.js b/packages/marko/test/render/fixtures/syntax-mixed/tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/syntax-mixed/tabs/renderer.js +++ b/packages/marko/test/render/fixtures/syntax-mixed/tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/syntax-verbose/tabs/renderer.js b/packages/marko/test/render/fixtures/syntax-verbose/tabs/renderer.js index 8f1c5fb2b9..09aa534fc7 100644 --- a/packages/marko/test/render/fixtures/syntax-verbose/tabs/renderer.js +++ b/packages/marko/test/render/fixtures/syntax-verbose/tabs/renderer.js @@ -7,6 +7,6 @@ exports.renderer = function (input, out) { { tabs: tabs, }, - out + out, ); }; diff --git a/packages/marko/test/render/fixtures/tags-dir-null/test.js b/packages/marko/test/render/fixtures/tags-dir-null/test.js index 15cc086f8d..925e9d9a4e 100644 --- a/packages/marko/test/render/fixtures/tags-dir-null/test.js +++ b/packages/marko/test/render/fixtures/tags-dir-null/test.js @@ -3,8 +3,11 @@ var expect = require("chai").expect; exports.templateData = {}; exports.checkError = function (e) { - // eslint-disable-next-line no-control-regex - var message = e.message.replace(/([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g, ""); + var message = e.message.replace( + // eslint-disable-next-line no-control-regex + /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g, + "", + ); //includes the tag it broke on expect(message).to.contain("test-hello"); diff --git a/packages/marko/test/render/index.test.js b/packages/marko/test/render/index.test.js index 795ea84917..94bddda0cf 100644 --- a/packages/marko/test/render/index.test.js +++ b/packages/marko/test/render/index.test.js @@ -4,12 +4,12 @@ require("../__util__/test-init"); const fs = require("fs"); const path = require("path"); +const expect = require("chai").expect; +const toDiffableHtml = require("diffable-html"); const marko = require("marko"); const autotest = require("mocha-autotest").default; -const domToString = require("../__util__/domToString"); const createBrowserWithMarko = require("../__util__/create-marko-jsdom-module"); -const expect = require("chai").expect; -const toDiffableHtml = require("diffable-html"); +const domToString = require("../__util__/domToString"); const browser = createBrowserWithMarko(__dirname, ""); autotest("fixtures", { @@ -49,8 +49,8 @@ async function runRenderTest(fixture) { let main = !fs.existsSync(mainPath) ? {} : isVDOM - ? browser.require(mainPath) - : require(mainPath); + ? browser.require(mainPath) + : require(mainPath); let loadOptions = main && main.loadOptions; try { @@ -117,13 +117,13 @@ async function runRenderTest(fixture) { html = html.replace(/$/, ""); out.emit("finish"); }, - } + }, ); let asyncEventsVerifier = createAsyncVerifier( main, snapshot, out, - isVDOM + isVDOM, ); if (main.sync) { diff --git a/packages/marko/test/taglib-finder/index.test.js b/packages/marko/test/taglib-finder/index.test.js index 71f0c1c72c..41a413c9d5 100644 --- a/packages/marko/test/taglib-finder/index.test.js +++ b/packages/marko/test/taglib-finder/index.test.js @@ -6,9 +6,8 @@ var chai = require("chai"); chai.config.includeStack = true; require("chai").should(); require("marko/compiler"); -var autotest = require("mocha-autotest").default; - var taglibFinder = require("marko/taglib").finder; +var autotest = require("mocha-autotest").default; autotest("fixtures", (fixture) => { let test = fixture.test; diff --git a/packages/marko/test/taglib-loader/fixtures/custom-extensions/test.js b/packages/marko/test/taglib-loader/fixtures/custom-extensions/test.js index 83f47ce6c5..20616d6ec4 100644 --- a/packages/marko/test/taglib-loader/fixtures/custom-extensions/test.js +++ b/packages/marko/test/taglib-loader/fixtures/custom-extensions/test.js @@ -2,7 +2,7 @@ var nodePath = require("path"); exports.check = function (taglibLoader, expect) { var taglib = taglibLoader.loadTaglibFromFile( - nodePath.join(__dirname, "marko.json") + nodePath.join(__dirname, "marko.json"), ); expect(taglib != null).to.equal(true); diff --git a/packages/marko/test/taglib-loader/fixtures/paths/test.js b/packages/marko/test/taglib-loader/fixtures/paths/test.js index 003c483575..d63c616636 100644 --- a/packages/marko/test/taglib-loader/fixtures/paths/test.js +++ b/packages/marko/test/taglib-loader/fixtures/paths/test.js @@ -2,7 +2,7 @@ var nodePath = require("path"); exports.check = function (taglibLoader, expect) { var taglib = taglibLoader.loadTaglibFromFile( - nodePath.join(__dirname, "marko.json") + nodePath.join(__dirname, "marko.json"), ); expect(taglib != null).to.equal(true); @@ -11,19 +11,19 @@ exports.check = function (taglibLoader, expect) { var helloTagScanned = taglib.tags["test-hello-scanned"]; expect(helloTagScanned.filePath).to.equal( - nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json") + nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json"), ); expect(helloTagScanned.dir).to.equal( - nodePath.join(__dirname, "tags/test-hello-scanned") + nodePath.join(__dirname, "tags/test-hello-scanned"), ); expect(helloTagScanned.attributes.name.filePath).to.equal( - nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json") + nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json"), ); var helloTag = taglib.tags["test-hello"]; expect(helloTag.filePath).to.equal(nodePath.join(__dirname, "marko.json")); expect(helloTag.dir).to.equal(__dirname); expect(helloTag.attributes.name.filePath).to.equal( - nodePath.join(__dirname, "marko.json") + nodePath.join(__dirname, "marko.json"), ); }; diff --git a/packages/marko/test/taglib-loader/fixtures/repeated-nested-tag/test.js b/packages/marko/test/taglib-loader/fixtures/repeated-nested-tag/test.js index cf417465f9..6e8fa648f1 100644 --- a/packages/marko/test/taglib-loader/fixtures/repeated-nested-tag/test.js +++ b/packages/marko/test/taglib-loader/fixtures/repeated-nested-tag/test.js @@ -2,7 +2,7 @@ var nodePath = require("path"); exports.check = function (taglibLoader, expect) { var taglib = taglibLoader.loadTaglibFromFile( - nodePath.join(__dirname, "marko.json") + nodePath.join(__dirname, "marko.json"), ); expect(taglib != null).to.equal(true); diff --git a/packages/marko/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js b/packages/marko/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js index 19b4e1ae93..0e72735447 100644 --- a/packages/marko/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js +++ b/packages/marko/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js @@ -2,7 +2,7 @@ var nodePath = require("path"); exports.check = function (taglibLoader, expect) { var taglib = taglibLoader.loadTaglibFromFile( - nodePath.join(__dirname, "marko.json") + nodePath.join(__dirname, "marko.json"), ); expect(taglib != null).to.equal(true); @@ -11,7 +11,7 @@ exports.check = function (taglibLoader, expect) { expect(shorthandCheckbox.attributes.label.type).to.equal("object"); expect(shorthandCheckbox.nestedTags.label.type).to.equal("object"); expect(shorthandCheckbox.nestedTags.foo.attributes.bar.type).to.equal( - "string" + "string", ); var shorthandTabsTag = taglib.tags["shorthand-tabs"]; diff --git a/packages/marko/test/taglib-lookup/fixtures/de-dupe/test.js b/packages/marko/test/taglib-lookup/fixtures/de-dupe/test.js index 6a7e0aabfb..b00a262842 100644 --- a/packages/marko/test/taglib-lookup/fixtures/de-dupe/test.js +++ b/packages/marko/test/taglib-lookup/fixtures/de-dupe/test.js @@ -3,7 +3,7 @@ var nodePath = require("path"); exports.check = function (markoCompiler, expect) { var taglibLookup = markoCompiler.taglibLookup; var lookup = taglibLookup.buildLookup( - nodePath.join(__dirname, "taglib-duplicate") + nodePath.join(__dirname, "taglib-duplicate"), ); // The "duplicate-bar" tag was declared in the lower diff --git a/packages/marko/test/taglib-lookup/fixtures/global-attrs/test.js b/packages/marko/test/taglib-lookup/fixtures/global-attrs/test.js index 5c158e4ec7..7a7fc9f30d 100644 --- a/packages/marko/test/taglib-lookup/fixtures/global-attrs/test.js +++ b/packages/marko/test/taglib-lookup/fixtures/global-attrs/test.js @@ -4,7 +4,7 @@ exports.check = function (markoCompiler, expect) { // console.log('LOOKUP: ', Object.keys(lookup.attributes)); var attrDef = lookup.getAttribute( "test-dynamic-attributes", - "global-attribute" + "global-attribute", ); expect(attrDef != null).to.equal(true); expect(attrDef.type).to.equal("boolean"); diff --git a/packages/marko/test/vdom-create/fixtures/appendDocumentFragment-children/index.js b/packages/marko/test/vdom-create/fixtures/appendDocumentFragment-children/index.js index 561c843414..7f288d41fe 100644 --- a/packages/marko/test/vdom-create/fixtures/appendDocumentFragment-children/index.js +++ b/packages/marko/test/vdom-create/fixtures/appendDocumentFragment-children/index.js @@ -5,7 +5,7 @@ module.exports = function (helpers) { var docFragment = root.___appendDocumentFragment(); docFragment.___appendChild( - helpers.vdom.createElement("div", { class: "middle-child" }) + helpers.vdom.createElement("div", { class: "middle-child" }), ); root.e("div", { class: "last-child" }); diff --git a/packages/marko/test/vdom-create/fixtures/attributes-null-false/index.js b/packages/marko/test/vdom-create/fixtures/attributes-null-false/index.js index fe7f36e932..354eee16d0 100644 --- a/packages/marko/test/vdom-create/fixtures/attributes-null-false/index.js +++ b/packages/marko/test/vdom-create/fixtures/attributes-null-false/index.js @@ -11,7 +11,7 @@ module.exports = function (helpers) { "data-bar": false, checked: true, }, - 0 + 0, ) .e("a", null, 0); }; diff --git a/packages/marko/test/vdom-create/fixtures/cloneNode-documentFragment/index.js b/packages/marko/test/vdom-create/fixtures/cloneNode-documentFragment/index.js index 520d453995..5c00e6d1e7 100644 --- a/packages/marko/test/vdom-create/fixtures/cloneNode-documentFragment/index.js +++ b/packages/marko/test/vdom-create/fixtures/cloneNode-documentFragment/index.js @@ -6,7 +6,7 @@ module.exports = function (helpers) { null /* attrs */, null /* key */, null /* component */, - null /* child count */ + null /* child count */, ); var docFragment = helpers.vdom.createDocumentFragment(); diff --git a/packages/marko/test/vdom-create/fixtures/cloneNode/index.js b/packages/marko/test/vdom-create/fixtures/cloneNode/index.js index 6cfe68a76e..91ee0b4060 100644 --- a/packages/marko/test/vdom-create/fixtures/cloneNode/index.js +++ b/packages/marko/test/vdom-create/fixtures/cloneNode/index.js @@ -10,7 +10,7 @@ module.exports = function (helpers) { }, null, null, - 1 /* childCount */ + 1 /* childCount */, ) .e( "svg", @@ -20,7 +20,7 @@ module.exports = function (helpers) { }, null, null, - 1 + 1, ) .e( "circle", @@ -35,7 +35,7 @@ module.exports = function (helpers) { }, null, null, - 0 + 0, ); var clone = el.___cloneNode(); diff --git a/packages/marko/test/vdom-create/fixtures/createAttributes/index.js b/packages/marko/test/vdom-create/fixtures/createAttributes/index.js index 263ad25f3d..ccdf11cbb5 100644 --- a/packages/marko/test/vdom-create/fixtures/createAttributes/index.js +++ b/packages/marko/test/vdom-create/fixtures/createAttributes/index.js @@ -12,7 +12,7 @@ module.exports = function (helpers) { null, null /* key */, null /* component */, - 2 /* childCount */ + 2 /* childCount */, ) .e("span", null, null /* key */, null /* component */, 1) .e("a", attributes, null /* key */, null /* component */, 1) diff --git a/packages/marko/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js b/packages/marko/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js index ef8a56aa0b..dec02dcf31 100644 --- a/packages/marko/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js +++ b/packages/marko/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js @@ -7,18 +7,18 @@ module.exports = function (helpers) { docFragmentA.___appendChild(docFragmentAA); docFragmentAA.___appendChild( - helpers.vdom.createElement("div", { class: "aa1" }) + helpers.vdom.createElement("div", { class: "aa1" }), ); docFragmentAA.___appendChild( - helpers.vdom.createElement("div", { class: "aa2" }) + helpers.vdom.createElement("div", { class: "aa2" }), ); var docFragmentB = helpers.vdom.createDocumentFragment(); docFragmentB.___appendChild( - helpers.vdom.createElement("div", { class: "b1" }) + helpers.vdom.createElement("div", { class: "b1" }), ); docFragmentB.___appendChild( - helpers.vdom.createElement("div", { class: "b2" }) + helpers.vdom.createElement("div", { class: "b2" }), ); root.___appendChild(docFragmentA); diff --git a/packages/marko/test/vdom-create/fixtures/id/index.js b/packages/marko/test/vdom-create/fixtures/id/index.js index ca2cd6caf0..6e3f3f25a0 100644 --- a/packages/marko/test/vdom-create/fixtures/id/index.js +++ b/packages/marko/test/vdom-create/fixtures/id/index.js @@ -6,7 +6,7 @@ module.exports = function (helpers) { { id: "foo" }, null /* key */, null /* component */, - 0 /* childCount */ + 0 /* childCount */, ); expect(el.___attributes.id).to.equal("foo"); return el; diff --git a/packages/marko/test/vdom-create/fixtures/input-checked/index.js b/packages/marko/test/vdom-create/fixtures/input-checked/index.js index dfb2b49737..92ec9f9f25 100644 --- a/packages/marko/test/vdom-create/fixtures/input-checked/index.js +++ b/packages/marko/test/vdom-create/fixtures/input-checked/index.js @@ -4,7 +4,7 @@ module.exports = function (helpers) { var el = helpers.vdom.createElement( "input", { type: "checkbox", checked: true }, - 0 /* childCount */ + 0 /* childCount */, ); expect(el.checked).to.equal(true); diff --git a/packages/marko/test/vdom-create/fixtures/input-disabled/index.js b/packages/marko/test/vdom-create/fixtures/input-disabled/index.js index 3c716e3be7..f2395560ac 100644 --- a/packages/marko/test/vdom-create/fixtures/input-disabled/index.js +++ b/packages/marko/test/vdom-create/fixtures/input-disabled/index.js @@ -4,7 +4,7 @@ module.exports = function (helpers) { var el = helpers.vdom.createElement( "input", { disabled: "disabled" }, - 0 /* childCount */ + 0 /* childCount */, ); expect(el.disabled).to.equal(true); diff --git a/packages/marko/test/vdom-create/fixtures/input-value/index.js b/packages/marko/test/vdom-create/fixtures/input-value/index.js index b4124025e4..6f8c4c2a8a 100644 --- a/packages/marko/test/vdom-create/fixtures/input-value/index.js +++ b/packages/marko/test/vdom-create/fixtures/input-value/index.js @@ -6,7 +6,7 @@ module.exports = function (helpers) { { value: "foo" }, null /* key */, null /* component */, - 0 /* childCount */ + 0 /* childCount */, ); expect(el.___value).to.equal("foo"); diff --git a/packages/marko/test/vdom-create/fixtures/isSameNode-createElement/index.js b/packages/marko/test/vdom-create/fixtures/isSameNode-createElement/index.js index 579e1d203a..2c122ecf35 100644 --- a/packages/marko/test/vdom-create/fixtures/isSameNode-createElement/index.js +++ b/packages/marko/test/vdom-create/fixtures/isSameNode-createElement/index.js @@ -20,14 +20,14 @@ module.exports = function (helpers) { null /* component */, 0 /* childCount */, null, - { i: "abc123" /* key */ } + { i: "abc123" /* key */ }, ); var span = helpers.vdom.createElement( "span", null, null /* key */, null /* component */, - 0 /* childCount */ + 0 /* childCount */, ); var divClone = div.___cloneNode(); diff --git a/packages/marko/test/vdom-create/fixtures/no-children/index.js b/packages/marko/test/vdom-create/fixtures/no-children/index.js index b39a4d8134..98fd54e74a 100644 --- a/packages/marko/test/vdom-create/fixtures/no-children/index.js +++ b/packages/marko/test/vdom-create/fixtures/no-children/index.js @@ -2,6 +2,6 @@ module.exports = function (helpers) { return helpers.vdom.createElement( "div", { class: "foo", onclick: "doSomething()" }, - 0 /* childCount */ + 0 /* childCount */, ); }; diff --git a/packages/marko/test/vdom-create/fixtures/option-selected/index.js b/packages/marko/test/vdom-create/fixtures/option-selected/index.js index d83ce1f919..c972960a97 100644 --- a/packages/marko/test/vdom-create/fixtures/option-selected/index.js +++ b/packages/marko/test/vdom-create/fixtures/option-selected/index.js @@ -4,7 +4,7 @@ module.exports = function (helpers) { var el = helpers.vdom.createElement( "option", { selected: "" }, - 0 /* childCount */ + 0 /* childCount */, ); expect(el.selected).to.equal(true); return el; diff --git a/packages/marko/test/vdom-create/fixtures/static-tree-svg/index.js b/packages/marko/test/vdom-create/fixtures/static-tree-svg/index.js index 324fa1bb84..8177836d72 100644 --- a/packages/marko/test/vdom-create/fixtures/static-tree-svg/index.js +++ b/packages/marko/test/vdom-create/fixtures/static-tree-svg/index.js @@ -2,13 +2,13 @@ module.exports = function (helpers) { var svg = helpers.vdom.createElement( "svg", { height: "150", width: "400" }, - null + null, ); var linearGradient = helpers.vdom.createElement( "linearGradient", { x1: "0%", y1: "0%", x2: "100%", y2: "0%" }, - null + null, ); svg.___appendChild(linearGradient); @@ -17,16 +17,16 @@ module.exports = function (helpers) { helpers.vdom.createElement( "stop", { offset: "0%", style: "stop-color:rgb(255,255,0);stop-opacity:1" }, - null - ) + null, + ), ); linearGradient.___appendChild( helpers.vdom.createElement( "stop", { offset: "100%", style: "stop-color:rgb(255,0,0);stop-opacity:1" }, - null - ) + null, + ), ); return svg; diff --git a/packages/marko/test/vdom-create/fixtures/static-tree/index.js b/packages/marko/test/vdom-create/fixtures/static-tree/index.js index f3e45d9cde..2847354099 100644 --- a/packages/marko/test/vdom-create/fixtures/static-tree/index.js +++ b/packages/marko/test/vdom-create/fixtures/static-tree/index.js @@ -7,7 +7,7 @@ module.exports = function (helpers) { { href: "http://ebay.com" }, null /* key */, null /* component */, - 1 /* childCount */ + 1 /* childCount */, ) .t("eBay"); @@ -17,7 +17,7 @@ module.exports = function (helpers) { { class: "foo", onclick: "doSomething()" }, null /* key */, null /* component */, - 2 /* childCount */ + 2 /* childCount */, ) .n(link) .e("span", null, null /* key */, null /* component */, 0); diff --git a/packages/marko/test/vdom-create/fixtures/svg-dynamic/index.js b/packages/marko/test/vdom-create/fixtures/svg-dynamic/index.js index be5a37b965..4dc99023e8 100644 --- a/packages/marko/test/vdom-create/fixtures/svg-dynamic/index.js +++ b/packages/marko/test/vdom-create/fixtures/svg-dynamic/index.js @@ -5,7 +5,7 @@ module.exports = function (helpers) { .createElement( "div", { class: "foo", onclick: "doSomething()" }, - 1 /* childCount */ + 1 /* childCount */, ) .e( "svg", @@ -14,7 +14,7 @@ module.exports = function (helpers) { height: "100", xmlns: "http://www.w3.org/2000/svg", }, - 1 + 1, ) .e( "circle", @@ -28,6 +28,6 @@ module.exports = function (helpers) { "xlink:href": "http://ebay.com/", }, 0, - FLAGS + FLAGS, ); }; diff --git a/packages/marko/test/vdom-create/fixtures/svg/index.js b/packages/marko/test/vdom-create/fixtures/svg/index.js index e5639ef109..ebcb42c1f0 100644 --- a/packages/marko/test/vdom-create/fixtures/svg/index.js +++ b/packages/marko/test/vdom-create/fixtures/svg/index.js @@ -3,7 +3,7 @@ module.exports = function (helpers) { .createElement( "div", { class: "foo", onclick: "doSomething()" }, - 1 /* childCount */ + 1 /* childCount */, ) .e("svg", { width: "100", height: "100" }, 1) .e( @@ -17,6 +17,6 @@ module.exports = function (helpers) { fill: "yellow", "xlink:href": "http://ebay.com/", }, - 0 + 0, ); }; diff --git a/packages/marko/test/vdom-create/fixtures/textarea-invalid-child/index.js b/packages/marko/test/vdom-create/fixtures/textarea-invalid-child/index.js index 914c2fac75..c0a378c930 100644 --- a/packages/marko/test/vdom-create/fixtures/textarea-invalid-child/index.js +++ b/packages/marko/test/vdom-create/fixtures/textarea-invalid-child/index.js @@ -8,7 +8,7 @@ module.exports = function (helpers) { {}, null /* key */, null /* component */, - 2 /* childCount */ + 2 /* childCount */, ) .e("div", {}, null /* key */, null /* component */, 0) .t("bar"); diff --git a/packages/marko/test/vdom-create/fixtures/textarea/index.js b/packages/marko/test/vdom-create/fixtures/textarea/index.js index 8f7a33eb39..085a4f5c8d 100644 --- a/packages/marko/test/vdom-create/fixtures/textarea/index.js +++ b/packages/marko/test/vdom-create/fixtures/textarea/index.js @@ -10,7 +10,7 @@ module.exports = function (helpers) { null /* key */, null /* component */, 2 /* childCount */, - FLAGS + FLAGS, ) .t("foo") .t("bar"); diff --git a/packages/marko/test/vdom-create/index.test.js b/packages/marko/test/vdom-create/index.test.js index 59796bf6de..65a345bd11 100644 --- a/packages/marko/test/vdom-create/index.test.js +++ b/packages/marko/test/vdom-create/index.test.js @@ -3,16 +3,16 @@ require("../__util__/test-init"); var fs = require("fs"); -var domToString = require("../__util__/domToString"); var createBrowser = require("jsdom-context-require"); +var vdom = require("marko/runtime/vdom/vdom"); var autotest = require("mocha-autotest").default; +var domToString = require("../__util__/domToString"); var document = createBrowser({ dir: __dirname, html: "", }).window.document; -var vdom = require("marko/runtime/vdom/vdom"); var VElement = vdom.___VElement; var VText = vdom.___VText; var VDocumentFragment = vdom.___VDocumentFragment; @@ -25,7 +25,7 @@ var vdomHelpers = { component, childCount, flags, - props + props, ) { return new VElement( tagName, @@ -34,7 +34,7 @@ var vdomHelpers = { component, childCount, flags, - props + props, ); }, createText: function (value) { diff --git a/packages/marko/test/vdom-virtualize/index.test.js b/packages/marko/test/vdom-virtualize/index.test.js index 4c5faea831..7c8e4eb075 100644 --- a/packages/marko/test/vdom-virtualize/index.test.js +++ b/packages/marko/test/vdom-virtualize/index.test.js @@ -1,11 +1,11 @@ "use strict"; require("../__util__/test-init"); -var virtualize = require("marko/runtime/vdom/vdom").___virtualize; var fs = require("fs"); -var toHTML = require("../__util__/toHTML"); var createBrowser = require("jsdom-context-require"); +var virtualize = require("marko/runtime/vdom/vdom").___virtualize; var autotest = require("mocha-autotest").default; +var toHTML = require("../__util__/toHTML"); autotest("fixtures", (fixture) => { let test = fixture.test; diff --git a/packages/translator-default/src/cdata/index[html].js b/packages/translator-default/src/cdata/index[html].js index 1c3dd5ce31..532ffd2a44 100644 --- a/packages/translator-default/src/cdata/index[html].js +++ b/packages/translator-default/src/cdata/index[html].js @@ -8,7 +8,7 @@ export default function (path) { path.replaceWith( withPreviousLocation( write``, - node - ) + node, + ), ); } diff --git a/packages/translator-default/src/cdata/index[vdom].js b/packages/translator-default/src/cdata/index[vdom].js index f262dc117c..e4c2d041fe 100644 --- a/packages/translator-default/src/cdata/index[vdom].js +++ b/packages/translator-default/src/cdata/index[vdom].js @@ -6,6 +6,6 @@ export default function (path) { const { node } = path; path.replaceWith( - withPreviousLocation(write("t", t.stringLiteral(node.value)), node) + withPreviousLocation(write("t", t.stringLiteral(node.value)), node), ); } diff --git a/packages/translator-default/src/class.js b/packages/translator-default/src/class.js index d82d69868e..c58a5e964f 100644 --- a/packages/translator-default/src/class.js +++ b/packages/translator-default/src/class.js @@ -13,7 +13,7 @@ export default function (path) { (prop) => prop.computed === false && t.isIdentifier(prop.key) && - prop.key.name === "onCreate" + prop.key.name === "onCreate", ); const objectProperties = body @@ -30,8 +30,8 @@ export default function (path) { t.assignmentExpression( "=", t.memberExpression(t.thisExpression(), prop.key, prop.computed), - prop.value || t.unaryExpression("void", t.numericLiteral(0)) - ) + prop.value || t.unaryExpression("void", t.numericLiteral(0)), + ), ); } @@ -40,7 +40,7 @@ export default function (path) { throw file.buildCodeFrameError( prop, - "Unsupported class property on component." + "Unsupported class property on component.", ); }) .filter(Boolean); @@ -52,8 +52,8 @@ export default function (path) { "method", t.identifier("onCreate"), [], - t.blockStatement([]) - )) + t.blockStatement([]), + )), ); } diff --git a/packages/translator-default/src/comment/index[html].js b/packages/translator-default/src/comment/index[html].js index a8efd1609b..1ec7e2f072 100644 --- a/packages/translator-default/src/comment/index[html].js +++ b/packages/translator-default/src/comment/index[html].js @@ -8,7 +8,7 @@ export default function (path) { if (ieConditionalCommentRegExp.test(node.value)) { path.replaceWith( - withPreviousLocation(write``, node) + withPreviousLocation(write``, node), ); } else { path.remove(); diff --git a/packages/translator-default/src/declaration/index[html].js b/packages/translator-default/src/declaration/index[html].js index 59420841cb..ea33564d1c 100644 --- a/packages/translator-default/src/declaration/index[html].js +++ b/packages/translator-default/src/declaration/index[html].js @@ -6,6 +6,6 @@ export default function (path) { const { node } = path; path.replaceWith( - withPreviousLocation(write``, node) + withPreviousLocation(write``, node), ); } diff --git a/packages/translator-default/src/document-type/index[html].js b/packages/translator-default/src/document-type/index[html].js index 7af033c207..ccec6d8560 100644 --- a/packages/translator-default/src/document-type/index[html].js +++ b/packages/translator-default/src/document-type/index[html].js @@ -6,6 +6,6 @@ export default function (path) { const { node } = path; path.replaceWith( - withPreviousLocation(write``, node) + withPreviousLocation(write``, node), ); } diff --git a/packages/translator-default/src/index.js b/packages/translator-default/src/index.js index bd2a6fd001..2ba396e0cb 100644 --- a/packages/translator-default/src/index.js +++ b/packages/translator-default/src/index.js @@ -1,5 +1,4 @@ import { resolve } from "path"; -import { types as t } from "@marko/compiler"; import { findParentTag, getTagDef, @@ -15,20 +14,21 @@ import { resolveRelativePath, resolveTagImport, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import { version } from "marko/package.json"; -import MarkoDocumentType from "./document-type"; -import MarkoDeclaration from "./declaration"; import MarkoCDATA from "./cdata"; -import MarkoTag from "./tag"; -import MarkoText from "./text"; -import MarkoPlaceholder from "./placeholder"; +import MarkoClass from "./class"; import MarkoComment from "./comment"; +import MarkoDeclaration from "./declaration"; +import MarkoDocumentType from "./document-type"; +import MarkoPlaceholder from "./placeholder"; import MarkoScriptlet from "./scriptlet"; -import MarkoClass from "./class"; -import { analyzeStaticVDOM } from "./util/optimize-vdom-create"; -import { optimizeHTMLWrites } from "./util/optimize-html-writes"; -import getComponentFiles from "./util/get-component-files"; +import MarkoTag from "./tag"; +import MarkoText from "./text"; import addDependencies from "./util/add-dependencies"; +import getComponentFiles from "./util/get-component-files"; +import { optimizeHTMLWrites } from "./util/optimize-html-writes"; +import { analyzeStaticVDOM } from "./util/optimize-vdom-create"; export { default as taglibs } from "./taglib"; @@ -70,7 +70,7 @@ export const analyze = { meta.deps = meta.deps.map((filename) => typeof filename === "string" ? resolveRelativePath(file, filename) - : filename + : filename, ); meta.imports = program.node.body @@ -92,8 +92,8 @@ export const analyze = { meta.deps.push( resolve( tagDef.dir, - resolve(tagDef.dir, tagDef.parseOptions.import) - ) + resolve(tagDef.dir, tagDef.parseOptions.import), + ), ); } } @@ -197,8 +197,8 @@ export const translate = { t.program( parseStatements(file, file.metadata.marko.moduleCode), undefined, - file.markoOpts.modules === "cjs" ? "script" : "module" - ) + file.markoOpts.modules === "cjs" ? "script" : "module", + ), )[0] .skip(); return; @@ -242,7 +242,7 @@ export const translate = { importDefault( file, resolveRelativePath(file, componentFile), - "marko_component" + "marko_component", )) || _inlineComponentClass || t.objectExpression([]); @@ -250,29 +250,29 @@ export const translate = { const componentIdentifier = path.scope.generateUidIdentifier("marko_component"); const componentTypeIdentifier = path.scope.generateUidIdentifier( - "marko_componentType" + "marko_componentType", ); const templateIdentifier = path.scope.generateUidIdentifier("marko_template"); const rendererIdentifier = importDefault( file, "marko/src/runtime/components/renderer.js", - "marko_renderer" + "marko_renderer", ); const templateRendererMember = t.memberExpression( templateIdentifier, - t.identifier("_") + t.identifier("_"), ); const templateMetaMember = t.memberExpression( templateIdentifier, - t.identifier("meta") + t.identifier("meta"), ); if (markoOpts.writeVersionComment) { path.addComment( "leading", ` Compiled using marko@${version} - DO NOT EDIT`, - true + true, ); } @@ -286,19 +286,19 @@ export const translate = { t.stringLiteral( `marko/${markoOpts.optimize ? "dist" : "src"}/runtime/${ isHTML ? "html" : "vdom" - }/${markoOpts.hot ? "hot-reload.js" : "index.js"}` - ) + }/${markoOpts.hot ? "hot-reload.js" : "index.js"}`, + ), ), t.variableDeclaration("const", [ t.variableDeclarator( componentTypeIdentifier, - t.stringLiteral(meta.id) + t.stringLiteral(meta.id), ), t.variableDeclarator( templateIdentifier, t.callExpression(runtimeTemplateIdentifier, [ componentTypeIdentifier, - ]) + ]), ), ]), includeMetaInSource && @@ -306,11 +306,11 @@ export const translate = { t.assignmentExpression( "=", t.memberExpression(templateIdentifier, t.identifier("path")), - t.identifier("__filename") - ) + t.identifier("__filename"), + ), ), t.exportDefaultDeclaration(templateIdentifier), - ].filter(Boolean) + ].filter(Boolean), ); path.pushContainer( @@ -323,7 +323,7 @@ export const translate = { file, "marko/src/runtime/components/registry.js", "r", - "marko_registerComponent" + "marko_registerComponent", ), [ componentTypeIdentifier, @@ -333,17 +333,17 @@ export const translate = { ? importDefault( file, resolveRelativePath(file, componentBrowserFile), - "marko_split_component" + "marko_split_component", ) - : templateIdentifier + : templateIdentifier, ), - ] - ) + ], + ), ), t.variableDeclaration("const", [ t.variableDeclarator(componentIdentifier, componentClass), ]), - ].filter(Boolean) + ].filter(Boolean), ); const templateRenderOptionsProps = [ @@ -352,19 +352,19 @@ export const translate = { if (!meta.component) { templateRenderOptionsProps.push( - t.objectProperty(t.identifier("i"), t.booleanLiteral(true)) + t.objectProperty(t.identifier("i"), t.booleanLiteral(true)), ); } if (componentBrowserFile) { templateRenderOptionsProps.push( - t.objectProperty(t.identifier("s"), t.booleanLiteral(true)) + t.objectProperty(t.identifier("s"), t.booleanLiteral(true)), ); } if (!markoOpts.optimize) { templateRenderOptionsProps.push( - t.objectProperty(t.identifier("d"), t.booleanLiteral(true)) + t.objectProperty(t.identifier("d"), t.booleanLiteral(true)), ); } @@ -385,13 +385,13 @@ export const translate = { t.identifier("state"), t.identifier("$global"), ], - renderBlock.node + renderBlock.node, ), t.objectExpression(templateRenderOptionsProps), componentIdentifier, - ]) - ) - ) + ]), + ), + ), ); renderBlock.remove(); @@ -406,12 +406,12 @@ export const translate = { importDefault( file, "marko/src/runtime/components/defineComponent.js", - "marko_defineComponent" + "marko_defineComponent", ), - [componentIdentifier, templateRendererMember] - ) - ) - ) + [componentIdentifier, templateRendererMember], + ), + ), + ), ); } @@ -424,8 +424,8 @@ export const translate = { metaObject.properties.push( t.objectProperty( t.identifier("component"), - t.stringLiteral(meta.component) - ) + t.stringLiteral(meta.component), + ), ); } @@ -433,8 +433,8 @@ export const translate = { metaObject.properties.push( t.objectProperty( t.identifier("deps"), - parseExpression(file, JSON.stringify(meta.deps)) - ) + parseExpression(file, JSON.stringify(meta.deps)), + ), ); } @@ -442,16 +442,16 @@ export const translate = { metaObject.properties.push( t.objectProperty( t.identifier("tags"), - t.arrayExpression(meta.tags.map((tag) => t.stringLiteral(tag))) - ) + t.arrayExpression(meta.tags.map((tag) => t.stringLiteral(tag))), + ), ); } path.pushContainer( "body", t.expressionStatement( - t.assignmentExpression("=", templateMetaMember, metaObject) - ) + t.assignmentExpression("=", templateMetaMember, metaObject), + ), ); } diff --git a/packages/translator-default/src/placeholder/index[html].js b/packages/translator-default/src/placeholder/index[html].js index 74c2207a28..dcdb26c694 100644 --- a/packages/translator-default/src/placeholder/index[html].js +++ b/packages/translator-default/src/placeholder/index[html].js @@ -1,14 +1,14 @@ -import { types as t } from "@marko/compiler"; import { computeNode, getTagDef, importDefault, importNamed, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import toString from "marko/src/runtime/helpers/to-string"; -import { x as escapeXML } from "marko/src/runtime/html/helpers/escape-xml"; import escapeScript from "marko/src/runtime/html/helpers/escape-script-placeholder"; import escapeStyle from "marko/src/runtime/html/helpers/escape-style-placeholder"; +import { x as escapeXML } from "marko/src/runtime/html/helpers/escape-xml"; import write from "../util/html-out-write"; import withPreviousLocation from "../util/with-previous-location"; @@ -51,10 +51,10 @@ export default function (path) { file, escapeType.module, escapeType.name, - escapeType.alias + escapeType.alias, ) : importDefault(file, escapeType.module, escapeType.alias), - [value] + [value], ); } else { value = computed @@ -63,9 +63,9 @@ export default function (path) { importDefault( file, "marko/src/runtime/helpers/to-string.js", - "marko_to_string" + "marko_to_string", ), - [value] + [value], ); } diff --git a/packages/translator-default/src/placeholder/index[vdom].js b/packages/translator-default/src/placeholder/index[vdom].js index 60b48fc416..81b59fec9c 100644 --- a/packages/translator-default/src/placeholder/index[vdom].js +++ b/packages/translator-default/src/placeholder/index[vdom].js @@ -14,8 +14,8 @@ export default function (path) { path.replaceWith( withPreviousLocation( write(method, value, path.hub.file._componentInstanceIdentifier), - node - ) + node, + ), ); } } diff --git a/packages/translator-default/src/tag/attribute-tag.js b/packages/translator-default/src/tag/attribute-tag.js index bbe8d8456c..3ff3280d9f 100644 --- a/packages/translator-default/src/tag/attribute-tag.js +++ b/packages/translator-default/src/tag/attribute-tag.js @@ -1,4 +1,3 @@ -import { types as t } from "@marko/compiler"; import { assertNoArgs, findParentTag, @@ -7,8 +6,9 @@ import { isAttributeTag, isTransparentTag, } from "@marko/babel-utils"; -import { getAttrs } from "./util"; +import { types as t } from "@marko/compiler"; import withPreviousLocation from "../util/with-previous-location"; +import { getAttrs } from "./util"; const EMPTY_OBJECT = {}; const parentIdentifierLookup = new WeakMap(); @@ -25,7 +25,7 @@ export default function (tag) { if (!parentPath) { throw namePath.buildCodeFrameError( - "@tags must be nested within another element." + "@tags must be nested within another element.", ); } @@ -51,7 +51,7 @@ export default function (tag) { } } else { const previousAttr = parentAttributes.find( - (attr) => attr.get("name").node === targetProperty + (attr) => attr.get("name").node === targetProperty, ); if (previousAttr) { @@ -59,7 +59,7 @@ export default function (tag) { if (t.isObjectExpression(previousValue)) { previousAttr.set( "value", - t.arrayExpression([previousValue, getAttrTagObject(tag)]) + t.arrayExpression([previousValue, getAttrTagObject(tag)]), ); } else if (t.isArrayExpression(previousAttr)) { previousAttr.elements.push(getAttrTagObject(tag)); @@ -70,16 +70,16 @@ export default function (tag) { importDefault( tag.hub.file, "marko/src/runtime/helpers/repeatable.js", - "marko_repeatable" + "marko_repeatable", ), - [previousValue, getAttrTagObject(tag)] - ) + [previousValue, getAttrTagObject(tag)], + ), ); } } else { parentPath.pushContainer( "attributes", - t.markoAttribute(targetProperty, getAttrTagObject(tag)) + t.markoAttribute(targetProperty, getAttrTagObject(tag)), ); } @@ -105,13 +105,13 @@ export default function (tag) { t.variableDeclaration(isRepeated ? "const" : "let", [ t.variableDeclarator( identifier, - isRepeated ? t.arrayExpression([]) : t.nullLiteral() + isRepeated ? t.arrayExpression([]) : t.nullLiteral(), ), - ]) + ]), ); parentPath.pushContainer( "attributes", - t.markoAttribute(targetProperty, identifier) + t.markoAttribute(targetProperty, identifier), ); } @@ -121,11 +121,11 @@ export default function (tag) { t.expressionStatement( t.callExpression( t.memberExpression(identifier, t.identifier("push")), - [getAttrTagObject(tag)] - ) + [getAttrTagObject(tag)], + ), ), - node - ) + node, + ), ); } else { tag.replaceWith( @@ -138,14 +138,14 @@ export default function (tag) { importDefault( tag.hub.file, "marko/src/runtime/helpers/repeatable.js", - "marko_repeatable" + "marko_repeatable", ), - [identifier, getAttrTagObject(tag)] - ) - ) + [identifier, getAttrTagObject(tag)], + ), + ), ), - node - ) + node, + ), ); } } @@ -157,9 +157,9 @@ function getAttrTagObject(tag) { importDefault( tag.hub.file, "marko/src/runtime/helpers/self-iterator.js", - "marko_self_iterator" + "marko_self_iterator", ), - true + true, ); if (t.isNullLiteral(attrs)) { diff --git a/packages/translator-default/src/tag/attribute/directives/class.js b/packages/translator-default/src/tag/attribute/directives/class.js index 261867859a..9218d67208 100644 --- a/packages/translator-default/src/tag/attribute/directives/class.js +++ b/packages/translator-default/src/tag/attribute/directives/class.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { computeNode, importDefault, isNativeTag } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import classToString from "marko/src/runtime/helpers/class-value"; import withPreviousLocation from "../../../util/with-previous-location"; @@ -25,12 +25,12 @@ export default { importDefault( file, "marko/src/runtime/helpers/class-value.js", - "marko_class_merge" + "marko_class_merge", ), - [value.node] + [value.node], ), - value.node - ) + value.node, + ), ); } }, diff --git a/packages/translator-default/src/tag/attribute/directives/index.js b/packages/translator-default/src/tag/attribute/directives/index.js index 5dfdcb591b..f44ce3b0f7 100644 --- a/packages/translator-default/src/tag/attribute/directives/index.js +++ b/packages/translator-default/src/tag/attribute/directives/index.js @@ -1,9 +1,9 @@ import classPlugin from "./class"; -import stylePlugin from "./style"; import noUpdatePlugin from "./no-update"; -import noUpdateIfPlugin from "./no-update-if"; import noUpdateBodyPlugin from "./no-update-body"; import noUpdateBodyIfPlugin from "./no-update-body-if"; +import noUpdateIfPlugin from "./no-update-if"; +import stylePlugin from "./style"; export default { class: classPlugin, diff --git a/packages/translator-default/src/tag/attribute/directives/no-update-body-if.js b/packages/translator-default/src/tag/attribute/directives/no-update-body-if.js index e982357e10..f843a03c88 100644 --- a/packages/translator-default/src/tag/attribute/directives/no-update-body-if.js +++ b/packages/translator-default/src/tag/attribute/directives/no-update-body-if.js @@ -1,5 +1,5 @@ -import noUpdateTransform from "./no-update"; import { getArgOrSequence } from "@marko/babel-utils"; +import noUpdateTransform from "./no-update"; export default { enter(tag) { diff --git a/packages/translator-default/src/tag/attribute/directives/no-update-if.js b/packages/translator-default/src/tag/attribute/directives/no-update-if.js index 31589806fb..5fc5f8bc72 100644 --- a/packages/translator-default/src/tag/attribute/directives/no-update-if.js +++ b/packages/translator-default/src/tag/attribute/directives/no-update-if.js @@ -1,5 +1,5 @@ -import noUpdateTransform from "./no-update"; import { getArgOrSequence } from "@marko/babel-utils"; +import noUpdateTransform from "./no-update"; export default { enter(tag) { diff --git a/packages/translator-default/src/tag/attribute/directives/no-update.js b/packages/translator-default/src/tag/attribute/directives/no-update.js index c16929367e..2db3fa435d 100644 --- a/packages/translator-default/src/tag/attribute/directives/no-update.js +++ b/packages/translator-default/src/tag/attribute/directives/no-update.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { isNativeTag, normalizeTemplateString } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; const EMPTY_OBJECT = {}; export default { @@ -12,18 +12,18 @@ export default { const replacement = t.markoTag( t.stringLiteral("_preserve"), [], - opts.bodyOnly ? node.body : t.markoTagBody([node]) + opts.bodyOnly ? node.body : t.markoTagBody([node]), ); if (isNativeTag(tag)) { replacement.key = node.key; replacement.attributes.push( - t.markoAttribute("n", t.booleanLiteral(true)) + t.markoAttribute("n", t.booleanLiteral(true)), ); if (opts.bodyOnly) { replacement.attributes.push( - t.markoAttribute("b", t.booleanLiteral(true)) + t.markoAttribute("b", t.booleanLiteral(true)), ); } } else { diff --git a/packages/translator-default/src/tag/attribute/directives/style.js b/packages/translator-default/src/tag/attribute/directives/style.js index 0d044f613e..29d20b4faa 100644 --- a/packages/translator-default/src/tag/attribute/directives/style.js +++ b/packages/translator-default/src/tag/attribute/directives/style.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { computeNode, importDefault, isNativeTag } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import styleToString from "marko/src/runtime/helpers/style-value"; import withPreviousLocation from "../../../util/with-previous-location"; @@ -25,12 +25,12 @@ export default { importDefault( file, "marko/src/runtime/helpers/style-value.js", - "marko_style_merge" + "marko_style_merge", ), - [value.node] + [value.node], ), - value.node - ) + value.node, + ), ); } }, diff --git a/packages/translator-default/src/tag/attribute/index.js b/packages/translator-default/src/tag/attribute/index.js index 06b8127b94..8a2761205c 100644 --- a/packages/translator-default/src/tag/attribute/index.js +++ b/packages/translator-default/src/tag/attribute/index.js @@ -30,7 +30,7 @@ export default { if (!value.isBooleanLiteral(true)) { throw value.buildCodeFrameError( - `"${name}(handler, ...args)" does not accept a value.` + `"${name}(handler, ...args)" does not accept a value.`, ); } @@ -51,7 +51,7 @@ export default { const handlers = (tag.node.handlers = tag.node.handlers || {}); if (handlers[eventName]) { throw attr.buildCodeFrameError( - "Duplicate event handlers are not supported." + "Duplicate event handlers are not supported.", ); } @@ -67,7 +67,7 @@ export default { attachedDetachedLoaded.add(file); importDefault( file, - "marko/src/runtime/components/attach-detach.js" + "marko/src/runtime/components/attach-detach.js", ); } } @@ -93,20 +93,20 @@ export default { throw attr.buildCodeFrameError( `<${ tag.get("name.value").node - }> does not support the "${name}" attribute.` + }> does not support the "${name}" attribute.`, ); } } if (args && args.length) { throw attr.buildCodeFrameError( - `Unsupported arguments on the "${name}" attribute.` + `Unsupported arguments on the "${name}" attribute.`, ); } if (attr.node.bound) { throw attr.buildCodeFrameError( - `The binding syntax (:=) is only supported when using the "Tags API".` + `The binding syntax (:=) is only supported when using the "Tags API".`, ); } }, diff --git a/packages/translator-default/src/tag/attribute/modifiers/index.js b/packages/translator-default/src/tag/attribute/modifiers/index.js index 7e168f718f..b2ae3f4308 100644 --- a/packages/translator-default/src/tag/attribute/modifiers/index.js +++ b/packages/translator-default/src/tag/attribute/modifiers/index.js @@ -1,5 +1,5 @@ -import scopedPlugin from "./scoped"; import noUpdatePlugin from "./no-update"; +import scopedPlugin from "./scoped"; export default { scoped: scopedPlugin, diff --git a/packages/translator-default/src/tag/attribute/modifiers/scoped.js b/packages/translator-default/src/tag/attribute/modifiers/scoped.js index 777a709a57..58034ec1b4 100644 --- a/packages/translator-default/src/tag/attribute/modifiers/scoped.js +++ b/packages/translator-default/src/tag/attribute/modifiers/scoped.js @@ -11,12 +11,12 @@ export default { t.callExpression( t.memberExpression( file._componentDefIdentifier, - t.identifier("elId") + t.identifier("elId"), ), - [value.node] + [value.node], ), - value.node - ) + value.node, + ), ); }, }; diff --git a/packages/translator-default/src/tag/custom-tag.js b/packages/translator-default/src/tag/custom-tag.js index ae0d6a2f15..15f5e7cbce 100644 --- a/packages/translator-default/src/tag/custom-tag.js +++ b/packages/translator-default/src/tag/custom-tag.js @@ -1,14 +1,14 @@ -import { types as t } from "@marko/compiler"; import { assertNoArgs, getTagDef, importDefault, resolveRelativePath, } from "@marko/babel-utils"; -import { buildEventHandlerArray, getAttrs } from "./util"; -import nativeTag from "./native-tag"; -import dynamicTag from "./dynamic-tag"; +import { types as t } from "@marko/compiler"; import withPreviousLocation from "../util/with-previous-location"; +import dynamicTag from "./dynamic-tag"; +import nativeTag from "./native-tag"; +import { buildEventHandlerArray, getAttrs } from "./util"; export default function (path, isNullable) { const { @@ -64,7 +64,7 @@ export default function (path, isNullable) { throw path .get("name") .buildCodeFrameError( - `Unable to find entry point for custom tag <${tagName}>.` + `Unable to find entry point for custom tag <${tagName}>.`, ); } } else { @@ -78,7 +78,7 @@ export default function (path, isNullable) { importDefault( file, "marko/src/runtime/helpers/render-tag.js", - "marko_tag" + "marko_tag", ), [ tagIdentifier, @@ -88,10 +88,10 @@ export default function (path, isNullable) { file._componentDefIdentifier, key, ...buildEventHandlerArray(path), - ] - ) + ], + ), ), - node + node, ); if (isNullable) { @@ -99,7 +99,7 @@ export default function (path, isNullable) { const renderBodyProp = t.isObjectExpression(foundAttrs) && foundAttrs.properties.find( - (prop) => prop.key && prop.key.value === "renderBody" + (prop) => prop.key && prop.key.value === "renderBody", ); if (renderBodyProp) { @@ -107,7 +107,7 @@ export default function (path, isNullable) { path.insertBefore( t.variableDeclaration("const", [ t.variableDeclarator(renderBodyIdentifier, renderBodyProp.value), - ]) + ]), ); renderBodyProp.value = renderBodyIdentifier; @@ -119,9 +119,9 @@ export default function (path, isNullable) { customTagRenderCall, renderBodyIdentifier && t.expressionStatement( - t.callExpression(renderBodyIdentifier, [t.identifier("out")]) - ) - ) + t.callExpression(renderBodyIdentifier, [t.identifier("out")]), + ), + ), ); } else { path.replaceWith(customTagRenderCall); diff --git a/packages/translator-default/src/tag/dynamic-tag.js b/packages/translator-default/src/tag/dynamic-tag.js index f96b314a8d..970e26d707 100644 --- a/packages/translator-default/src/tag/dynamic-tag.js +++ b/packages/translator-default/src/tag/dynamic-tag.js @@ -1,7 +1,7 @@ -import { types as t } from "@marko/compiler"; import { importDefault } from "@marko/babel-utils"; -import { buildEventHandlerArray, getAttrs } from "./util"; +import { types as t } from "@marko/compiler"; import withPreviousLocation from "../util/with-previous-location"; +import { buildEventHandlerArray, getAttrs } from "./util"; export default function (path) { const { @@ -19,15 +19,15 @@ export default function (path) { t.objectProperty( t.identifier("pa"), t.arrayExpression( - node.preserveAttrs.map((name) => t.stringLiteral(name)) - ) - ) + node.preserveAttrs.map((name) => t.stringLiteral(name)), + ), + ), ); } if (t.isObjectExpression(foundAttrs)) { const renderBodyIndex = foundAttrs.properties.findIndex( - (prop) => prop.key && prop.key.value === "renderBody" + (prop) => prop.key && prop.key.value === "renderBody", ); attrsLen = foundAttrs.properties.length; @@ -44,7 +44,7 @@ export default function (path) { importDefault( file, `marko/src/runtime/helpers/dynamic-tag.js`, - "marko_dynamic_tag" + "marko_dynamic_tag", ), [ t.identifier("out"), @@ -58,8 +58,8 @@ export default function (path) { file._componentDefIdentifier, key, ...buildEventHandlerArray(path), - ] - ) + ], + ), ); path.replaceWith(withPreviousLocation(dynamicTagRenderCall, node)); diff --git a/packages/translator-default/src/tag/index.js b/packages/translator-default/src/tag/index.js index 2454ee2fe4..83b6afa7ae 100644 --- a/packages/translator-default/src/tag/index.js +++ b/packages/translator-default/src/tag/index.js @@ -1,5 +1,4 @@ import nodePath from "path"; -import { types as t } from "@marko/compiler"; import { assertNoVar, findAttributeTags, @@ -9,15 +8,16 @@ import { isMacroTag, isNativeTag, } from "@marko/babel-utils"; -import nativeTag from "./native-tag"; -import dynamicTag from "./dynamic-tag"; +import { types as t } from "@marko/compiler"; +import { getKeyManager } from "../util/key-manager"; +import { optimizeStaticVDOM } from "../util/optimize-vdom-create"; +import { enter, exit } from "../util/plugin-hooks"; +import attributeTranslators from "./attribute"; import attributeTag from "./attribute-tag"; import customTag from "./custom-tag"; +import dynamicTag from "./dynamic-tag"; import macroTag from "./macro-tag"; -import attributeTranslators from "./attribute"; -import { getKeyManager } from "../util/key-manager"; -import { enter, exit } from "../util/plugin-hooks"; -import { optimizeStaticVDOM } from "../util/optimize-vdom-create"; +import nativeTag from "./native-tag"; export default { enter(path) { @@ -48,7 +48,7 @@ export default { findAttributeTags(path).forEach((child) => { child.set( "name", - t.stringLiteral(`at_${child.get("name.value").node.slice(1)}`) + t.stringLiteral(`at_${child.get("name.value").node.slice(1)}`), ); }); } @@ -72,7 +72,7 @@ export default { path.insertBefore( t.variableDeclaration("const", [ t.variableDeclarator(tagIdentifier, name.node), - ]) + ]), ); name.replaceWith(tagIdentifier); diff --git a/packages/translator-default/src/tag/native-tag.js b/packages/translator-default/src/tag/native-tag.js index ac337b6a8b..02841e8e74 100644 --- a/packages/translator-default/src/tag/native-tag.js +++ b/packages/translator-default/src/tag/native-tag.js @@ -1,10 +1,10 @@ -import nativeTagHtml from "./native-tag[html]"; -import nativeTagVdom from "./native-tag[vdom]"; import { assertNoArgs, assertNoAttributeTags, assertNoParams, } from "@marko/babel-utils"; +import nativeTagHtml from "./native-tag[html]"; +import nativeTagVdom from "./native-tag[vdom]"; export default function (path, isNullable) { const { diff --git a/packages/translator-default/src/tag/native-tag[html]/attributes.js b/packages/translator-default/src/tag/native-tag[html]/attributes.js index c1cfd9816d..13a977db4f 100644 --- a/packages/translator-default/src/tag/native-tag[html]/attributes.js +++ b/packages/translator-default/src/tag/native-tag[html]/attributes.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { importDefault, normalizeTemplateString } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import attrHelper from "marko/src/runtime/html/helpers/attr"; import { evaluateAttr } from "../util"; @@ -11,9 +11,9 @@ export default function (path, attrs) { importDefault( path.hub.file, "marko/src/runtime/html/helpers/attrs.js", - "marko_attrs" + "marko_attrs", ), - [attrs[0].node.value] + [attrs[0].node.value], ); } @@ -33,7 +33,7 @@ export default function (path, attrs) { t.stringLiteral(name), computed?.value !== undefined ? t.stringLiteral(computed.value) - : value + : value, ); if (props) { props.push(prop); @@ -50,9 +50,9 @@ export default function (path, attrs) { importDefault( path.hub.file, "marko/src/runtime/html/helpers/merge-attrs.js", - "marko_merge_attrs" + "marko_merge_attrs", ), - attrsObjects + attrsObjects, ); } @@ -80,7 +80,7 @@ export default function (path, attrs) { confident: false, computed: undefined, value, - } + }, ); } @@ -101,10 +101,10 @@ export default function (path, attrs) { importDefault( file, "marko/src/runtime/html/helpers/attr.js", - "marko_attr" + "marko_attr", ), - [t.stringLiteral(name), value] - ) + [t.stringLiteral(name), value], + ), ); } } diff --git a/packages/translator-default/src/tag/native-tag[html]/index.js b/packages/translator-default/src/tag/native-tag[html]/index.js index 9b683f7fd1..e0d8cb0279 100644 --- a/packages/translator-default/src/tag/native-tag[html]/index.js +++ b/packages/translator-default/src/tag/native-tag[html]/index.js @@ -1,15 +1,15 @@ import { resolve } from "path"; -import SELF_CLOSING from "self-closing-tags"; -import { types as t } from "@marko/compiler"; import { getTagDef, importDefault, normalizeTemplateString, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; +import SELF_CLOSING from "self-closing-tags"; import write from "../../util/html-out-write"; import { hasUserKey } from "../../util/key-manager"; -import translateAttributes from "./attributes"; import withPreviousLocation from "../../util/with-previous-location"; +import translateAttributes from "./attributes"; const EMPTY_OBJECT = {}; @@ -58,13 +58,13 @@ export default function (path, isNullable) { t.callExpression( t.memberExpression( file._componentDefIdentifier, - t.identifier("d") + t.identifier("d"), ), - delegateArgs - ) - ) + delegateArgs, + ), + ), ); - } + }, ); } @@ -76,9 +76,9 @@ export default function (path, isNullable) { t.objectProperty( t.identifier("pa"), t.arrayExpression( - node.preserveAttrs.map((name) => t.stringLiteral(name)) - ) - ) + node.preserveAttrs.map((name) => t.stringLiteral(name)), + ), + ), ); } @@ -108,9 +108,9 @@ export default function (path, isNullable) { importDefault( file, "marko/src/runtime/html/helpers/data-marko.js", - "marko_props" + "marko_props", ), - dataMarkoArgs + dataMarkoArgs, ); } } @@ -142,7 +142,7 @@ export default function (path, isNullable) { isEmpty && !isSelfClosing ? write`${writeStartNode}` : write`${writeStartNode}`, - name + name, ); if (isNullable) { @@ -156,9 +156,9 @@ export default function (path, isNullable) { normalizeTemplateString`f_${key}`, file._componentInstanceIdentifier, t.numericLiteral(1), - ] - ) - ) + ], + ), + ), ); } @@ -186,16 +186,16 @@ export default function (path, isNullable) { t.expressionStatement( t.callExpression( t.memberExpression(t.identifier("out"), t.identifier("ef")), - [] - ) - ) + [], + ), + ), ); } path.replaceWithMultiple( [writeStartNode] .concat(needsBlock ? t.blockStatement(body) : body) - .concat(writeEndNode) + .concat(writeEndNode), ); } diff --git a/packages/translator-default/src/tag/native-tag[vdom]/attributes.js b/packages/translator-default/src/tag/native-tag[vdom]/attributes.js index 3131ce47d8..3191accd99 100644 --- a/packages/translator-default/src/tag/native-tag[vdom]/attributes.js +++ b/packages/translator-default/src/tag/native-tag[vdom]/attributes.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { importDefault } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import { evaluateAttr } from "../util"; export default function (path, attrs) { @@ -10,9 +10,9 @@ export default function (path, attrs) { importDefault( path.hub.file, "marko/src/runtime/vdom/helpers/attrs.js", - "marko_attrs" + "marko_attrs", ), - [attrs[0].node.value] + [attrs[0].node.value], ); } @@ -32,7 +32,7 @@ export default function (path, attrs) { t.stringLiteral(name), computed?.value !== undefined ? t.stringLiteral(computed.value) - : value + : value, ); if (props) { props.push(prop); @@ -49,9 +49,9 @@ export default function (path, attrs) { importDefault( path.hub.file, "marko/src/runtime/vdom/helpers/merge-attrs.js", - "marko_merge_attrs" + "marko_merge_attrs", ), - attrsObjects + attrsObjects, ); } @@ -76,7 +76,7 @@ export default function (path, attrs) { confident: false, computed: undefined, value, - } + }, ); } @@ -89,7 +89,7 @@ export default function (path, attrs) { } props.push( - t.objectProperty(t.stringLiteral(name), t.stringLiteral(computed)) + t.objectProperty(t.stringLiteral(name), t.stringLiteral(computed)), ); } else { props.push(t.objectProperty(t.stringLiteral(name), value)); diff --git a/packages/translator-default/src/tag/native-tag[vdom]/index.js b/packages/translator-default/src/tag/native-tag[vdom]/index.js index 4fa088bedf..60e36e9754 100644 --- a/packages/translator-default/src/tag/native-tag[vdom]/index.js +++ b/packages/translator-default/src/tag/native-tag[vdom]/index.js @@ -1,23 +1,16 @@ +import { getTagDef, normalizeTemplateString } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; -import write from "../../util/vdom-out-write"; import * as FLAGS from "../../util/runtime-flags"; -import { getTagDef, normalizeTemplateString } from "@marko/babel-utils"; -import translateAttributes from "./attributes"; +import write from "../../util/vdom-out-write"; import withPreviousLocation from "../../util/with-previous-location"; +import translateAttributes from "./attributes"; const SIMPLE_ATTRS = ["id", "class", "style"]; -const MAYBE_SVG = { - a: true, - script: true, - style: true, - title: true, -}; export function tagArguments(path, isStatic) { const { hub: { file }, node, - parent, } = path; const { name, @@ -41,8 +34,8 @@ export function tagArguments(path, isStatic) { isStatic ? t.numericLiteral(body.length) : body.length - ? t.nullLiteral() - : t.numericLiteral(0), + ? t.nullLiteral() + : t.numericLiteral(0), ]; if (node.preserveAttrs) { @@ -50,9 +43,9 @@ export function tagArguments(path, isStatic) { t.objectProperty( t.identifier("pa"), t.arrayExpression( - node.preserveAttrs.map((name) => t.stringLiteral(name)) - ) - ) + node.preserveAttrs.map((name) => t.stringLiteral(name)), + ), + ), ); } @@ -75,13 +68,13 @@ export function tagArguments(path, isStatic) { t.callExpression( t.memberExpression( file._componentDefIdentifier, - t.identifier("d") + t.identifier("d"), ), - delegateArgs - ) - ) + delegateArgs, + ), + ), ); - } + }, ); } @@ -96,19 +89,9 @@ export function tagArguments(path, isStatic) { const tagDef = getTagDef(path); if (tagDef) { - const { htmlType, name } = tagDef; + const { htmlType } = tagDef; if (htmlType === "custom-element") { runtimeFlags |= FLAGS.IS_CUSTOM_ELEMENT; - } else if ( - htmlType === "svg" || - (MAYBE_SVG[name] && - t.isMarkoTag(parent) && - parent.tagDef && - parent.tagDef.htmlType === "svg") - ) { - runtimeFlags |= FLAGS.IS_SVG; - } else if (name === "textarea") { - runtimeFlags |= FLAGS.IS_TEXTAREA; } } @@ -135,7 +118,7 @@ export default function (path, isNullable) { const writeArgs = tagArguments(path, false); let writeStartNode = withPreviousLocation( write(isEmpty ? "e" : "be", ...writeArgs), - node.name + node.name, ); if (isNullable) { @@ -148,9 +131,9 @@ export default function (path, isNullable) { [ normalizeTemplateString`f_${key}`, path.hub.file._componentInstanceIdentifier, - ] - ) - ) + ], + ), + ), ); } @@ -167,9 +150,9 @@ export default function (path, isNullable) { t.expressionStatement( t.callExpression( t.memberExpression(t.identifier("out"), t.identifier("ef")), - [] - ) - ) + [], + ), + ), ); } @@ -186,7 +169,7 @@ export default function (path, isNullable) { path.replaceWithMultiple( [writeStartNode] .concat(needsBlock ? t.blockStatement(body) : body) - .concat(writeEndNode) + .concat(writeEndNode), ); } diff --git a/packages/translator-default/src/tag/util.js b/packages/translator-default/src/tag/util.js index 10917fbca8..5f87f5755b 100644 --- a/packages/translator-default/src/tag/util.js +++ b/packages/translator-default/src/tag/util.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { computeNode, getTagDef } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import classToString from "marko/src/runtime/helpers/class-value"; import styleToString from "marko/src/runtime/helpers/style-value"; @@ -39,8 +39,8 @@ export function getAttrs(path, preserveNames, skipRenderBody) { properties.push( t.objectProperty( t.stringLiteral(key), - (targetObject = targetObjects[key] = t.objectExpression([])) - ) + (targetObject = targetObjects[key] = t.objectExpression([])), + ), ); } @@ -62,7 +62,7 @@ export function getAttrs(path, preserveNames, skipRenderBody) { foundProperties[targetProperty] = true; targetProperties.push( - t.objectProperty(t.stringLiteral(targetProperty), value) + t.objectProperty(t.stringLiteral(targetProperty), value), ); } else { mergeSpread(properties, value); @@ -75,7 +75,7 @@ export function getAttrs(path, preserveNames, skipRenderBody) { if (hasDynamicAttrTags) { endDynamicAttrTagsIndex = findLastIndex( body, - ({ value }) => value === "END_ATTRIBUTE_TAGS" + ({ value }) => value === "END_ATTRIBUTE_TAGS", ); path .insertBefore(body.slice(0, endDynamicAttrTagsIndex)) @@ -91,10 +91,10 @@ export function getAttrs(path, preserveNames, skipRenderBody) { t.blockStatement( hasDynamicAttrTags ? body.slice(endDynamicAttrTagsIndex + 1) - : body - ) - ) - ) + : body, + ), + ), + ), ); } } @@ -111,8 +111,8 @@ export function getAttrs(path, preserveNames, skipRenderBody) { properties.push( t.objectProperty( t.stringLiteral(attr.name), - t.stringLiteral(attr.defaultValue + "") - ) + t.stringLiteral(attr.defaultValue + ""), + ), ); } else if (attr.required) { throw path @@ -152,7 +152,7 @@ export function buildEventHandlerArray(path) { } return t.arrayExpression(parts); - }) + }), ), ]; } diff --git a/packages/translator-default/src/taglib/core/conditional/translate-else-if.js b/packages/translator-default/src/taglib/core/conditional/translate-else-if.js index 9f1fd02a29..e53dcdc9e3 100644 --- a/packages/translator-default/src/taglib/core/conditional/translate-else-if.js +++ b/packages/translator-default/src/taglib/core/conditional/translate-else-if.js @@ -10,7 +10,7 @@ export function exit(path) { throw path .get("name") .buildCodeFrameError( - "Invalid 'else-if' tag, expected preceding 'if' or 'else-if' tag." + "Invalid 'else-if' tag, expected preceding 'if' or 'else-if' tag.", ); } diff --git a/packages/translator-default/src/taglib/core/conditional/translate-else.js b/packages/translator-default/src/taglib/core/conditional/translate-else.js index 3be154c622..c7efaca346 100644 --- a/packages/translator-default/src/taglib/core/conditional/translate-else.js +++ b/packages/translator-default/src/taglib/core/conditional/translate-else.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributes } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export function exit(path) { assertNoArgs(path); @@ -14,7 +14,7 @@ export function exit(path) { throw path .get("name") .buildCodeFrameError( - "Invalid 'else' tag, expected preceding 'if' or 'else-if' tag." + "Invalid 'else' tag, expected preceding 'if' or 'else-if' tag.", ); } diff --git a/packages/translator-default/src/taglib/core/conditional/util.js b/packages/translator-default/src/taglib/core/conditional/util.js index 7e96297fae..d02d4d493e 100644 --- a/packages/translator-default/src/taglib/core/conditional/util.js +++ b/packages/translator-default/src/taglib/core/conditional/util.js @@ -5,13 +5,13 @@ export function buildIfStatement(path, args) { if (!args || !args.length) { const name = path.get("name"); throw name.buildCodeFrameError( - `Invalid '<${name.node.value}>' tag, expected arguments like '<${name.node.value}(test)>'.` + `Invalid '<${name.node.value}>' tag, expected arguments like '<${name.node.value}(test)>'.`, ); } const ifStatement = t.ifStatement( args.length === 1 ? args[0] : t.sequenceExpression(args), - t.blockStatement(path.node.body.body) + t.blockStatement(path.node.body.body), ); let nextPath = path.getNextSibling(); diff --git a/packages/translator-default/src/taglib/core/index.js b/packages/translator-default/src/taglib/core/index.js index e983a5cde4..f9d6281ee9 100644 --- a/packages/translator-default/src/taglib/core/index.js +++ b/packages/translator-default/src/taglib/core/index.js @@ -1,22 +1,22 @@ -import * as parseImport from "./parse-import"; -import * as parseExport from "./parse-export"; +import * as translateElse from "./conditional/translate-else"; +import * as translateElseIf from "./conditional/translate-else-if"; +import * as translateIf from "./conditional/translate-if"; +import * as parseMacro from "./macro/parse"; +import * as translateMacro from "./macro/translate"; import * as parseClass from "./parse-class"; +import * as parseExport from "./parse-export"; +import * as parseImport from "./parse-import"; +import * as parseModuleCode from "./parse-module-code"; import * as parseStatic from "./parse-static"; import * as parseStyle from "./parse-style"; import * as transformStyle from "./transform-style"; -import * as parseMacro from "./macro/parse"; -import * as translateMacro from "./macro/translate"; -import * as translateIncludeContent from "./translate-include-content"; -import * as translateIf from "./conditional/translate-if"; -import * as translateElseIf from "./conditional/translate-else-if"; -import * as translateElse from "./conditional/translate-else"; +import * as translateAwait from "./translate-await"; +import * as translateBody from "./translate-body"; import * as translateFor from "./translate-for"; -import * as translateWhile from "./translate-while"; import * as translateHTMLComment from "./translate-html-comment"; +import * as translateIncludeContent from "./translate-include-content"; import * as translateServerOnly from "./translate-server-only"; -import * as translateBody from "./translate-body"; -import * as translateAwait from "./translate-await"; -import * as parseModuleCode from "./parse-module-code"; +import * as translateWhile from "./translate-while"; export default { "taglib-id": "marko-default-core", diff --git a/packages/translator-default/src/taglib/core/macro/parse.js b/packages/translator-default/src/taglib/core/macro/parse.js index baf86f775f..f62d4bfec3 100644 --- a/packages/translator-default/src/taglib/core/macro/parse.js +++ b/packages/translator-default/src/taglib/core/macro/parse.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { registerMacro } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export default function (path) { const attrs = path.node.attributes; diff --git a/packages/translator-default/src/taglib/core/macro/translate.js b/packages/translator-default/src/taglib/core/macro/translate.js index eff8b2340e..a6d5c25fc1 100644 --- a/packages/translator-default/src/taglib/core/macro/translate.js +++ b/packages/translator-default/src/taglib/core/macro/translate.js @@ -1,6 +1,6 @@ +import { diagnosticError, getMacroIdentifierForName } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; import withPreviousLocation from "../../../util/with-previous-location"; -import { diagnosticError, getMacroIdentifierForName } from "@marko/babel-utils"; export function exit(path) { const { node } = path; @@ -36,9 +36,9 @@ export function exit(path) { t.functionDeclaration( getMacroIdentifierForName(path, nameAttr.value.value), [t.identifier("out"), ...body.params], - t.blockStatement(body.body) + t.blockStatement(body.body), ), - node - ) + node, + ), ); } diff --git a/packages/translator-default/src/taglib/core/parse-class.js b/packages/translator-default/src/taglib/core/parse-class.js index 3243d0d7fd..64e58d6b38 100644 --- a/packages/translator-default/src/taglib/core/parse-class.js +++ b/packages/translator-default/src/taglib/core/parse-class.js @@ -1,9 +1,9 @@ -import { types as t } from "@marko/compiler"; import { diagnosticDeprecate, diagnosticError, parseExpression, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import getComponentFiles from "../../util/get-component-files"; export default function (path) { @@ -51,7 +51,7 @@ export default function (path) { } const constructorPropIndex = parsed.body.body.findIndex( - (prop) => t.isClassMethod(prop) && prop.kind === "constructor" + (prop) => t.isClassMethod(prop) && prop.kind === "constructor", ); if (constructorPropIndex !== -1) { const constructorProp = parsed.body.body[constructorPropIndex]; diff --git a/packages/translator-default/src/taglib/core/parse-module-code.js b/packages/translator-default/src/taglib/core/parse-module-code.js index 7e86795f06..2b0ee514d4 100644 --- a/packages/translator-default/src/taglib/core/parse-module-code.js +++ b/packages/translator-default/src/taglib/core/parse-module-code.js @@ -1,6 +1,6 @@ import path from "path"; -import resolveFrom from "resolve-from"; import markoModules from "@marko/compiler/modules"; +import resolveFrom from "resolve-from"; const startOffset = "module-code".length; diff --git a/packages/translator-default/src/taglib/core/parse-static.js b/packages/translator-default/src/taglib/core/parse-static.js index 8e82f5c54a..fac95d913c 100644 --- a/packages/translator-default/src/taglib/core/parse-static.js +++ b/packages/translator-default/src/taglib/core/parse-static.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { parseStatements } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export default function (path) { const { diff --git a/packages/translator-default/src/taglib/core/transform-style.js b/packages/translator-default/src/taglib/core/transform-style.js index 87e45b4eae..b8c1921bcd 100644 --- a/packages/translator-default/src/taglib/core/transform-style.js +++ b/packages/translator-default/src/taglib/core/transform-style.js @@ -16,7 +16,7 @@ export default function (tag) { throw tag .get("name") .buildCodeFrameError( - "Style blocks must be at the root of your Marko template." + "Style blocks must be at the root of your Marko template.", ); } @@ -24,7 +24,7 @@ export default function (tag) { throw tag .get("name") .buildCodeFrameError( - "A Marko file can only contain a single inline style block." + "A Marko file can only contain a single inline style block.", ); } @@ -32,7 +32,7 @@ export default function (tag) { throw tag .get("name") .buildCodeFrameError( - 'A Marko file can either have an inline style block, or an external "style.ext" file, but not both.' + 'A Marko file can either have an inline style block, or an external "style.ext" file, but not both.', ); } diff --git a/packages/translator-default/src/taglib/core/translate-await.js b/packages/translator-default/src/taglib/core/translate-await.js index 077227e9e7..d4dcb1d6a2 100644 --- a/packages/translator-default/src/taglib/core/translate-await.js +++ b/packages/translator-default/src/taglib/core/translate-await.js @@ -7,7 +7,7 @@ export function enter(path) { throw path .get("name") .buildCodeFrameError( - 'You must provide a promise argument to the "" tag, eg: "".' + 'You must provide a promise argument to the "" tag, eg: "".', ); } else if (args.length > 1) { const { @@ -18,14 +18,14 @@ export function enter(path) { } = args[args.length - 1].node; throw path.hub.file.buildCodeFrameError( { loc: { start, end } }, - 'You can only pass one argument to the "" tag.' + 'You can only pass one argument to the "" tag.', ); } const [provider] = args; path.pushContainer( "attributes", - t.markoAttribute("_provider", provider.node) + t.markoAttribute("_provider", provider.node), ); if ( @@ -33,7 +33,7 @@ export function enter(path) { ) { path.pushContainer( "attributes", - t.markoAttribute("_name", t.stringLiteral(provider.toString())) + t.markoAttribute("_name", t.stringLiteral(provider.toString())), ); } diff --git a/packages/translator-default/src/taglib/core/translate-body.js b/packages/translator-default/src/taglib/core/translate-body.js index 249f0541d6..a0d3e8c50b 100644 --- a/packages/translator-default/src/taglib/core/translate-body.js +++ b/packages/translator-default/src/taglib/core/translate-body.js @@ -10,7 +10,7 @@ export function enter(path) { t.markoTag( t.stringLiteral("_preferred-script-location"), [], - t.markoTagBody() + t.markoTagBody(), ), ]); } diff --git a/packages/translator-default/src/taglib/core/translate-for.js b/packages/translator-default/src/taglib/core/translate-for.js index 81fc9ed252..2083aa947c 100644 --- a/packages/translator-default/src/taglib/core/translate-for.js +++ b/packages/translator-default/src/taglib/core/translate-for.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { assertAllowedAttributes } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export function exit(path) { const { node } = path; @@ -23,7 +23,7 @@ export function exit(path) { if (!keyParam) { throw namePath.buildCodeFrameError( - "Invalid 'for in' tag, missing |key, value| params." + "Invalid 'for in' tag, missing |key, value| params.", ); } @@ -32,22 +32,22 @@ export function exit(path) { t.variableDeclaration("const", [ t.variableDeclarator( valParam, - t.memberExpression(inAttr.value, keyParam, true) + t.memberExpression(inAttr.value, keyParam, true), ), - ]) + ]), ); } forNode = t.forInStatement( t.variableDeclaration("const", [t.variableDeclarator(keyParam)]), inAttr.value, - block + block, ); } else if (ofAttr) { let ofAttrValue = t.logicalExpression( "||", ofAttr.value, - t.arrayExpression([]) + t.arrayExpression([]), ); allowedAttributes.push("of"); @@ -55,7 +55,7 @@ export function exit(path) { if (!valParam) { throw namePath.buildCodeFrameError( - "Invalid 'for of' tag, missing |value, index| params." + "Invalid 'for of' tag, missing |value, index| params.", ); } @@ -66,13 +66,13 @@ export function exit(path) { forNode.push( t.variableDeclaration("let", [ t.variableDeclarator(indexName, t.numericLiteral(0)), - ]) + ]), ); block.body.unshift( t.variableDeclaration("let", [ t.variableDeclarator(keyParam, t.updateExpression("++", indexName)), - ]) + ]), ); } @@ -81,7 +81,7 @@ export function exit(path) { forNode.push( t.variableDeclaration("const", [ t.variableDeclarator(loopParam, ofAttr.value), - ]) + ]), ); } @@ -89,8 +89,8 @@ export function exit(path) { t.forOfStatement( t.variableDeclaration("const", [t.variableDeclarator(valParam)]), ofAttrValue, - block - ) + block, + ), ); } else if (fromAttr && toAttr) { allowedAttributes.push("from", "to", "step"); @@ -111,10 +111,10 @@ export function exit(path) { t.binaryExpression( "+", fromAttr.value, - t.binaryExpression("*", stepName, stepValue) - ) + t.binaryExpression("*", stepName, stepValue), + ), ), - ]) + ]), ); } @@ -125,18 +125,18 @@ export function exit(path) { t.binaryExpression( "/", t.binaryExpression("-", toAttr.value, fromAttr.value), - stepValue - ) + stepValue, + ), ), t.variableDeclarator(stepName, t.numericLiteral(0)), ]), t.binaryExpression("<=", stepName, stepsName), t.updateExpression("++", stepName), - block + block, ); } else { throw namePath.buildCodeFrameError( - "Invalid 'for' tag, missing an 'of', 'in' or 'to' attribute." + "Invalid 'for' tag, missing an 'of', 'in' or 'to' attribute.", ); } diff --git a/packages/translator-default/src/taglib/core/translate-include-content.js b/packages/translator-default/src/taglib/core/translate-include-content.js index 07cfd8e9dc..c9d3873de3 100644 --- a/packages/translator-default/src/taglib/core/translate-include-content.js +++ b/packages/translator-default/src/taglib/core/translate-include-content.js @@ -1,6 +1,6 @@ import path from "path"; -import { types as t } from "@marko/compiler"; import { assertNoAttributes, assertNoParams } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export function enter(tag) { const { @@ -16,7 +16,7 @@ export function enter(tag) { if (args.length !== 1) { throw tag.buildCodeFrameError( - `A single path argument is required for ${tagExample}.` + `A single path argument is required for ${tagExample}.`, ); } @@ -24,7 +24,7 @@ export function enter(tag) { if (!content.isStringLiteral()) { throw content.buildCodeFrameError( - `The argument to ${tagExample} must be a static string.` + `The argument to ${tagExample} must be a static string.`, ); } @@ -44,7 +44,7 @@ export function enter(tag) { tag.replaceWith( t.markoPlaceholder( t.stringLiteral(fs.readFileSync(fullPath).toString("utf-8")), - tagName === "include-text" - ) + tagName === "include-text", + ), ); } diff --git a/packages/translator-default/src/taglib/core/translate-while.js b/packages/translator-default/src/taglib/core/translate-while.js index 2a41e7bde5..5b6c9535ed 100644 --- a/packages/translator-default/src/taglib/core/translate-while.js +++ b/packages/translator-default/src/taglib/core/translate-while.js @@ -1,9 +1,9 @@ -import { types as t } from "@marko/compiler"; import { assertNoAttributes, assertNoParams, getArgOrSequence, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; import withPreviousLocation from "../../util/with-previous-location"; export function exit(path) { @@ -15,7 +15,7 @@ export function exit(path) { throw path .get("name") .buildCodeFrameError( - "A condition is required for the tag." + "A condition is required for the tag.", ); } @@ -23,9 +23,9 @@ export function exit(path) { withPreviousLocation( t.whileStatement( getArgOrSequence(path), - t.blockStatement(path.node.body.body) + t.blockStatement(path.node.body.body), ), - path.node - ) + path.node, + ), ); } diff --git a/packages/translator-default/src/taglib/migrate/all-templates.js b/packages/translator-default/src/taglib/migrate/all-templates.js index a311d3a6aa..80ec7682c8 100644 --- a/packages/translator-default/src/taglib/migrate/all-templates.js +++ b/packages/translator-default/src/taglib/migrate/all-templates.js @@ -1,6 +1,6 @@ +import { diagnosticDeprecate } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; import withPreviousLocation from "../../util/with-previous-location"; -import { diagnosticDeprecate } from "@marko/babel-utils"; const kHadAssignment = Symbol(); export default { @@ -22,7 +22,7 @@ export default { t.variableDeclaration("var", [ t.variableDeclarator(t.identifier("data")), ]), - ]) + ]), ); } }, @@ -36,7 +36,7 @@ export default { label: "The 'data' variable is deprecated. Use 'input' instead.", fix() { path.replaceWith( - withPreviousLocation(t.identifier("input"), path.node) + withPreviousLocation(t.identifier("input"), path.node), ); }, }); diff --git a/packages/translator-default/src/text/index[html].js b/packages/translator-default/src/text/index[html].js index 4eb2d0ab71..039e90d54c 100644 --- a/packages/translator-default/src/text/index[html].js +++ b/packages/translator-default/src/text/index[html].js @@ -6,6 +6,6 @@ export default function (path) { const { node } = path; path.replaceWith( - withPreviousLocation(write`${t.stringLiteral(node.value)}`, node) + withPreviousLocation(write`${t.stringLiteral(node.value)}`, node), ); } diff --git a/packages/translator-default/src/text/index[vdom].js b/packages/translator-default/src/text/index[vdom].js index 92af03a247..70894a84b6 100644 --- a/packages/translator-default/src/text/index[vdom].js +++ b/packages/translator-default/src/text/index[vdom].js @@ -1,5 +1,5 @@ -import { decode } from "he"; import { types as t } from "@marko/compiler"; +import { decode } from "he"; import write from "../util/vdom-out-write"; import withPreviousLocation from "../util/with-previous-location"; @@ -11,9 +11,9 @@ export default function (path) { write( "t", t.stringLiteral(decode(node.value)), - path.hub.file._componentInstanceIdentifier + path.hub.file._componentInstanceIdentifier, ), - node - ) + node, + ), ); } diff --git a/packages/translator-default/src/util/add-dependencies.js b/packages/translator-default/src/util/add-dependencies.js index 95f3263cce..c9dc7fb46f 100644 --- a/packages/translator-default/src/util/add-dependencies.js +++ b/packages/translator-default/src/util/add-dependencies.js @@ -1,12 +1,12 @@ import path from "path"; -import MagicString from "magic-string"; -import { types as t } from "@marko/compiler"; -import resolveFrom from "resolve-from"; import { loadFileForImport, parseStatements, resolveRelativePath, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; +import MagicString from "magic-string"; +import resolveFrom from "resolve-from"; export default (entryFile, isHydrate) => { const { resolveVirtualDependency, hydrateIncludeImports, hydrateInit } = @@ -32,11 +32,11 @@ export default (entryFile, isHydrate) => { if (hasComponents) { const initId = t.identifier("init"); const markoComponentsImport = importPath( - resolvePath(entryFile, "marko/src/runtime/components/index.js") + resolvePath(entryFile, "marko/src/runtime/components/index.js"), ); if (splitComponentIndex) { markoComponentsImport.specifiers.push( - t.importSpecifier(t.identifier("register"), t.identifier("register")) + t.importSpecifier(t.identifier("register"), t.identifier("register")), ); } @@ -54,9 +54,9 @@ export default (entryFile, isHydrate) => { initId, entryFile.markoOpts.runtimeId ? [t.stringLiteral(entryFile.markoOpts.runtimeId)] - : [] - ) - ) + : [], + ), + ), ); } } @@ -112,13 +112,13 @@ export default (entryFile, isHydrate) => { if (meta.component) { // Split component const splitComponentId = t.identifier( - `component_${splitComponentIndex++}` + `component_${splitComponentIndex++}`, ); const splitComponentImport = importPath( - resolvePath(file, meta.component) + resolvePath(file, meta.component), ); splitComponentImport.specifiers.push( - t.importDefaultSpecifier(splitComponentId) + t.importDefaultSpecifier(splitComponentId), ); program.pushContainer("body", splitComponentImport); program.pushContainer( @@ -127,8 +127,8 @@ export default (entryFile, isHydrate) => { t.callExpression(t.identifier("register"), [ t.stringLiteral(meta.id), splitComponentId, - ]) - ) + ]), + ), ); } } @@ -183,7 +183,7 @@ export default (entryFile, isHydrate) => { ? resolveRelativePath(file, req) : resolveRelativePath( entryFile, - path.join(file.opts.filename, "..", req) + path.join(file.opts.filename, "..", req), ); } @@ -196,14 +196,14 @@ function tryGetTemplateImports(file, rendererRelativePath) { const resolvedRendererPath = path.join( file.opts.filename, "..", - rendererRelativePath + rendererRelativePath, ); let templateImports; try { for (const statement of parseStatements( file, - file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8") + file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8"), )) { if (statement.type === "ImportDeclaration") { addImport(statement.source.value); diff --git a/packages/translator-default/src/util/get-component-files.js b/packages/translator-default/src/util/get-component-files.js index 218506e7e2..3988efd07e 100644 --- a/packages/translator-default/src/util/get-component-files.js +++ b/packages/translator-default/src/util/get-component-files.js @@ -20,7 +20,7 @@ export default function getComponentFiles({ hub: { file } }) { const styleMatch = new RegExp(`^${fileMatch}style\\.\\w+$`); const componentMatch = new RegExp(`^${fileMatch}component\\.\\w+$`); const splitComponentMatch = new RegExp( - `^${fileMatch}component-browser\\.\\w+$` + `^${fileMatch}component-browser\\.\\w+$`, ); const packageMatch = new RegExp(`^${fileMatch}browser\\.\\json$`); let styleFile; diff --git a/packages/translator-default/src/util/html-out-write.js b/packages/translator-default/src/util/html-out-write.js index e694b37f36..64fbe4ed3a 100644 --- a/packages/translator-default/src/util/html-out-write.js +++ b/packages/translator-default/src/util/html-out-write.js @@ -1,5 +1,5 @@ -import { types as t } from "@marko/compiler"; import { normalizeTemplateString } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; export default function write(strings, ...expressions) { const template = normalizeTemplateString(strings, ...expressions); @@ -8,8 +8,8 @@ export default function write(strings, ...expressions) { return t.expressionStatement( t.callExpression( t.memberExpression(t.identifier("out"), t.identifier("w")), - [template] - ) + [template], + ), ); } } diff --git a/packages/translator-default/src/util/key-manager.js b/packages/translator-default/src/util/key-manager.js index 596e231d1f..f2e9c82496 100644 --- a/packages/translator-default/src/util/key-manager.js +++ b/packages/translator-default/src/util/key-manager.js @@ -1,9 +1,9 @@ -import { types as t } from "@marko/compiler"; import { isLoopTag, isTransparentTag, normalizeTemplateString, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; const KeyManagerLookup = new WeakMap(); /** @@ -51,7 +51,7 @@ class KeyManager { firstChildTag.insertBefore( t.variableDeclaration("const", [ t.variableDeclarator(keyValueIdentifier, firstChildKey), - ]) + ]), ); path.set("keyValue", keyValueIdentifier); @@ -74,7 +74,7 @@ class KeyManager { "key", parentKeyScope ? t.binaryExpression("+", autoKey, parentKeyScope) - : autoKey + : autoKey, ); } } @@ -102,8 +102,8 @@ function getKeyScope(path) { "declarations", t.variableDeclarator( keyScopeIdentifier, - normalizeTemplateString`[${firstChildKeyValue}]` - ) + normalizeTemplateString`[${firstChildKeyValue}]`, + ), ); } else { let keyValue; @@ -121,7 +121,7 @@ function getKeyScope(path) { path.insertBefore( t.variableDeclaration("let", [ t.variableDeclarator(keyValueIdentifier, t.numericLiteral(0)), - ]) + ]), ); keyValue = t.updateExpression("++", keyValueIdentifier); @@ -139,9 +139,9 @@ function getKeyScope(path) { t.variableDeclaration("const", [ t.variableDeclarator( keyScopeIdentifier, - normalizeTemplateString`[${keyValue}]` + normalizeTemplateString`[${keyValue}]`, ), - ]) + ]), ); } diff --git a/packages/translator-default/src/util/optimize-vdom-create.js b/packages/translator-default/src/util/optimize-vdom-create.js index 60973f8f7f..ef7fba1155 100644 --- a/packages/translator-default/src/util/optimize-vdom-create.js +++ b/packages/translator-default/src/util/optimize-vdom-create.js @@ -1,5 +1,3 @@ -import { decode } from "he"; -import { types as t } from "@marko/compiler"; import { computeNode, getTagDef, @@ -7,9 +5,11 @@ import { isLoopTag, isNativeTag, } from "@marko/babel-utils"; +import { types as t } from "@marko/compiler"; +import { decode } from "he"; +import { tagArguments } from "../tag/native-tag[vdom]"; import { getKeyManager } from "./key-manager"; import write from "./vdom-out-write"; -import { tagArguments } from "../tag/native-tag[vdom]"; const skipDirectives = new Set([ "no-update", @@ -24,7 +24,7 @@ const mergeStaticCreateVisitor = { const { node } = path; state.currentRoot = t.callExpression( t.memberExpression(state.currentRoot, t.identifier("t")), - [t.stringLiteral(decode(node.value))] + [t.stringLiteral(decode(node.value))], ); }, MarkoPlaceholder(path, state) { @@ -33,9 +33,9 @@ const mergeStaticCreateVisitor = { t.memberExpression(state.currentRoot, t.identifier("t")), [ t.stringLiteral( - computed && computed.value != null ? `${computed.value}` : "" + computed && computed.value != null ? `${computed.value}` : "", ), - ] + ], ); }, MarkoTag(path, state) { @@ -43,7 +43,7 @@ const mergeStaticCreateVisitor = { const writeArgs = tagArguments(path, true); state.currentRoot = t.callExpression( t.memberExpression(state.currentRoot, t.identifier("e")), - writeArgs + writeArgs, ); }, }; @@ -88,7 +88,7 @@ const analyzeStaticVisitor = { attr.node.modifier || skipDirectives.has(attr.node.name) || !computeNode(attr.node.value) - ) + ), ); // check children @@ -124,9 +124,9 @@ export function optimizeStaticVDOM(path) { importDefault( file, "marko/src/runtime/vdom/helpers/v-element.js", - "marko_createElement" + "marko_createElement", ), - writeArgs + writeArgs, ), }; diff --git a/packages/translator-default/src/util/vdom-out-write.js b/packages/translator-default/src/util/vdom-out-write.js index e54ca17714..b0215ef4ef 100644 --- a/packages/translator-default/src/util/vdom-out-write.js +++ b/packages/translator-default/src/util/vdom-out-write.js @@ -4,7 +4,7 @@ export default function write(method, ...args) { return t.expressionStatement( t.callExpression( t.memberExpression(t.identifier("out"), t.identifier(method)), - args - ) + args, + ), ); } diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/components/hello/transformer.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/components/hello/transformer.js index d236d781a5..35b26a123a 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/components/hello/transformer.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/components/hello/transformer.js @@ -3,7 +3,7 @@ const { loadFileForTag } = require("@marko/babel-utils"); module.exports = (helloTag, t) => { const messageTag = helloTag.getNextSibling(); helloTag.insertAfter( - t.markoText(`${readFileText(helloTag)} ${readFileText(messageTag)}`) + t.markoText(`${readFileText(helloTag)} ${readFileText(messageTag)}`), ); helloTag.remove(); messageTag.remove(); diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/old.migrator.js b/packages/translator-default/test/fixtures/custom-tag-migration/old.migrator.js index 200218068e..25bac58031 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/old.migrator.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/old.migrator.js @@ -17,10 +17,10 @@ export function exit(path) { path.get("attributes").map((p) => p.node), t.markoTagBody( path.get("body.body").map((p) => p.node), - toNodes(path.get("params")) + toNodes(path.get("params")), ), - toNodes(path.get("arguments")) - ) + toNodes(path.get("arguments")), + ), ); } diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/div.transformer.js b/packages/translator-default/test/fixtures/custom-tag-transform/div.transformer.js index 2933449071..3d0571d9ad 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/div.transformer.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/div.transformer.js @@ -3,7 +3,7 @@ import { types as t } from "@marko/compiler"; export function enter(path) { path.pushContainer( "attributes", - t.markoAttribute("style", t.stringLiteral("display:block")) + t.markoAttribute("style", t.stringLiteral("display:block")), ); } @@ -14,10 +14,10 @@ export function exit(path) { path.get("attributes").map((p) => p.node), t.markoTagBody( path.get("body.body").map((p) => p.node), - toNodes(path.get("params")) + toNodes(path.get("params")), ), - toNodes(path.get("arguments")) - ) + toNodes(path.get("arguments")), + ), ); } diff --git a/packages/translator-default/test/index.test.js b/packages/translator-default/test/index.test.js index b1434ded1a..dd7964afbd 100644 --- a/packages/translator-default/test/index.test.js +++ b/packages/translator-default/test/index.test.js @@ -1,12 +1,16 @@ import fs from "fs"; import path from "path"; -import autotest from "mocha-autotest"; import { compileFileSync } from "@marko/compiler"; +import autotest from "mocha-autotest"; -// eslint-disable-next-line no-control-regex -const ansiReg = /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g; +const ansiReg = + // eslint-disable-next-line no-control-regex + /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g; const regexpCharsReg = /[\\^$.*+?()[\]{}|]/g; -const cwdRegExp = new RegExp(process.cwd().replace(regexpCharsReg, "\\$&") + "/", "g"); +const cwdRegExp = new RegExp( + process.cwd().replace(regexpCharsReg, "\\$&") + "/", + "g", +); describe("translator-class", () => { autotest("fixtures", { @@ -65,10 +69,15 @@ function runTest(config) { diags = result.meta.diagnostics; } catch (err) { try { - snapshot(stripCwd(stripModuleStackTrace(String(err.stack).replace(ansiReg, ""))), { - name: `${name}-error`, - ext: ".txt", - }); + snapshot( + stripCwd( + stripModuleStackTrace(String(err.stack).replace(ansiReg, "")), + ), + { + name: `${name}-error`, + ext: ".txt", + }, + ); return; } catch { throw err; @@ -115,7 +124,7 @@ function printDiags(diags) { for (const diag of diags) { result += `${diag.type}${diag.fix ? `[fixable]` : ""}${printLoc( - diag.loc + diag.loc, )}: ${diag.label}\n`; } diff --git a/scripts/babel-plugin-marko-debug.js b/scripts/babel-plugin-marko-debug.js index bd88e07e76..99f04126d8 100644 --- a/scripts/babel-plugin-marko-debug.js +++ b/scripts/babel-plugin-marko-debug.js @@ -11,7 +11,7 @@ module.exports = function babelPluginMarkoDebug() { path, node.test, node.consequent, - node.alternate + node.alternate, ); }, ConditionalExpression: (path) => { @@ -20,7 +20,7 @@ module.exports = function babelPluginMarkoDebug() { path, node.test, node.consequent, - node.alternate + node.alternate, ); }, LogicalExpression: (path) => { @@ -56,7 +56,7 @@ function replaceMarkoDebug(path, test, consequent, alternate) { // If we found a condition that is a string (and isn't "MARKO_DEBUG") it's most likely a mistake. if (test.value !== "MARKO_DEBUG") { throw new Error( - `Found if statement with StringLiteral "${test.value}", did you mean "MARKO_DEBUG".` + `Found if statement with StringLiteral "${test.value}", did you mean "MARKO_DEBUG".`, ); }