prisma-laravel-migrate 0.0.49 → 0.0.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/diff-writer/writer.js +1 -1
  2. package/package.json +1 -1
package/dist/diff-writer/writer.js CHANGED
@@ -46,7 +46,7 @@ export function writeWithMerge(filePath, theirs, overwrite = true) {
46
46
  const mergedLines = diff3.merge(mine.split(/\r?\n/), (base ?? "").split(/\r?\n/), theirs.split(/\r?\n/), { stringSeparator: "\n" }).result;
47
47
  const mergedText = mergedLines.join("\n");
48
48
  /* conflict marker detection */
49
- if (/^<{7}|^={7}|^>{7}/m.test(mergedText)) {
49
+ if (/^(<{7}|={7}|>{7})/gm.test(mergedText)) {
50
50
  console.warn(`⚠️ Merge conflicts in ${path.relative(process.cwd(), filePath)} ` +
51
51
  "— resolve <<< >>> markers.");
52
52
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prisma-laravel-migrate",
3
- "version": "0.0.49",
3
+ "version": "0.0.51",
4
4
  "description": "Generate laravel migrations and/or models using prisma files",
5
5
  "bin": {
6
6
  "prisma-laravel-migrations": "./dist/cli/migrator.index.js",