diff --git a/__tests__/all.test.ts b/__tests__/all.test.ts index dcf461c..af3c1e4 100644 --- a/__tests__/all.test.ts +++ b/__tests__/all.test.ts @@ -2446,14 +2446,14 @@ describe('htmlbars-inline-precompile', function () { let p = new Preprocessor(); - let transformed = await transform( - p.process( - `import HelloWorld from 'somewhere'; - const MyComponent = ; - ` - ) + const { code: preTransformed } = p.process( + `import HelloWorld from 'somewhere'; + const MyComponent = ; + ` ); + let transformed = await transform(preTransformed); + expect(transformed).equalCode(` import HelloWorld from "somewhere"; import { precompileTemplate } from "@ember/template-compilation"; @@ -2476,16 +2476,16 @@ describe('htmlbars-inline-precompile', function () { let p = new Preprocessor(); - let transformed = await transform( - p.process( - ` - export function example() { - return ; - } - ` - ) + const { code: preTransformed } = p.process( + ` + export function example() { + return ; + } + ` ); + let transformed = await transform(preTransformed); + expect(transformed).equalCode(` import { precompileTemplate } from "@ember/template-compilation"; import { setComponentTemplate } from "@ember/component"; @@ -2509,16 +2509,16 @@ describe('htmlbars-inline-precompile', function () { let p = new Preprocessor(); - let transformed = await transform( - p.process( - `import HelloWorld from 'somewhere'; - export default class { - - } - ` - ) + const { code: preTransformed } = p.process( + `import HelloWorld from 'somewhere'; + export default class { + + } + ` ); + let transformed = await transform(preTransformed); + expect(transformed).equalCode(` import HelloWorld from "somewhere"; import { precompileTemplate } from "@ember/template-compilation"; @@ -2544,17 +2544,17 @@ describe('htmlbars-inline-precompile', function () { let p = new Preprocessor(); - let transformed = await transform( - p.process( - `import HelloWorld from 'somewhere'; - export default class { - h = HelloWorld; - - } - ` - ) + const { code: preTransformed } = p.process( + `import HelloWorld from 'somewhere'; + export default class { + h = HelloWorld; + + } + ` ); + let transformed = await transform(preTransformed); + expect(transformed).equalCode(` import HelloWorld from "somewhere"; import { precompileTemplate } from "@ember/template-compilation"; diff --git a/package.json b/package.json index 8eee1a7..cfa9d90 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@typescript-eslint/parser": "^7.14.1", "code-equality-assertions": "^1.0.1", "common-tags": "^1.8.0", - "content-tag": "^0.1.0", + "content-tag": "^4.1.0", "cross-env": "^7.0.3", "ember-source": "^6.4.0-beta.1", "eslint": "^8.57.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c716c5f..4af3c21 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@glimmer/syntax': specifier: '>= 0.94.9' - version: 0.94.9 + version: 0.95.0 babel-import-util: specifier: ^3.0.0 version: 3.0.1 @@ -64,8 +64,8 @@ importers: specifier: ^1.8.0 version: 1.8.2 content-tag: - specifier: ^0.1.0 - version: 0.1.0 + specifier: ^4.1.0 + version: 4.1.0 cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -887,6 +887,9 @@ packages: '@glimmer/syntax@0.94.9': resolution: {integrity: sha512-OBw8DqMzKO4LX4kJBhwfTUqtpbd7O9amQXNTfb1aS7pufio5Vu5Qi6mRTfdFj6RyJ//aSI/l0kxWt6beYW0Apg==} + '@glimmer/syntax@0.95.0': + resolution: {integrity: sha512-W/PHdODnpONsXjbbdY9nedgIHpglMfOzncf/moLVrKIcCfeQhw2vG07Rs/YW8KeJCgJRCLkQsi+Ix7XvrurGAg==} + '@glimmer/util@0.94.8': resolution: {integrity: sha512-HfCKeZ74clF9BsPDBOqK/yRNa/ke6niXFPM6zRn9OVYw+ZAidLs7V8He/xljUHlLRL322kaZZY8XxRW7ALEwyg==} @@ -906,6 +909,10 @@ packages: '@handlebars/parser@2.0.0': resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} + '@handlebars/parser@2.2.2': + resolution: {integrity: sha512-n/SZW+12rwikx/f8YcSv9JCi5p9vn1Bnts9ZtVvfErG4h0gbjHI1H1ZMhVUnaOC7yzFc6PtsCKIK8XeTnL90Gw==} + engines: {node: ^18 || ^20 || ^22 || >=24} + '@humanwhocodes/config-array@0.13.0': resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} engines: {node: '>=10.10.0'} @@ -938,9 +945,6 @@ packages: resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.5.0': - resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} @@ -1867,7 +1871,7 @@ packages: engines: {node: '>=4.0.0'} concat-map@0.0.1: - resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} + resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -1876,8 +1880,8 @@ packages: resolution: {integrity: sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==} engines: {node: '>=8'} - content-tag@0.1.0: - resolution: {integrity: sha512-r5cLLbScxVhXDyKu2ZJcGGueoU3D0qIDwFpiCOCiCTFpVKqwE6KSV0ZtQCKnuaw++oqFPiu1CsxHYt79kedAQg==} + content-tag@4.1.0: + resolution: {integrity: sha512-On6gUuvI1l5MScHO+Xbwjeq1Pk9H6HOipDWkzqGGUGmKpq6K5TRmQuCl1LGSHbdIo2l+lSsgLKrLgCl5kKYA+A==} convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} @@ -3011,7 +3015,7 @@ packages: hasBin: true json-buffer@3.0.0: - resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=} + resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==} json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} @@ -4599,7 +4603,7 @@ packages: engines: {node: '>=8'} xregexp@2.0.0: - resolution: {integrity: sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=} + resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==} y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} @@ -5591,6 +5595,14 @@ snapshots: '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 + '@glimmer/syntax@0.95.0': + dependencies: + '@glimmer/interfaces': 0.94.6 + '@glimmer/util': 0.94.8 + '@glimmer/wire-format': 0.94.8 + '@handlebars/parser': 2.2.2 + simple-html-tokenizer: 0.5.11 + '@glimmer/util@0.94.8': dependencies: '@glimmer/interfaces': 0.94.6 @@ -5616,6 +5628,8 @@ snapshots: '@handlebars/parser@2.0.0': {} + '@handlebars/parser@2.2.2': {} + '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 @@ -5642,21 +5656,19 @@ snapshots: '@jridgewell/gen-mapping@0.3.8': dependencies: '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/sourcemap-codec': 1.5.5 '@jridgewell/trace-mapping': 0.3.25 '@jridgewell/resolve-uri@3.1.2': {} '@jridgewell/set-array@1.2.1': {} - '@jridgewell/sourcemap-codec@1.5.0': {} - '@jridgewell/sourcemap-codec@1.5.5': {} '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/sourcemap-codec': 1.5.5 '@manypkg/find-root@2.2.3': dependencies: @@ -6190,7 +6202,7 @@ snapshots: agent-base@6.0.2: dependencies: - debug: 4.3.4 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -6750,7 +6762,7 @@ snapshots: write-file-atomic: 3.0.3 xdg-basedir: 4.0.0 - content-tag@0.1.0: {} + content-tag@4.1.0: {} convert-source-map@2.0.0: {} @@ -7598,7 +7610,7 @@ snapshots: dependencies: '@tootallnate/once': 1.1.2 data-uri-to-buffer: 3.0.1 - debug: 4.3.4 + debug: 4.4.0 file-uri-to-path: 2.0.0 fs-extra: 8.1.0 ftp: 0.3.10 @@ -7808,7 +7820,7 @@ snapshots: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -7822,7 +7834,7 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -8639,7 +8651,7 @@ snapshots: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.4.0 get-uri: 3.0.2 http-proxy-agent: 4.0.1 https-proxy-agent: 5.0.1 @@ -8832,7 +8844,7 @@ snapshots: proxy-agent@5.0.0: dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.4.0 http-proxy-agent: 4.0.1 https-proxy-agent: 5.0.1 lru-cache: 5.1.1 @@ -9323,7 +9335,7 @@ snapshots: socks-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.4.0 socks: 2.8.4 transitivePeerDependencies: - supports-color