${input.x}
<${input.x}>
Hi
-
+
- ${x}
+ ${x}
<${x} ...{
- a: 1
- }/>
+ a: 1
+ }/>
diff --git a/test/migrate/fixtures/layout-use/snapshot-expected.marko b/test/migrate/fixtures/layout-use/snapshot-expected.marko
index 6b20b2e4ee..8ad521b9e9 100644
--- a/test/migrate/fixtures/layout-use/snapshot-expected.marko
+++ b/test/migrate/fixtures/layout-use/snapshot-expected.marko
@@ -8,29 +8,29 @@ import ExampleD_1 from "./example-d.marko"
<${ExampleA}>
-
+
<${ExampleB} ...{
- a: 1
- } b=2>
+ a: 1
+} b=2>
-
+
<${ExampleC}>
-
+
$ const ExampleD = undefined;
<${ExampleD_1}>
-
+
<${input.x}>
-
+
<${input.x} ...{
- a: 1
- } b=2>
+ a: 1
+} b=2>
-
+
diff --git a/test/migrate/fixtures/w-bind-prompt-y/prompts.js b/test/migrate/fixtures/w-bind-prompt-y/prompts.js
index 56ffad4053..ba3af6824d 100644
--- a/test/migrate/fixtures/w-bind-prompt-y/prompts.js
+++ b/test/migrate/fixtures/w-bind-prompt-y/prompts.js
@@ -3,5 +3,10 @@ module.exports = [
question:
"A widget file was discovered, would you like to migrate that as well?\nNote: widget migrations are not 100% safe and should be tested after migration.",
answer: true
+ },
+ {
+ question:
+ "Would you like to rename the component file?\nNote: Marko 4 automatically discovers these files based on the naming convention, you may be able to remove them from a browser.json file after this.",
+ answer: true
}
];
diff --git a/test/migrate/fixtures/w-bind-prompt-y/updated-path-snapshot-expected.json b/test/migrate/fixtures/w-bind-prompt-y/updated-path-snapshot-expected.json
new file mode 100644
index 0000000000..c50ee09435
--- /dev/null
+++ b/test/migrate/fixtures/w-bind-prompt-y/updated-path-snapshot-expected.json
@@ -0,0 +1,10 @@
+{
+ "fileNames": {
+ "test/migrate/fixtures/w-bind-prompt-y/template.marko": "test/migrate/fixtures/w-bind-prompt-y/index.marko",
+ "test/migrate/fixtures/w-bind-prompt-y/index.js": "test/migrate/fixtures/w-bind-prompt-y/component.js"
+ },
+ "dependentPaths": {
+ "test/migrate/fixtures/w-bind-prompt-y/template.marko": "test/migrate/fixtures/w-bind-prompt-y/index.marko",
+ "test/migrate/fixtures/w-bind-prompt-y/index.js": "test/migrate/fixtures/w-bind-prompt-y/index.marko"
+ }
+}
\ No newline at end of file
diff --git a/test/migrate/fixtures/w-body-attr-val/snapshot-expected.marko b/test/migrate/fixtures/w-body-attr-val/snapshot-expected.marko
index da2b1a0f30..11bf8337d3 100644
--- a/test/migrate/fixtures/w-body-attr-val/snapshot-expected.marko
+++ b/test/migrate/fixtures/w-body-attr-val/snapshot-expected.marko
@@ -1,13 +1,21 @@
-
+
<${input.title}/>
${input.title}
-
+
<${input.a ? input.b : input.c}/>
${input.a ? input.b : input.c}
diff --git a/test/migrate/fixtures/widget-get-template-data/prompts.js b/test/migrate/fixtures/widget-get-template-data/prompts.js
index 56ffad4053..785cc2c515 100644
--- a/test/migrate/fixtures/widget-get-template-data/prompts.js
+++ b/test/migrate/fixtures/widget-get-template-data/prompts.js
@@ -3,5 +3,10 @@ module.exports = [
question:
"A widget file was discovered, would you like to migrate that as well?\nNote: widget migrations are not 100% safe and should be tested after migration.",
answer: true
+ },
+ {
+ question:
+ "Would you like to rename the component file?\nNote: Marko 4 automatically discovers these files based on the naming convention, you may be able to remove them from a browser.json file after this.",
+ answer: false
}
];
diff --git a/test/migrate/index.test.js b/test/migrate/index.test.js
index 51831bc2d0..207f407961 100644
--- a/test/migrate/index.test.js
+++ b/test/migrate/index.test.js
@@ -41,7 +41,7 @@ if (!/^v6\..*/.test(process.version)) {
return currentPrompt.answer;
}
}).then(outputs => {
- const byExtension = Object.entries(outputs)
+ const byExtension = Object.entries(outputs.fileContents)
.sort(([a], [b]) => a.localeCompare(b))
.reduce((r, [file, source]) => {
const ext = path.extname(file);
@@ -55,6 +55,29 @@ if (!/^v6\..*/.test(process.version)) {
return r;
}, {});
+ if (
+ !isEmpty(outputs.fileNames) ||
+ !isEmpty(outputs.dependentPaths)
+ ) {
+ snapshot(
+ JSON.stringify(
+ {
+ fileNames: outputs.fileNames,
+ dependentPaths: outputs.dependentPaths
+ },
+ null,
+ 2
+ ).replace(
+ /"(\/[^"]+)"/g,
+ (_, file) => `"${path.relative(CWD, file)}"`
+ ),
+ {
+ ext: ".json",
+ name: "updated-path-snapshot"
+ }
+ );
+ }
+
Object.entries(byExtension).forEach(([ext, files]) => {
snapshot(files.join("\n\n"), {
ext,
@@ -77,3 +100,11 @@ function toComment(ext, str) {
return `# ${str}`;
}
}
+
+function isEmpty(obj) {
+ for (const _ in obj) {
+ return false;
+ }
+
+ return true;
+}