diff --git a/crates/swc/tests/fixture/issues-2xxx/2606/1/output/index.ts b/crates/swc/tests/fixture/issues-2xxx/2606/1/output/index.ts index 25ca197b94c..ea5b7c38bd8 100644 --- a/crates/swc/tests/fixture/issues-2xxx/2606/1/output/index.ts +++ b/crates/swc/tests/fixture/issues-2xxx/2606/1/output/index.ts @@ -9,9 +9,9 @@ function _export(target, all) { }); } _export(exports, { + warn: ()=>warn, test: ()=>test, - test2: ()=>test2, - warn: ()=>warn + test2: ()=>test2 }); function warn() { throw new Error("this should not be called"); diff --git a/crates/swc/tests/fixture/issues-2xxx/2964/case-2/output/index.ts b/crates/swc/tests/fixture/issues-2xxx/2964/case-2/output/index.ts index 2129af35407..6364938c026 100644 --- a/crates/swc/tests/fixture/issues-2xxx/2964/case-2/output/index.ts +++ b/crates/swc/tests/fixture/issues-2xxx/2964/case-2/output/index.ts @@ -10,8 +10,8 @@ function _export(target, all) { } _export(exports, { badIstanbul: ()=>badIstanbul, - downloadDocument: ()=>downloadDocument, - noop: ()=>noop + noop: ()=>noop, + downloadDocument: ()=>downloadDocument }); const _objectWithoutProperties = require("@swc/helpers/lib/_object_without_properties.js").default; //top comment diff --git a/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/.swcrc b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/.swcrc new file mode 100644 index 00000000000..0c0c7de1cfe --- /dev/null +++ b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/.swcrc @@ -0,0 +1,33 @@ +{ + "sourceMaps": false, + "module": { + "type": "commonjs" + }, + "jsc": { + "parser": { + "syntax": "typescript", + "tsx": true, + "dynamicImport": true, + "decorators": false + }, + "transform": { + "react": { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + "throwIfNamespace": true, + "development": false, + "useBuiltins": false + } + }, + "target": "es2015", + "loose": false, + "externalHelpers": false, + "keepClassNames": false, + "minify": { + "compress": false, + "mangle": false + }, + "preserveAllComments": true + }, + "minify": false +} diff --git a/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/index.ts b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/index.ts new file mode 100644 index 00000000000..0d35636e140 --- /dev/null +++ b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/input/index.ts @@ -0,0 +1,3 @@ +export const a = 1; +export const b = 2; +export const { ...foo } = { a: 1, b: 2 }; diff --git a/crates/swc/tests/fixture/issues-2xxx/2964/case-5/output/index.ts b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/output/index.ts new file mode 100644 index 00000000000..256daa74932 --- /dev/null +++ b/crates/swc/tests/fixture/issues-2xxx/2964/case-5/output/index.ts @@ -0,0 +1,22 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); +function _export(target, all) { + for(var name in all)Object.defineProperty(target, name, { + enumerable: true, + get: all[name] + }); +} +_export(exports, { + foo: ()=>foo, + a: ()=>a, + b: ()=>b +}); +const _extends = require("@swc/helpers/lib/_extends.js").default; +const a = 1; +const b = 2; +var foo = _extends({}, { + a: 1, + b: 2 +}); diff --git a/crates/swc/tests/fixture/issues-3xxx/3782/output/index.map b/crates/swc/tests/fixture/issues-3xxx/3782/output/index.map index 8287477afd5..790da795f03 100644 --- a/crates/swc/tests/fixture/issues-3xxx/3782/output/index.map +++ b/crates/swc/tests/fixture/issues-3xxx/3782/output/index.map @@ -1,8 +1,8 @@ { - "mappings": "AACA;;;;;;;;IAIaA,IAAI,MAAJA,IAAI;IAJLC,GAAG;;qBAAM,OAAO;AAIrB,MAAMD,IAAI,GAAG,CAACE,EAAU,GAAsB;IACjD,sBAAsB;IACtB,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,GACvBC,UAAU,CAAC,IAAM;YACbD,OAAO,CAAC,QAAQ,CAAC,CAAC;SACrB,EAAE,IAAI,CAAC,CACX,CAAC;CACL,AAAC", + "mappings": "AACA;;;;;;;;IAAYA,GAAG;IAIFC,IAAI,MAAJA,IAAI;;qBAJI,OAAO;AAIrB,MAAMA,IAAI,GAAG,CAACC,EAAU,GAAsB;IACjD,sBAAsB;IACtB,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,GACvBC,UAAU,CAAC,IAAM;YACbD,OAAO,CAAC,QAAQ,CAAC,CAAC;SACrB,EAAE,IAAI,CAAC,CACX,CAAC;CACL,AAAC", "names": [ - "byID", "get", + "byID", "id", "Promise", "resolve", diff --git a/crates/swc/tests/fixture/issues-3xxx/3782/output/index.ts b/crates/swc/tests/fixture/issues-3xxx/3782/output/index.ts index ad03d67684c..bd2636c0ece 100644 --- a/crates/swc/tests/fixture/issues-3xxx/3782/output/index.ts +++ b/crates/swc/tests/fixture/issues-3xxx/3782/output/index.ts @@ -6,8 +6,8 @@ function _export(target, all) { }); } _export(exports, { - byID: ()=>byID, - get: ()=>_get + get: ()=>_get, + byID: ()=>byID }); const _get = require("./get"); const byID = (id)=>{ diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map index 0c5fa350797..de5ff1d0430 100644 --- a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map @@ -1,15 +1,15 @@ { - "mappings": "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", + "mappings": "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", "names": [ - "create", - "header", "node", + "create", + "trustBox", "opener", - "seq", + "stage", + "header", "source", "sources", - "stage", - "trustBox", + "seq", "BodyBuilder", "TrustBoxBuilder", "OpenerBuilder", diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts index 4d35503fc45..04930b65041 100644 --- a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts @@ -9,15 +9,15 @@ function _export(target, all) { }); } _export(exports, { - create: ()=>create, - header: ()=>header, node: ()=>_bodyNodesBuilder, + create: ()=>create, + trustBox: ()=>trustBox, opener: ()=>opener, - seq: ()=>seq, + stage: ()=>stage, + header: ()=>header, source: ()=>source, sources: ()=>sources, - stage: ()=>stage, - trustBox: ()=>trustBox + seq: ()=>seq }); const _classPrivateFieldGet = require("@swc/helpers/lib/_class_private_field_get.js").default; const _classPrivateFieldInit = require("@swc/helpers/lib/_class_private_field_init.js").default; diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts index 8c149086602..5499c398c01 100644 --- a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts @@ -9,15 +9,15 @@ function _export(target, all) { }); } _export(exports, { - create: ()=>create, - header: ()=>header, node: ()=>_bodyNodesBuilder, + create: ()=>create, + trustBox: ()=>trustBox, opener: ()=>opener, - seq: ()=>seq, + stage: ()=>stage, + header: ()=>header, source: ()=>source, sources: ()=>sources, - stage: ()=>stage, - trustBox: ()=>trustBox + seq: ()=>seq }); const _classPrivateFieldGet = require("@swc/helpers/lib/_class_private_field_get.js").default; const _classPrivateFieldInit = require("@swc/helpers/lib/_class_private_field_init.js").default; @@ -316,4 +316,4 @@ class ArticleSourcesBuilder extends _abstractBuilders.AbstractBuilder { } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../input/index.ts"],"sourcesContent":["import { AbstractBuilder, AbstractSeqBuilder } from \"./AbstractBuilders\";\nimport { hash, mapBuildArg, mapBuildArgs } from \"./Builder.utils\";\nimport { image } from \"./ElementBuilder\";\n\nimport type {\n    Body,\n    BodyStage,\n    TrustBox,\n    RichText,\n    Opener,\n    BodyHeader,\n    Stage,\n    ArticleSource,\n    ArticleSources,\n} from \"@paper/models\";\nimport type {\n    BuildArg,\n    BuildArgs,\n    CreateBuilder,\n    SeqElement,\n    SeqNextElementConverter,\n} from \"./types\";\n\n/**\n * @deprecated use {Builder.body.node.img()}\n */\nexport * from \"./BodyNodesBuilder\";\nexport * as node from \"./BodyNodesBuilder\";\n\nexport const create: CreateBuilder<BodyBuilder> = () => new BodyBuilder();\nexport const trustBox: CreateBuilder<TrustBoxBuilder> = () =>\n    new TrustBoxBuilder();\nexport const opener: CreateBuilder<OpenerBuilder> = () => new OpenerBuilder();\nexport const stage: CreateBuilder<BodyStageBuilder> = () =>\n    new BodyStageBuilder();\nexport const header: CreateBuilder<BodyHeaderBuilder> = () =>\n    new BodyHeaderBuilder();\nexport const source: CreateBuilder<\n    ArticleSourceBuilder,\n    BuildArgs<RichText.Node>\n> = (nodes: BuildArgs<RichText.Node> = []) =>\n    new ArticleSourceBuilder(...nodes);\nexport const sources: CreateBuilder<ArticleSourcesBuilder> = () =>\n    new ArticleSourcesBuilder();\n\nexport const seq = {\n    stage: (() =>\n        new BodyStageSeqBuilder()) as CreateBuilder<BodyStageSeqBuilder>,\n    source: (() =>\n        new ArticleSourceSeqBuilder()) as CreateBuilder<ArticleSourceSeqBuilder>,\n} as const;\n\nclass BodyBuilder extends AbstractBuilder<Body> {\n    #stages: BodyStage[] = [];\n    #trustBox?: TrustBox = undefined;\n    #disclaimer?: RichText.Node[] = undefined;\n    #articleSources?: ArticleSources = undefined;\n\n    stages(...stages: BuildArgs<BodyStage>): this {\n        this.#stages = stages.map(mapBuildArg);\n        return this;\n    }\n\n    trustBox(trustBox?: BuildArg<TrustBox>): this {\n        this.#trustBox = mapBuildArg(trustBox);\n        return this;\n    }\n\n    disclaimer(disclaimer?: BuildArgs<RichText.Node>): this {\n        this.#disclaimer = disclaimer?.map(mapBuildArg);\n        return this;\n    }\n\n    articleSources(articleSources?: BuildArg<ArticleSources>): this {\n        this.#articleSources = mapBuildArg(articleSources);\n        return this;\n    }\n\n    build(): Body {\n        return {\n            stages: this.#stages,\n            trustBox: this.#trustBox,\n            disclaimer: this.#disclaimer,\n            articleSources: this.#articleSources,\n        };\n    }\n}\n\nclass TrustBoxBuilder extends AbstractBuilder<TrustBox> {\n    #nodes: RichText.Node[] = [];\n    #hidden: RichText.Node[] = [];\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(hidden: BuildArgs<RichText.Node>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): TrustBox {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}\n\nclass OpenerBuilder extends AbstractBuilder<Opener> {\n    #element: Opener[\"element\"] = image().build();\n\n    element(element: BuildArg<Opener[\"element\"]>): this {\n        this.#element = mapBuildArg(element);\n        return this;\n    }\n\n    build(): Opener {\n        return {\n            element: this.#element,\n        };\n    }\n}\n\nclass BodyStageSeqBuilder extends AbstractSeqBuilder<BodyStage> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n    #header?: SeqElement<BodyHeader> = undefined;\n    #companions: SeqElement<Stage.CompanionItem[]> = [];\n    #commercialsEndOfStage: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    header(header?: SeqElement<BuildArg<BodyHeader>>): this {\n        this.#header = mapBuildArgs(header ?? []);\n        return this;\n    }\n\n    companions(companions: SeqElement<BuildArgs<Stage.CompanionItem>>): this {\n        this.#companions = companions.map(mapBuildArgs);\n        return this;\n    }\n\n    commercialsEndOfStage(\n        commercialsEndOfStage: SeqElement<BuildArgs<RichText.Node>>\n    ): this {\n        this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): BodyStage {\n        return {\n            id: hash(\n                \"bodyStage\",\n                this.#nodes,\n                this.#companions,\n                this.#commercialsEndOfStage,\n                this.#header\n            ),\n            nodes: seqNextElement.array(this.#nodes),\n            header: seqNextElement.maybe(this.#header),\n            companions: seqNextElement.array(this.#companions),\n            commercialsEndOfStage: seqNextElement.array(\n                this.#commercialsEndOfStage\n            ),\n        };\n    }\n}\n\nclass BodyStageBuilder extends AbstractBuilder<BodyStage> {\n    #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder();\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    header(header?: BuildArg<BodyHeader>): this {\n        if (header) {\n            this.#seqBuilder.header([header]);\n        }\n        return this;\n    }\n\n    companions(companions: BuildArgs<Stage.CompanionItem>): this {\n        this.#seqBuilder.companions([companions]);\n        return this;\n    }\n\n    commercialsEndOfStage(\n        commercialsEndOfStage: BuildArgs<RichText.Node>\n    ): this {\n        this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]);\n        return this;\n    }\n\n    build(): BodyStage {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass BodyHeaderBuilder extends AbstractBuilder<BodyHeader> {\n    #variant: BodyHeader[\"variant\"] = \"full\";\n    #opener?: Opener = undefined;\n\n    variant(variant: BodyHeader[\"variant\"]): this {\n        this.#variant = variant;\n        return this;\n    }\n\n    opener(opener: BuildArg<Opener>): this {\n        this.#opener = mapBuildArg(opener);\n        return this;\n    }\n\n    build(): BodyHeader {\n        return {\n            variant: this.#variant,\n            opener: this.#opener,\n        };\n    }\n}\n\nclass ArticleSourceSeqBuilder extends AbstractSeqBuilder<ArticleSource> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource {\n        const id = hash(\"article-source\", this.#nodes);\n        return {\n            id,\n            nodes: seqNextElement.array(this.#nodes),\n        };\n    }\n}\n\nclass ArticleSourceBuilder extends AbstractBuilder<ArticleSource> {\n    #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder();\n\n    constructor(...nodes: BuildArgs<RichText.Node>) {\n        super();\n        this.nodes(...nodes);\n    }\n\n    nodes(...nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    build(): ArticleSource {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass ArticleSourcesBuilder extends AbstractBuilder<ArticleSources> {\n    #nodes: ArticleSource[] = [];\n    #hidden: ArticleSource[] = [];\n\n    nodes(...nodes: BuildArgs<ArticleSource>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(...hidden: BuildArgs<ArticleSource>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): ArticleSources {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}\n"],"names":["create","header","node","opener","seq","source","sources","stage","trustBox","BodyBuilder","TrustBoxBuilder","OpenerBuilder","BodyStageBuilder","BodyHeaderBuilder","nodes","ArticleSourceBuilder","ArticleSourcesBuilder","BodyStageSeqBuilder","ArticleSourceSeqBuilder","AbstractBuilder","stages","map","mapBuildArg","disclaimer","articleSources","build","undefined","hidden","element","image","AbstractSeqBuilder","mapBuildArgs","companions","commercialsEndOfStage","buildListItem","seqNextElement","id","hash","array","maybe","seqBuilder","variant","constructor"],"mappings":"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"} +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../input/index.ts"],"sourcesContent":["import { AbstractBuilder, AbstractSeqBuilder } from \"./AbstractBuilders\";\nimport { hash, mapBuildArg, mapBuildArgs } from \"./Builder.utils\";\nimport { image } from \"./ElementBuilder\";\n\nimport type {\n    Body,\n    BodyStage,\n    TrustBox,\n    RichText,\n    Opener,\n    BodyHeader,\n    Stage,\n    ArticleSource,\n    ArticleSources,\n} from \"@paper/models\";\nimport type {\n    BuildArg,\n    BuildArgs,\n    CreateBuilder,\n    SeqElement,\n    SeqNextElementConverter,\n} from \"./types\";\n\n/**\n * @deprecated use {Builder.body.node.img()}\n */\nexport * from \"./BodyNodesBuilder\";\nexport * as node from \"./BodyNodesBuilder\";\n\nexport const create: CreateBuilder<BodyBuilder> = () => new BodyBuilder();\nexport const trustBox: CreateBuilder<TrustBoxBuilder> = () =>\n    new TrustBoxBuilder();\nexport const opener: CreateBuilder<OpenerBuilder> = () => new OpenerBuilder();\nexport const stage: CreateBuilder<BodyStageBuilder> = () =>\n    new BodyStageBuilder();\nexport const header: CreateBuilder<BodyHeaderBuilder> = () =>\n    new BodyHeaderBuilder();\nexport const source: CreateBuilder<\n    ArticleSourceBuilder,\n    BuildArgs<RichText.Node>\n> = (nodes: BuildArgs<RichText.Node> = []) =>\n    new ArticleSourceBuilder(...nodes);\nexport const sources: CreateBuilder<ArticleSourcesBuilder> = () =>\n    new ArticleSourcesBuilder();\n\nexport const seq = {\n    stage: (() =>\n        new BodyStageSeqBuilder()) as CreateBuilder<BodyStageSeqBuilder>,\n    source: (() =>\n        new ArticleSourceSeqBuilder()) as CreateBuilder<ArticleSourceSeqBuilder>,\n} as const;\n\nclass BodyBuilder extends AbstractBuilder<Body> {\n    #stages: BodyStage[] = [];\n    #trustBox?: TrustBox = undefined;\n    #disclaimer?: RichText.Node[] = undefined;\n    #articleSources?: ArticleSources = undefined;\n\n    stages(...stages: BuildArgs<BodyStage>): this {\n        this.#stages = stages.map(mapBuildArg);\n        return this;\n    }\n\n    trustBox(trustBox?: BuildArg<TrustBox>): this {\n        this.#trustBox = mapBuildArg(trustBox);\n        return this;\n    }\n\n    disclaimer(disclaimer?: BuildArgs<RichText.Node>): this {\n        this.#disclaimer = disclaimer?.map(mapBuildArg);\n        return this;\n    }\n\n    articleSources(articleSources?: BuildArg<ArticleSources>): this {\n        this.#articleSources = mapBuildArg(articleSources);\n        return this;\n    }\n\n    build(): Body {\n        return {\n            stages: this.#stages,\n            trustBox: this.#trustBox,\n            disclaimer: this.#disclaimer,\n            articleSources: this.#articleSources,\n        };\n    }\n}\n\nclass TrustBoxBuilder extends AbstractBuilder<TrustBox> {\n    #nodes: RichText.Node[] = [];\n    #hidden: RichText.Node[] = [];\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(hidden: BuildArgs<RichText.Node>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): TrustBox {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}\n\nclass OpenerBuilder extends AbstractBuilder<Opener> {\n    #element: Opener[\"element\"] = image().build();\n\n    element(element: BuildArg<Opener[\"element\"]>): this {\n        this.#element = mapBuildArg(element);\n        return this;\n    }\n\n    build(): Opener {\n        return {\n            element: this.#element,\n        };\n    }\n}\n\nclass BodyStageSeqBuilder extends AbstractSeqBuilder<BodyStage> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n    #header?: SeqElement<BodyHeader> = undefined;\n    #companions: SeqElement<Stage.CompanionItem[]> = [];\n    #commercialsEndOfStage: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    header(header?: SeqElement<BuildArg<BodyHeader>>): this {\n        this.#header = mapBuildArgs(header ?? []);\n        return this;\n    }\n\n    companions(companions: SeqElement<BuildArgs<Stage.CompanionItem>>): this {\n        this.#companions = companions.map(mapBuildArgs);\n        return this;\n    }\n\n    commercialsEndOfStage(\n        commercialsEndOfStage: SeqElement<BuildArgs<RichText.Node>>\n    ): this {\n        this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): BodyStage {\n        return {\n            id: hash(\n                \"bodyStage\",\n                this.#nodes,\n                this.#companions,\n                this.#commercialsEndOfStage,\n                this.#header\n            ),\n            nodes: seqNextElement.array(this.#nodes),\n            header: seqNextElement.maybe(this.#header),\n            companions: seqNextElement.array(this.#companions),\n            commercialsEndOfStage: seqNextElement.array(\n                this.#commercialsEndOfStage\n            ),\n        };\n    }\n}\n\nclass BodyStageBuilder extends AbstractBuilder<BodyStage> {\n    #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder();\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    header(header?: BuildArg<BodyHeader>): this {\n        if (header) {\n            this.#seqBuilder.header([header]);\n        }\n        return this;\n    }\n\n    companions(companions: BuildArgs<Stage.CompanionItem>): this {\n        this.#seqBuilder.companions([companions]);\n        return this;\n    }\n\n    commercialsEndOfStage(\n        commercialsEndOfStage: BuildArgs<RichText.Node>\n    ): this {\n        this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]);\n        return this;\n    }\n\n    build(): BodyStage {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass BodyHeaderBuilder extends AbstractBuilder<BodyHeader> {\n    #variant: BodyHeader[\"variant\"] = \"full\";\n    #opener?: Opener = undefined;\n\n    variant(variant: BodyHeader[\"variant\"]): this {\n        this.#variant = variant;\n        return this;\n    }\n\n    opener(opener: BuildArg<Opener>): this {\n        this.#opener = mapBuildArg(opener);\n        return this;\n    }\n\n    build(): BodyHeader {\n        return {\n            variant: this.#variant,\n            opener: this.#opener,\n        };\n    }\n}\n\nclass ArticleSourceSeqBuilder extends AbstractSeqBuilder<ArticleSource> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource {\n        const id = hash(\"article-source\", this.#nodes);\n        return {\n            id,\n            nodes: seqNextElement.array(this.#nodes),\n        };\n    }\n}\n\nclass ArticleSourceBuilder extends AbstractBuilder<ArticleSource> {\n    #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder();\n\n    constructor(...nodes: BuildArgs<RichText.Node>) {\n        super();\n        this.nodes(...nodes);\n    }\n\n    nodes(...nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    build(): ArticleSource {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass ArticleSourcesBuilder extends AbstractBuilder<ArticleSources> {\n    #nodes: ArticleSource[] = [];\n    #hidden: ArticleSource[] = [];\n\n    nodes(...nodes: BuildArgs<ArticleSource>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(...hidden: BuildArgs<ArticleSource>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): ArticleSources {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}\n"],"names":["node","create","trustBox","opener","stage","header","source","sources","seq","BodyBuilder","TrustBoxBuilder","OpenerBuilder","BodyStageBuilder","BodyHeaderBuilder","nodes","ArticleSourceBuilder","ArticleSourcesBuilder","BodyStageSeqBuilder","ArticleSourceSeqBuilder","AbstractBuilder","stages","map","mapBuildArg","disclaimer","articleSources","build","undefined","hidden","element","image","AbstractSeqBuilder","mapBuildArgs","companions","commercialsEndOfStage","buildListItem","seqNextElement","id","hash","array","maybe","seqBuilder","variant","constructor"],"mappings":"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"} diff --git a/crates/swc_ecma_transforms_module/src/amd.rs b/crates/swc_ecma_transforms_module/src/amd.rs index 5d52831c8c1..fba2c3d07af 100644 --- a/crates/swc_ecma_transforms_module/src/amd.rs +++ b/crates/swc_ecma_transforms_module/src/amd.rs @@ -400,7 +400,7 @@ impl Amd { let mut export_stmts = Default::default(); if !export_obj_prop_list.is_empty() && !is_export_assign { - export_obj_prop_list.sort_by(|a, b| a.0.cmp(&b.0)); + export_obj_prop_list.sort_by(|a, b| a.1.cmp(&b.1)); let features = self.available_features; let exports = self.exports(); diff --git a/crates/swc_ecma_transforms_module/src/common_js.rs b/crates/swc_ecma_transforms_module/src/common_js.rs index f76bf95442c..836020e48fb 100644 --- a/crates/swc_ecma_transforms_module/src/common_js.rs +++ b/crates/swc_ecma_transforms_module/src/common_js.rs @@ -352,7 +352,7 @@ impl Cjs { let mut export_stmts: Vec = Default::default(); if !export_obj_prop_list.is_empty() && !is_export_assign { - export_obj_prop_list.sort_by(|a, b| a.0.cmp(&b.0)); + export_obj_prop_list.sort_by(|a, b| a.1.cmp(&b.1)); if import_interop.is_node() { let export_id_list: Vec<(JsWord, Span)> = export_obj_prop_list diff --git a/crates/swc_ecma_transforms_module/src/umd.rs b/crates/swc_ecma_transforms_module/src/umd.rs index f65a17873c7..2fee6ff2aae 100644 --- a/crates/swc_ecma_transforms_module/src/umd.rs +++ b/crates/swc_ecma_transforms_module/src/umd.rs @@ -291,7 +291,7 @@ impl Umd { let mut export_stmts = Default::default(); if !export_obj_prop_list.is_empty() && !is_export_assign { - export_obj_prop_list.sort_by(|a, b| a.0.cmp(&b.0)); + export_obj_prop_list.sort_by(|a, b| a.1.cmp(&b.1)); let features = self.available_features; let exports = self.exports(); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.amd.js index 7a9d4aa4209..ed3fafa4573 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.amd.js @@ -13,10 +13,10 @@ define([ }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, baz: ()=>baz, bazbar: ()=>baz, - foo: ()=>foo, foobar: ()=>foo }); let foo = 1n; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.cjs index 37a0a392b46..f7fb19fef45 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.cjs @@ -9,10 +9,10 @@ function _export(target, all) { }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, baz: ()=>baz, bazbar: ()=>baz, - foo: ()=>foo, foobar: ()=>foo }); let foo = 1n; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.umd.js index 582e4bd5d47..7bd38c8e7fa 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/export-update/1/output.umd.js @@ -16,10 +16,10 @@ }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, baz: ()=>baz, bazbar: ()=>baz, - foo: ()=>foo, foobar: ()=>foo }); let foo = 1n; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.amd.js index bb6d1c36c64..50e40c5b3a9 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.cjs index 3be033c4b0e..65dad4a632a 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.cjs @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = exports.Cachier = void 0; +exports.Cachier = exports.default = void 0; function _export(target, all) { for(var name in all)Object.defineProperty(target, name, { enumerable: true, @@ -10,8 +10,8 @@ function _export(target, all) { }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.umd.js index 0cc140aeb20..f718546e542 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-default-11/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.amd.js index 1f7634c7b71..a0e0502b971 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.amd.js @@ -13,12 +13,12 @@ define([ }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.cjs index e6ed32422cf..934b207088f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.cjs @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.y = exports.x = exports.f4 = exports.f3 = exports.f2 = exports.f1 = void 0; +exports.f4 = exports.f3 = exports.f2 = exports.f1 = exports.y = exports.x = void 0; function _export(target, all) { for(var name in all)Object.defineProperty(target, name, { enumerable: true, @@ -10,12 +10,12 @@ function _export(target, all) { }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.umd.js index da9485c7bb3..2f9a4c6a48f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/export-destructured/output.umd.js @@ -16,12 +16,12 @@ }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.amd.js index 1c7e58eae88..e1d010e8a5f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.amd.js @@ -13,9 +13,9 @@ define([ }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.cjs index c77f898ac49..647bca49219 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.cjs @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo9 = exports.foo8 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.foo2 = exports.foo = exports.bar = void 0; +exports.foo9 = exports.foo8 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.bar = exports.foo2 = exports.foo = void 0; function _export(target, all) { for(var name in all)Object.defineProperty(target, name, { enumerable: true, @@ -10,9 +10,9 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.umd.js index a8d2f9a9329..7f1084940d5 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/exports-variable/output.umd.js @@ -16,9 +16,9 @@ }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.amd.js index a881a2c8532..5bfc2c43ce7 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.amd.js @@ -14,8 +14,8 @@ define([ }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.cjs index c649f0560b0..433e0cff83a 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.cjs @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.nextOdd = exports.isOdd = void 0; +exports.isOdd = exports.nextOdd = void 0; function _export(target, all) { for(var name in all)Object.defineProperty(target, name, { enumerable: true, @@ -10,8 +10,8 @@ function _export(target, all) { }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); const _evens = require("./evens"); function nextOdd(n) { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.umd.js index 4a205f60b75..679e9f98f4e 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/hoist-function-exports/output.umd.js @@ -17,8 +17,8 @@ }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.amd.js index e3164989721..6fa796cc5d8 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.amd.js @@ -13,11 +13,11 @@ define([ }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.cjs index b1cd5a0b226..7667c3454c6 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.cjs @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.test = exports.f = exports.e = exports.c = exports.a = void 0; +exports.f = exports.e = exports.c = exports.a = exports.test = void 0; function _export(target, all) { for(var name in all)Object.defineProperty(target, name, { enumerable: true, @@ -10,11 +10,11 @@ function _export(target, all) { }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.umd.js index 40c8331b597..ebc90999f7f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop-node/remap/output.umd.js @@ -16,11 +16,11 @@ }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.amd.js index bb6d1c36c64..50e40c5b3a9 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.cjs index 8b94a80d296..7e7ef460699 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.umd.js index 0cc140aeb20..f718546e542 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-default-11/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - Cachier: ()=>Cachier, - default: ()=>_default + default: ()=>_default, + Cachier: ()=>Cachier }); var _default = new Cachier(); function Cachier(databaseName) {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.amd.js index 1f7634c7b71..a0e0502b971 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.amd.js @@ -13,12 +13,12 @@ define([ }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.cjs index 87e83277138..9ea97944cd7 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.cjs @@ -9,12 +9,12 @@ function _export(target, all) { }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.umd.js index da9485c7bb3..2f9a4c6a48f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/export-destructured/output.umd.js @@ -16,12 +16,12 @@ }); } _export(exports, { + x: ()=>x, + y: ()=>y, f1: ()=>f1, f2: ()=>f2, f3: ()=>f3, - f4: ()=>f4, - x: ()=>x, - y: ()=>y + f4: ()=>f4 }); let x = 0; let y = 0; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.amd.js index 1c7e58eae88..e1d010e8a5f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.amd.js @@ -13,9 +13,9 @@ define([ }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.cjs index 890c8221dd9..db1a987ec8b 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.cjs @@ -9,9 +9,9 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.umd.js index a8d2f9a9329..7f1084940d5 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/exports-variable/output.umd.js @@ -16,9 +16,9 @@ }); } _export(exports, { - bar: ()=>bar, foo: ()=>foo, foo2: ()=>foo2, + bar: ()=>bar, foo3: ()=>foo3, foo4: ()=>foo4, foo5: ()=>foo5, diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.amd.js index a881a2c8532..5bfc2c43ce7 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.amd.js @@ -14,8 +14,8 @@ define([ }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.cjs index 4923e2b867c..4219980296a 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); const _evens = require("./evens"); function nextOdd(n) { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.umd.js index 4a205f60b75..679e9f98f4e 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/hoist-function-exports/output.umd.js @@ -17,8 +17,8 @@ }); } _export(exports, { - isOdd: ()=>isOdd, - nextOdd: ()=>nextOdd + nextOdd: ()=>nextOdd, + isOdd: ()=>isOdd }); function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.amd.js index e3164989721..6fa796cc5d8 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.amd.js @@ -13,11 +13,11 @@ define([ }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.cjs index d558fa46863..c01133a6ba1 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.cjs @@ -9,11 +9,11 @@ function _export(target, all) { }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.umd.js index 40c8331b597..ebc90999f7f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/interop/remap/output.umd.js @@ -16,11 +16,11 @@ }); } _export(exports, { + test: ()=>test, a: ()=>a, c: ()=>b, e: ()=>d, - f: ()=>d, - test: ()=>test + f: ()=>d }); var test = 2; test = 5; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.amd.js index e964f35dde9..ff2ab82ff32 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.amd.js @@ -13,12 +13,12 @@ define([ }); } _export(exports, { - addOne: ()=>addOne, - errors: ()=>errors, noassign: ()=>noassign, + warn: ()=>warn, + errors: ()=>errors, + addOne: ()=>addOne, someFunc: ()=>someFunc, - test: ()=>test, - warn: ()=>warn + test: ()=>test }); function log() { console.log("unexported"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.cjs index 3fd13776d6d..5d2f48ee00e 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.cjs @@ -9,12 +9,12 @@ function _export(target, all) { }); } _export(exports, { - addOne: ()=>addOne, - errors: ()=>errors, noassign: ()=>noassign, + warn: ()=>warn, + errors: ()=>errors, + addOne: ()=>addOne, someFunc: ()=>someFunc, - test: ()=>test, - warn: ()=>warn + test: ()=>test }); function log() { console.log("unexported"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.umd.js index ba70520c8be..0c1fab338d1 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2549/output.umd.js @@ -16,12 +16,12 @@ }); } _export(exports, { - addOne: ()=>addOne, - errors: ()=>errors, noassign: ()=>noassign, + warn: ()=>warn, + errors: ()=>errors, + addOne: ()=>addOne, someFunc: ()=>someFunc, - test: ()=>test, - warn: ()=>warn + test: ()=>test }); function log() { console.log("unexported"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.amd.js index 3773eba4bb1..93420e2f33c 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.amd.js @@ -14,8 +14,8 @@ define([ } _export(exports, { default: ()=>someCall, - test: ()=>test, - warn: ()=>warn + warn: ()=>warn, + test: ()=>test }); function someCall() { throw new Error("this should not be called"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.cjs index 93eb482b92b..aa665a51dd7 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.cjs @@ -10,8 +10,8 @@ function _export(target, all) { } _export(exports, { default: ()=>someCall, - test: ()=>test, - warn: ()=>warn + warn: ()=>warn, + test: ()=>test }); function someCall() { throw new Error("this should not be called"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.umd.js index fbe1104ba8d..fe025b420d8 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-2678/output.umd.js @@ -17,8 +17,8 @@ } _export(exports, { default: ()=>someCall, - test: ()=>test, - warn: ()=>warn + warn: ()=>warn, + test: ()=>test }); function someCall() { throw new Error("this should not be called"); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.amd.js index 4a180332342..be4503b2e1c 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.amd.js @@ -13,11 +13,11 @@ define([ }); } _export(exports, { - bar: ()=>bar, - bar2: ()=>bar, default: ()=>_default, - foo: ()=>foo, - foo1: ()=>foo + bar: ()=>bar, + foo1: ()=>foo, + bar2: ()=>bar, + foo: ()=>foo }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.cjs index d764a01863a..3719cc44ade 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.cjs @@ -9,11 +9,11 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, - bar2: ()=>bar, default: ()=>_default, - foo: ()=>foo, - foo1: ()=>foo + bar: ()=>bar, + foo1: ()=>foo, + bar2: ()=>bar, + foo: ()=>foo }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.umd.js index 972d68579a6..dc818ad486c 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/2/output.umd.js @@ -16,11 +16,11 @@ }); } _export(exports, { - bar: ()=>bar, - bar2: ()=>bar, default: ()=>_default, - foo: ()=>foo, - foo1: ()=>foo + bar: ()=>bar, + foo1: ()=>foo, + bar2: ()=>bar, + foo: ()=>foo }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.amd.js index 5af61d127ce..8070a935cff 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.amd.js @@ -14,10 +14,10 @@ define([ } _export(exports, { bar: ()=>bar, + foo1: ()=>foo, bar2: ()=>bar, - default: ()=>bar, foo: ()=>foo, - foo1: ()=>foo + default: ()=>bar }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.cjs index 852ad38a1bf..becfd298a2b 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.cjs @@ -10,10 +10,10 @@ function _export(target, all) { } _export(exports, { bar: ()=>bar, + foo1: ()=>foo, bar2: ()=>bar, - default: ()=>bar, foo: ()=>foo, - foo1: ()=>foo + default: ()=>bar }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.umd.js index 13d07a5437e..d2909f0b7e6 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/3/output.umd.js @@ -17,10 +17,10 @@ } _export(exports, { bar: ()=>bar, + foo1: ()=>foo, bar2: ()=>bar, - default: ()=>bar, foo: ()=>foo, - foo1: ()=>foo + default: ()=>bar }); const foo = 1; let bar = 2; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.amd.js index 3eaa4aebb7d..bd45cb12ccf 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; function foo() {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.cjs index 9f954238c9a..0c5e0f3ff71 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; function foo() {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.umd.js index a7c9c55b957..94e651c6360 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/4/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; function foo() {} diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.amd.js index 789a5b7df81..c2ef2ad3ffd 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; class foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.cjs index 7e74309d45a..4723d10eb4a 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; class foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.umd.js index 7e78f4b904a..80f9ee093ae 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3439/5/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>foo, - default: ()=>foo + default: ()=>foo, + bar: ()=>foo }); foo = 1; class foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.amd.js index 8bff5f38269..8e904bdc3ed 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.amd.js @@ -14,8 +14,8 @@ define([ }); } _export(exports, { - byID: ()=>byID, - get: ()=>_get + get: ()=>_get, + byID: ()=>byID }); _get = _interopRequireWildcard(_get); const byID = (id)=>{ diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.cjs index 2657ad3a08d..e3b65494c62 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - byID: ()=>byID, - get: ()=>_get + get: ()=>_get, + byID: ()=>byID }); const _get = _interopRequireWildcard(require("./get")); const byID = (id)=>{ diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.umd.js index 28cece8a350..7c6296fb376 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-3732/output.umd.js @@ -17,8 +17,8 @@ }); } _export(exports, { - byID: ()=>byID, - get: ()=>_get + get: ()=>_get, + byID: ()=>byID }); _get = _interopRequireWildcard(_get); const byID = (id)=>{ diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.amd.ts b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.amd.ts index 0a1f8fb2679..102aaa0bcb0 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.amd.ts +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.amd.ts @@ -17,11 +17,11 @@ define([ }); } _export(exports, { - breakpoints: ()=>breakpoints, - clsx: ()=>_css.cx, - cx: ()=>_css.cx, default: ()=>_default, - keyframes: ()=>_css.keyframes + cx: ()=>_css.cx, + clsx: ()=>_css.cx, + keyframes: ()=>_css.keyframes, + breakpoints: ()=>breakpoints }); _styled = _interopRequireDefault(_styled); interface IStyledProp { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.cts b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.cts index 9a3acea91ec..86466dee966 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.cts +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.cts @@ -9,11 +9,11 @@ function _export(target, all) { }); } _export(exports, { - breakpoints: ()=>breakpoints, - clsx: ()=>_css.cx, - cx: ()=>_css.cx, default: ()=>_default, - keyframes: ()=>_css.keyframes + cx: ()=>_css.cx, + clsx: ()=>_css.cx, + keyframes: ()=>_css.keyframes, + breakpoints: ()=>breakpoints }); require("."); const _styled = _interopRequireDefault(require("@emotion/styled")); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.umd.ts b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.umd.ts index ea301c2e65a..2f5d3c69701 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.umd.ts +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-4456/1/output.umd.ts @@ -20,11 +20,11 @@ }); } _export(exports, { - breakpoints: ()=>breakpoints, - clsx: ()=>_css.cx, - cx: ()=>_css.cx, default: ()=>_default, - keyframes: ()=>_css.keyframes + cx: ()=>_css.cx, + clsx: ()=>_css.cx, + keyframes: ()=>_css.keyframes, + breakpoints: ()=>breakpoints }); _styled = _interopRequireDefault(_styled); interface IStyledProp { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.amd.js index b6492978221..c1d89b13c72 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - Foo: ()=>Foo, default: ()=>_default, + Foo: ()=>Foo, foo: ()=>foo }); class Foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.cjs index e1659ff95ea..e49f8644305 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - Foo: ()=>Foo, default: ()=>_default, + Foo: ()=>Foo, foo: ()=>foo }); class Foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.umd.js index 30e99412ea5..ab464e49101 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/issue-5063/2/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - Foo: ()=>Foo, default: ()=>_default, + Foo: ()=>Foo, foo: ()=>foo }); class Foo { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.amd.js index c68cf374716..6e08fdd6e71 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.amd.js @@ -14,8 +14,8 @@ define([ }); } _export(exports, { - Foo: ()=>_moduleWithGetter.default, - baz: ()=>_moduleWithGetter.baz + baz: ()=>_moduleWithGetter.baz, + Foo: ()=>_moduleWithGetter.default }); _moduleWithGetter = _interopRequireWildcard(_moduleWithGetter); }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.cjs index 86dbe6fde45..0249b0614b6 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.cjs @@ -9,7 +9,7 @@ function _export(target, all) { }); } _export(exports, { - Foo: ()=>_moduleWithGetter.default, - baz: ()=>_moduleWithGetter.baz + baz: ()=>_moduleWithGetter.baz, + Foo: ()=>_moduleWithGetter.default }); const _moduleWithGetter = _interopRequireWildcard(require("./moduleWithGetter")); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.umd.js index d7607c8603e..e2b1be0e399 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/misc/copy-getters-setters/output.umd.js @@ -17,8 +17,8 @@ }); } _export(exports, { - Foo: ()=>_moduleWithGetter.default, - baz: ()=>_moduleWithGetter.baz + baz: ()=>_moduleWithGetter.baz, + Foo: ()=>_moduleWithGetter.default }); _moduleWithGetter = _interopRequireWildcard(_moduleWithGetter); }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.amd.js index 93ea1ab7dee..a4faeebbedb 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar = 2] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.cjs index 565afdac1c3..14ad89ebeb1 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.cjs @@ -9,7 +9,7 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar = 2] = []; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.umd.js index af40c55d2b9..6e9d61dff83 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-default-params/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar = 2] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.amd.js index 5d8f946276e..c6c0474b0dc 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.amd.js @@ -13,9 +13,9 @@ define([ }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, - baz: ()=>baz, - foo: ()=>foo + baz: ()=>baz }); const [foo, bar, ...baz] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.cjs index 6276e9836f0..19960cb2e46 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, - baz: ()=>baz, - foo: ()=>foo + baz: ()=>baz }); const [foo, bar, ...baz] = []; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.umd.js index 8eaeecd7ed0..96574a4469b 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array-rest/output.umd.js @@ -16,9 +16,9 @@ }); } _export(exports, { + foo: ()=>foo, bar: ()=>bar, - baz: ()=>baz, - foo: ()=>foo + baz: ()=>baz }); const [foo, bar, ...baz] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.amd.js index d4ef06eaab7..3f7855c90ea 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.cjs index 49a627f99fd..fa415d130da 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.cjs @@ -9,7 +9,7 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar] = []; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.umd.js index b9cd4e52ffe..3a1d90fea29 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-array/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const [foo, bar] = []; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.amd.js index acbb19ef091..5628ce1c579 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , bar =1 } = {}; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.cjs index 411f37a728f..e9d0dd2782b 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.cjs @@ -9,7 +9,7 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , bar =1 } = {}; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.umd.js index 2b8b0423c15..1d3b820fabc 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-default-params/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , bar =1 } = {}; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.amd.js index 2e187d53f3b..cd183000a6d 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , ...bar } = {}; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.cjs index 34f1bfd3729..940e8aa0346 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.cjs @@ -9,7 +9,7 @@ function _export(target, all) { }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , ...bar } = {}; diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.umd.js index 5b46fa5b2ea..a75126bc8d8 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/strict/export-const/destructuring-object-rest/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - bar: ()=>bar, - foo: ()=>foo + foo: ()=>foo, + bar: ()=>bar }); const { foo , ...bar } = {}; }); diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.amd.js index c1ad873ca6e..c748c3ea746 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.cjs index 35c2c5387fc..5152a5f8672 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.umd.js index b1d6b04a543..1b79f7fe21f 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/negative-suffix/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.amd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.amd.js index 027066b79a4..35cf844a544 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.amd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.amd.js @@ -13,8 +13,8 @@ define([ }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.cjs b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.cjs index 844e4a20323..c61f3df70ab 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.cjs +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.cjs @@ -9,8 +9,8 @@ function _export(target, all) { }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() { diff --git a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.umd.js b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.umd.js index 5c11932fe3e..efa8c2f7d17 100644 --- a/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.umd.js +++ b/crates/swc_ecma_transforms_module/tests/fixture/common/update-expression/positive-suffix/output.umd.js @@ -16,8 +16,8 @@ }); } _export(exports, { - diff: ()=>diff, - diffLevel: ()=>diffLevel + diffLevel: ()=>diffLevel, + diff: ()=>diff }); let diffLevel = 0; function diff() {