@postxl/generator 1.0.11 → 1.1.0
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.
- package/dist/utils/sync.js +1 -1
- package/package.json +3 -3
package/dist/utils/sync.js
CHANGED
|
@@ -123,7 +123,7 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
|
|
|
123
123
|
const files = await getFilesStates({ vfs, lockFilePath, diskFilePath });
|
|
124
124
|
// Check for unresolved merge conflicts before writing any files
|
|
125
125
|
const filesWithConflicts = findFilesWithMergeConflicts(files);
|
|
126
|
-
if (filesWithConflicts.length > 0) {
|
|
126
|
+
if (filesWithConflicts.length > 0 && !force) {
|
|
127
127
|
return {
|
|
128
128
|
success: false,
|
|
129
129
|
error: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@postxl/generator",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Core package that orchestrates the code generation of a PXL project",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"module": "./dist/index.js",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"jszip": "3.10.1",
|
|
47
47
|
"minimatch": "^10.1.1",
|
|
48
48
|
"p-limit": "3.1.0",
|
|
49
|
-
"@postxl/schema": "^1.0
|
|
50
|
-
"@postxl/utils": "^1.0
|
|
49
|
+
"@postxl/schema": "^1.1.0",
|
|
50
|
+
"@postxl/utils": "^1.1.0"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@types/diff": "8.0.0"
|