Skip to content

Commit f906d04

Browse files
committed
fix(conflict): rebase conflict resolution onto exact MarketSquare main
Previous attempt manually incorporated upstream ESLint 10 changes but GitHub's 3-way merge algorithm still detected conflicts in the three files because the textual diffs overlapped. This commit resolves the conflict properly by starting from the exact MarketSquare main state for every file changed by the upstream "bump eslint 9→10" + "renew NodeJs linting" commits, then layering only our Electron additions on top: - node/eslint.config.mjs: use upstream's exact content (no trailing newline) - node/playwright-wrapper/playwright-state.ts: upstream lint-fixed + electron - package-lock.json: upstream ESLint 10 packages + electron packages only - package.json: upstream devDeps + electron ^35.0.0 - node/playwright-wrapper/grpc-service.ts: upstream + 3 electron RPC bindings - .gitattributes, node/.prettierrc.js, node/build.wrapper.js, node/playwright-wrapper/static/selector-finder.js, tasks.py: adopted upstream verbatim (prettier reformatting, lint fixes) ESLint 10 + mypy + robocop all pass clean. https://claude.ai/code/session_011ivCRcjRk93AMkjLwsbquz
1 parent 1ecfe43 commit f906d04

8 files changed

Lines changed: 2156 additions & 1013 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
* text=auto eol=lf
12
*_pb2.py eol=lf
23
*_pb*.[tj]s eol=lf

node/.prettierrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
semi: true,
3-
trailingComma: "all",
3+
trailingComma: 'all',
44
singleQuote: true,
55
printWidth: 120,
6-
tabWidth: 4
6+
tabWidth: 4,
7+
endOfLine: 'lf',
78
};

node/build.wrapper.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
const esbuild = require('esbuild');
33
const { nodeExternalsPlugin } = require('esbuild-node-externals');
44

5-
esbuild.build(
6-
{
7-
logLevel: "info",
8-
entryPoints: ["./node/playwright-wrapper/index.ts"],
9-
bundle: true,
10-
platform: "node",
11-
outfile: "./Browser/wrapper/index.js",
12-
plugins: [nodeExternalsPlugin({
13-
// Allow UUID to be bundled instead of external
14-
// Needed when building with pkg
15-
allowList: ['uuid']
16-
})],
17-
external: [
18-
'playwright-core/*',
19-
],
20-
}
21-
).catch(() => process.exit(1));
5+
esbuild
6+
.build({
7+
logLevel: 'info',
8+
entryPoints: ['./node/playwright-wrapper/index.ts'],
9+
bundle: true,
10+
platform: 'node',
11+
outfile: './Browser/wrapper/index.js',
12+
plugins: [
13+
nodeExternalsPlugin({
14+
// Allow UUID to be bundled instead of external
15+
// Needed when building with pkg
16+
allowList: ['uuid'],
17+
}),
18+
],
19+
external: ['playwright-core/*'],
20+
})
21+
.catch(() => process.exit(1));

node/eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ export default tseslint.config(
5252
'@typescript-eslint/no-require-imports': 'off',
5353
},
5454
},
55-
);
55+
);

0 commit comments

Comments
 (0)