rivet-design 0.1.7 → 0.1.9
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/index.d.ts.map +1 -1
- package/dist/index.js +1 -3
- package/dist/index.js.map +1 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +24 -3
- package/dist/server.js.map +1 -1
- package/dist/services/LocalGitService.d.ts +2 -2
- package/dist/services/LocalGitService.d.ts.map +1 -1
- package/dist/services/LocalGitService.js +78 -86
- package/dist/services/LocalGitService.js.map +1 -1
- package/dist/services/ScriptInjectionService.d.ts +3 -3
- package/dist/services/ScriptInjectionService.d.ts.map +1 -1
- package/dist/services/ScriptInjectionService.js +9 -5
- package/dist/services/ScriptInjectionService.js.map +1 -1
- package/dist/services/SessionService.d.ts +3 -0
- package/dist/services/SessionService.d.ts.map +1 -1
- package/dist/services/SessionService.js +11 -4
- package/dist/services/SessionService.js.map +1 -1
- package/package.json +1 -1
- package/src/ui/dist/assets/main-BsNZc4I6.js +108 -0
- package/src/ui/dist/index.html +1 -1
- package/src/ui/dist/assets/main-e65HVD3-.js +0 -108
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,IAAI,GAAU,OAAM,MAAM,EAA0B,KAAG,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,IAAI,GAAU,OAAM,MAAM,EAA0B,KAAG,OAAO,CAAC,IAAI,CA6G/E,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -109,15 +109,13 @@ const main = async (args = process.argv.slice(2)) => {
|
|
|
109
109
|
debugMode: options.debug
|
|
110
110
|
});
|
|
111
111
|
log.debug(`📡 Connecting to project dev server on port ${userDevServerPort}${options.userPort ? ' (user-specified)' : ' (detected)'}`);
|
|
112
|
-
// Inject selection script into user's project
|
|
113
|
-
const scriptInjection = new index_core_1.ScriptInjectionService();
|
|
114
|
-
await scriptInjection.injectScript(process.cwd(), options.rootHtmlPath, rivetPort);
|
|
115
112
|
await (0, server_1.startServer)({
|
|
116
113
|
port: rivetPort,
|
|
117
114
|
userPort: userDevServerPort,
|
|
118
115
|
trackWithGit: options.trackWithGit ?? true,
|
|
119
116
|
framework: project.framework,
|
|
120
117
|
rootHtmlPath: options.rootHtmlPath,
|
|
118
|
+
rivetPort: rivetPort,
|
|
121
119
|
telemetry
|
|
122
120
|
});
|
|
123
121
|
// Open browser automatically unless disabled
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare const DIST_UI_PATH: string;
|
|
|
5
5
|
export type ServerOptions = Omit<CLIOptions, 'help' | 'version' | 'debug'> & {
|
|
6
6
|
framework: Framework;
|
|
7
7
|
telemetry?: TelemetryService;
|
|
8
|
+
rivetPort: number;
|
|
8
9
|
};
|
|
9
10
|
export declare const startServer: (options: ServerOptions) => Promise<void>;
|
|
10
11
|
export default startServer;
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAM/D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAI/D,eAAO,MAAM,YAAY,QAAyC,CAAC;AAEnE,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG;IAC3E,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAKD,eAAO,MAAM,WAAW,GAAU,SAAS,aAAa,KAAG,OAAO,CAAC,IAAI,CA4HtE,CAAC;AAIF,eAAe,WAAW,CAAC"}
|
package/dist/server.js
CHANGED
|
@@ -8,6 +8,7 @@ const express_1 = __importDefault(require("express"));
|
|
|
8
8
|
const cors_1 = __importDefault(require("cors"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const index_core_1 = require("./index-core");
|
|
11
|
+
const ScriptInjectionService_1 = require("./services/ScriptInjectionService");
|
|
11
12
|
const selection_1 = require("./routes/selection");
|
|
12
13
|
const components_1 = require("./routes/components");
|
|
13
14
|
const modifications_1 = require("./routes/modifications");
|
|
@@ -17,10 +18,11 @@ exports.DIST_UI_PATH = path_1.default.join(__dirname, '../src/ui/dist');
|
|
|
17
18
|
const DEFAULT_PORT = 4000;
|
|
18
19
|
const DEFAULT_USER_PORT = 3000;
|
|
19
20
|
const startServer = async (options) => {
|
|
20
|
-
const { port = DEFAULT_PORT, userPort = DEFAULT_USER_PORT, trackWithGit = false, framework = 'nextjs', rootHtmlPath, telemetry, } = options;
|
|
21
|
+
const { port = DEFAULT_PORT, userPort = DEFAULT_USER_PORT, trackWithGit = false, framework = 'nextjs', rootHtmlPath, telemetry, rivetPort, } = options;
|
|
21
22
|
const sessionService = trackWithGit
|
|
22
23
|
? new index_core_1.SessionService(process.cwd(), true)
|
|
23
24
|
: null;
|
|
25
|
+
// Initialize git session FIRST (before script injection)
|
|
24
26
|
if (sessionService) {
|
|
25
27
|
try {
|
|
26
28
|
await sessionService.initializeSession();
|
|
@@ -29,12 +31,31 @@ const startServer = async (options) => {
|
|
|
29
31
|
catch (error) {
|
|
30
32
|
log.warn('Failed to initialize git session, continuing without git tracking:', error);
|
|
31
33
|
}
|
|
32
|
-
|
|
34
|
+
}
|
|
35
|
+
// Inject selection script AFTER git branch is created
|
|
36
|
+
let injectedFilePath;
|
|
37
|
+
try {
|
|
38
|
+
const scriptInjection = new ScriptInjectionService_1.ScriptInjectionService();
|
|
39
|
+
const injectionResult = await scriptInjection.injectScript(process.cwd(), rootHtmlPath, rivetPort);
|
|
40
|
+
if (injectionResult) {
|
|
41
|
+
injectedFilePath = injectionResult;
|
|
42
|
+
log.info(`Selection script injected into: ${injectedFilePath}`);
|
|
43
|
+
// Track the injection path in session service
|
|
44
|
+
if (sessionService) {
|
|
45
|
+
sessionService.setInjectedFilePath(injectedFilePath);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
log.warn('Failed to inject selection script:', error);
|
|
51
|
+
}
|
|
52
|
+
// Setup cleanup on process exit
|
|
53
|
+
if (sessionService) {
|
|
33
54
|
const cleanup = async () => {
|
|
34
55
|
log.info('Server shutting down, cleaning up...');
|
|
35
56
|
// Cleanup session service
|
|
36
57
|
try {
|
|
37
|
-
await sessionService.cleanupSession(framework,
|
|
58
|
+
await sessionService.cleanupSession(framework, injectedFilePath);
|
|
38
59
|
}
|
|
39
60
|
catch (error) {
|
|
40
61
|
log.error('Failed to cleanup session:', error);
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,gDAAwB;AACxB,gDAAwB;AACxB,6CAA4D;AAG5D,kDAA2D;AAC3D,oDAA4D;AAC5D,0DAAkE;AAClE,sCAA+C;AAG/C,MAAM,GAAG,GAAG,IAAA,yBAAY,EAAC,aAAa,CAAC,CAAC;AAE3B,QAAA,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare class LocalGitService {
|
|
|
12
12
|
private getGit;
|
|
13
13
|
configureDefaultIdentity(projectPath: string): Promise<void>;
|
|
14
14
|
createBranch(projectPath: string, branchName: string): Promise<void>;
|
|
15
|
-
commitChange(projectPath: string, change: ChangeRecord, userInfo?: {
|
|
15
|
+
commitChange(projectPath: string, change: ChangeRecord, injectedFilePath?: string, userInfo?: {
|
|
16
16
|
name: string;
|
|
17
17
|
email: string;
|
|
18
18
|
}): Promise<string>;
|
|
@@ -28,6 +28,6 @@ export declare class LocalGitService {
|
|
|
28
28
|
private parseRepoUrl;
|
|
29
29
|
pushBranch(projectPath: string, branchName: string): Promise<void>;
|
|
30
30
|
generatePullRequestUrl(projectPath: string, branchName: string, defaultBranch?: string): Promise<string>;
|
|
31
|
-
private
|
|
31
|
+
private removeSelectionScriptFromContent;
|
|
32
32
|
}
|
|
33
33
|
//# sourceMappingURL=LocalGitService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalGitService.d.ts","sourceRoot":"","sources":["../../src/services/LocalGitService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"LocalGitService.d.ts","sourceRoot":"","sources":["../../src/services/LocalGitService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAIF,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAInD,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM;IAIR,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5D,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CpE,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAoErJ,OAAO,CAAC,qBAAqB;IAgCvB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtD,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAWjG,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkB/D,OAAO,CAAC,YAAY;IA4Bd,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,MAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtH,OAAO,CAAC,gCAAgC;CAKzC"}
|
|
@@ -1,43 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
35
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
6
|
exports.LocalGitService = exports.RIVET_BOT_EMAIL = exports.RIVET_BOT_NAME = void 0;
|
|
37
7
|
const simple_git_1 = require("simple-git");
|
|
38
8
|
const logger_1 = require("../utils/logger");
|
|
9
|
+
const ScriptInjectionService_1 = require("./ScriptInjectionService");
|
|
10
|
+
const fs_1 = __importDefault(require("fs"));
|
|
11
|
+
const path_1 = __importDefault(require("path"));
|
|
39
12
|
const MAX_HEADER_LENGTH = 72;
|
|
40
|
-
const SELECTION_SCRIPT_PATTERN = 'rivet-selection-script';
|
|
41
13
|
exports.RIVET_BOT_NAME = 'Rivet Bot';
|
|
42
14
|
exports.RIVET_BOT_EMAIL = 'noreply@rivet.dev';
|
|
43
15
|
const log = (0, logger_1.createLogger)('LocalGitService');
|
|
@@ -48,10 +20,21 @@ class LocalGitService {
|
|
|
48
20
|
async configureDefaultIdentity(projectPath) {
|
|
49
21
|
const git = this.getGit(projectPath);
|
|
50
22
|
try {
|
|
23
|
+
const config = await git.listConfig();
|
|
24
|
+
const hasUserName = config.all['user.name'];
|
|
25
|
+
const hasUserEmail = config.all['user.email'];
|
|
26
|
+
if (hasUserName && hasUserEmail) {
|
|
27
|
+
log.debug(`Git identity already configured: ${hasUserName} <${hasUserEmail}>`);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
51
30
|
// Set fallback git identity for commits when no user authentication is available
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
31
|
+
if (!hasUserName) {
|
|
32
|
+
await git.addConfig('user.name', exports.RIVET_BOT_NAME);
|
|
33
|
+
}
|
|
34
|
+
if (!hasUserEmail) {
|
|
35
|
+
await git.addConfig('user.email', exports.RIVET_BOT_EMAIL);
|
|
36
|
+
}
|
|
37
|
+
log.info(`Configured Rivet git identity because user identity was not found: ${exports.RIVET_BOT_NAME} <${exports.RIVET_BOT_EMAIL}>`);
|
|
55
38
|
}
|
|
56
39
|
catch (error) {
|
|
57
40
|
log.warn('Failed to configure git identity:', error);
|
|
@@ -59,17 +42,13 @@ class LocalGitService {
|
|
|
59
42
|
}
|
|
60
43
|
async createBranch(projectPath, branchName) {
|
|
61
44
|
const git = this.getGit(projectPath);
|
|
62
|
-
// Check for uncommitted changes
|
|
45
|
+
// Check for uncommitted changes
|
|
63
46
|
const status = await git.status();
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
if (filesToStash.length > 0) {
|
|
70
|
-
log.info(`Stashing ${filesToStash.length} files (excluding selection script changes)`);
|
|
71
|
-
// Stash only specific files, not everything
|
|
72
|
-
for (const file of filesToStash) {
|
|
47
|
+
const allChangedFiles = [...status.modified, ...status.created, ...status.deleted];
|
|
48
|
+
if (allChangedFiles.length > 0) {
|
|
49
|
+
log.info(`Stashing ${allChangedFiles.length} files before creating new branch`);
|
|
50
|
+
// Stash all files - we'll handle script cleaning at commit time
|
|
51
|
+
for (const file of allChangedFiles) {
|
|
73
52
|
await git.add(file);
|
|
74
53
|
}
|
|
75
54
|
await git.stash(['push', '-m', 'Rivet: Stash before new branch creation']);
|
|
@@ -100,7 +79,7 @@ class LocalGitService {
|
|
|
100
79
|
await git.checkoutLocalBranch(branchName);
|
|
101
80
|
log.info(`Created clean branch: ${branchName} from ${defaultBranch}`);
|
|
102
81
|
}
|
|
103
|
-
async commitChange(projectPath, change, userInfo) {
|
|
82
|
+
async commitChange(projectPath, change, injectedFilePath, userInfo) {
|
|
104
83
|
const git = this.getGit(projectPath);
|
|
105
84
|
// Configure git identity if user info provided
|
|
106
85
|
if (userInfo) {
|
|
@@ -108,21 +87,55 @@ class LocalGitService {
|
|
|
108
87
|
await git.addConfig('user.email', userInfo.email);
|
|
109
88
|
log.info(`Configured git identity: ${userInfo.name} <${userInfo.email}>`);
|
|
110
89
|
}
|
|
111
|
-
// Stage only tracked files (excluding selection script changes)
|
|
112
90
|
const status = await git.status();
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
91
|
+
const allChangedFiles = [...status.modified, ...status.created, ...status.deleted];
|
|
92
|
+
if (allChangedFiles.length === 0) {
|
|
93
|
+
log.warn('No files to commit - no changes detected');
|
|
94
|
+
throw new Error('No files available to commit');
|
|
95
|
+
}
|
|
96
|
+
// Clean selection scripts from the injected file (if known) before committing
|
|
97
|
+
let contentWithScript = null;
|
|
98
|
+
if (injectedFilePath && allChangedFiles.includes(injectedFilePath)) {
|
|
99
|
+
try {
|
|
100
|
+
const fullPathWithScript = path_1.default.join(projectPath, injectedFilePath);
|
|
101
|
+
contentWithScript = fs_1.default.readFileSync(fullPathWithScript, 'utf8');
|
|
102
|
+
const contentWithoutScript = this.removeSelectionScriptFromContent(contentWithScript);
|
|
103
|
+
if (contentWithScript !== contentWithoutScript) {
|
|
104
|
+
// Write the content without the script to the file
|
|
105
|
+
fs_1.default.writeFileSync(fullPathWithScript, contentWithoutScript);
|
|
106
|
+
log.debug(`Temporarily cleaned selection script from: ${injectedFilePath}`);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
log.warn(`Failed to clean injection file ${injectedFilePath}:`, error);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
try {
|
|
114
|
+
// Stage all changed files (now cleaned)
|
|
115
|
+
for (const file of allChangedFiles) {
|
|
116
|
+
await git.add(file);
|
|
117
|
+
log.debug(`Staged file: ${file}`);
|
|
118
|
+
}
|
|
119
|
+
// Commit with structured message
|
|
120
|
+
const message = this.generateCommitMessage(change);
|
|
121
|
+
log.info(`Committing with message: ${message.split('\n')[0]}...`);
|
|
122
|
+
const result = await git.commit(message);
|
|
123
|
+
log.info(`Successfully committed ${allChangedFiles.length} files with SHA: ${result.commit}`);
|
|
124
|
+
return result.commit;
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
// Always restore the original content with selection scripts
|
|
128
|
+
if (contentWithScript && injectedFilePath) {
|
|
129
|
+
try {
|
|
130
|
+
const fullPathWithScript = path_1.default.join(projectPath, injectedFilePath);
|
|
131
|
+
fs_1.default.writeFileSync(fullPathWithScript, contentWithScript);
|
|
132
|
+
log.debug(`Restored selection script to: ${injectedFilePath}`);
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
log.warn(`Failed to restore selection script to ${injectedFilePath}:`, error);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
126
139
|
}
|
|
127
140
|
generateCommitMessage(change) {
|
|
128
141
|
const type = change.type === 'css' ? 'style' : (change.type === 'multi-element' ? 'feat' : 'feat');
|
|
@@ -222,30 +235,9 @@ Generated by Rivet Visual Editor`;
|
|
|
222
235
|
const repoInfo = await this.getRepositoryInfo(projectPath);
|
|
223
236
|
return `${repoInfo.baseUrl}/${repoInfo.owner}/${repoInfo.repo}/compare/${defaultBranch}...${branchName}?expand=1`;
|
|
224
237
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
const fs = await Promise.resolve().then(() => __importStar(require('fs')));
|
|
230
|
-
const path = await Promise.resolve().then(() => __importStar(require('path')));
|
|
231
|
-
return files.filter(file => {
|
|
232
|
-
const filePath = path.join(projectPath, file);
|
|
233
|
-
try {
|
|
234
|
-
if (!fs.existsSync(filePath))
|
|
235
|
-
return false;
|
|
236
|
-
const content = fs.readFileSync(filePath, 'utf8');
|
|
237
|
-
const hasPattern = content.includes(excludePattern);
|
|
238
|
-
if (hasPattern) {
|
|
239
|
-
log.debug(`Excluding ${file} - contains ${excludePattern}`);
|
|
240
|
-
return false;
|
|
241
|
-
}
|
|
242
|
-
return true;
|
|
243
|
-
}
|
|
244
|
-
catch (error) {
|
|
245
|
-
log.debug(`Could not check ${file}, including anyway`);
|
|
246
|
-
return true;
|
|
247
|
-
}
|
|
248
|
-
});
|
|
238
|
+
removeSelectionScriptFromContent(content) {
|
|
239
|
+
// Use the exact same pattern as ScriptInjectionService for consistency
|
|
240
|
+
return content.replace(ScriptInjectionService_1.RIVET_SCRIPT_REMOVAL_PATTERN, '');
|
|
249
241
|
}
|
|
250
242
|
}
|
|
251
243
|
exports.LocalGitService = LocalGitService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalGitService.js","sourceRoot":"","sources":["../../src/services/LocalGitService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LocalGitService.js","sourceRoot":"","sources":["../../src/services/LocalGitService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
export declare const RIVET_SCRIPT_REMOVAL_PATTERN: RegExp;
|
|
2
2
|
export declare class ScriptInjectionService {
|
|
3
3
|
private selectionScript;
|
|
4
4
|
constructor();
|
|
5
|
-
injectScript(projectPath: string, customInjectPath?: string, rivetPort?: number): Promise<
|
|
6
|
-
removeScript(projectPath: string,
|
|
5
|
+
injectScript(projectPath: string, customInjectPath?: string, rivetPort?: number): Promise<string | null>;
|
|
6
|
+
removeScript(projectPath: string, customInjectPath?: string): Promise<void>;
|
|
7
7
|
}
|
|
8
8
|
//# sourceMappingURL=ScriptInjectionService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptInjectionService.d.ts","sourceRoot":"","sources":["../../src/services/ScriptInjectionService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ScriptInjectionService.d.ts","sourceRoot":"","sources":["../../src/services/ScriptInjectionService.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,4BAA4B,QAA2E,CAAC;AAErH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,eAAe,CAAS;;IAa1B,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4G9G,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAsClF"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ScriptInjectionService = void 0;
|
|
6
|
+
exports.ScriptInjectionService = exports.RIVET_SCRIPT_REMOVAL_PATTERN = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const logger_1 = require("../utils/logger");
|
|
@@ -33,6 +33,8 @@ const STANDARD_INJECT_PATHS = [
|
|
|
33
33
|
'apps/frontend/index.html',
|
|
34
34
|
'packages/web/index.html'
|
|
35
35
|
];
|
|
36
|
+
// Regex pattern used to remove the injected script tag
|
|
37
|
+
exports.RIVET_SCRIPT_REMOVAL_PATTERN = /\s*<script[^>]*id="rivet-selection-script"[^>]*>[\s\S]*?<\/script>\s*/g;
|
|
36
38
|
class ScriptInjectionService {
|
|
37
39
|
constructor() {
|
|
38
40
|
// Load the selection script
|
|
@@ -82,7 +84,7 @@ class ScriptInjectionService {
|
|
|
82
84
|
catch (e) {
|
|
83
85
|
log.debug(' Could not read project root');
|
|
84
86
|
}
|
|
85
|
-
return;
|
|
87
|
+
return null;
|
|
86
88
|
}
|
|
87
89
|
try {
|
|
88
90
|
log.debug(`📖 Reading layout file: ${layoutPath}`);
|
|
@@ -90,7 +92,7 @@ class ScriptInjectionService {
|
|
|
90
92
|
log.debug(`📄 Layout file length: ${layoutContent.length} characters`);
|
|
91
93
|
if (layoutContent.includes('rivet-selection-script')) {
|
|
92
94
|
log.info('✅ Selection script already injected');
|
|
93
|
-
return;
|
|
95
|
+
return path_1.default.relative(projectPath, layoutPath);
|
|
94
96
|
}
|
|
95
97
|
log.debug('💉 Script not found, proceeding with injection...');
|
|
96
98
|
const scriptTag = `<script src="http://localhost:${rivetPort}/api/selection-script" id="rivet-selection-script"></script>`;
|
|
@@ -117,7 +119,7 @@ class ScriptInjectionService {
|
|
|
117
119
|
log.warn('⚠️ Could not find injection point in layout file');
|
|
118
120
|
log.debug('📄 Layout file preview (first 500 chars):');
|
|
119
121
|
log.debug(layoutContent.substring(0, 500));
|
|
120
|
-
return;
|
|
122
|
+
return null;
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
125
|
log.debug(`🎯 Injection method: ${injectionMethod}`);
|
|
@@ -125,12 +127,14 @@ class ScriptInjectionService {
|
|
|
125
127
|
log.debug(`💾 Writing modified content back to: ${layoutPath}`);
|
|
126
128
|
fs_1.default.writeFileSync(layoutPath, modifiedContent);
|
|
127
129
|
log.info(`✅ Selection script injected into ${layoutPath} (${injectionMethod})`);
|
|
130
|
+
return path_1.default.relative(projectPath, layoutPath);
|
|
128
131
|
}
|
|
129
132
|
catch (error) {
|
|
130
133
|
log.error('Failed to inject selection script:', error);
|
|
134
|
+
return null;
|
|
131
135
|
}
|
|
132
136
|
}
|
|
133
|
-
async removeScript(projectPath,
|
|
137
|
+
async removeScript(projectPath, customInjectPath) {
|
|
134
138
|
log.info('Removing Rivet selection script...');
|
|
135
139
|
// Use custom inject path if provided, otherwise determine paths based on framework
|
|
136
140
|
let injectPaths;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptInjectionService.js","sourceRoot":"","sources":["../../src/services/ScriptInjectionService.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,4CAA+C;AAG/C,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,wBAAwB,CAAC,CAAC;AAEnD,0CAA0C;AAC1C,MAAM,qBAAqB,GAAG;IAC5B,gBAAgB;IAChB,oBAAoB;IACpB,gBAAgB;IAChB,oBAAoB;IACpB,oBAAoB;IACpB,yBAAyB;IACzB,6BAA6B;IAC7B,yBAAyB;IACzB,6BAA6B;IAC7B,8BAA8B;IAC9B,kCAAkC;IAClC,8BAA8B;IAC9B,kCAAkC;IAClC,6BAA6B;IAC7B,iCAAiC;IACjC,6BAA6B;IAC7B,iCAAiC;IACjC,oBAAoB;IACpB,YAAY;IACZ,qBAAqB;IACrB,0BAA0B;IAC1B,yBAAyB;CAE1B,CAAC;
|
|
1
|
+
{"version":3,"file":"ScriptInjectionService.js","sourceRoot":"","sources":["../../src/services/ScriptInjectionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,10 @@ export declare class SessionService {
|
|
|
14
14
|
private branchName?;
|
|
15
15
|
private repoInfo?;
|
|
16
16
|
private isGitEnabled;
|
|
17
|
+
private injectedFilePath?;
|
|
17
18
|
constructor(projectPath: string, isGitEnabled?: boolean);
|
|
19
|
+
setInjectedFilePath(filePath: string): void;
|
|
20
|
+
getInjectedFilePath(): string | undefined;
|
|
18
21
|
initializeSession(): Promise<void>;
|
|
19
22
|
commitModification(change: ChangeRecord): Promise<void>;
|
|
20
23
|
publishChanges(): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionService.d.ts","sourceRoot":"","sources":["../../src/services/SessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,qBAAa,cAAc;IACzB,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,CAAW;IAC5B,OAAO,CAAC,YAAY,CAAU;
|
|
1
|
+
{"version":3,"file":"SessionService.d.ts","sourceRoot":"","sources":["../../src/services/SessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,qBAAa,cAAc;IACzB,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,CAAW;IAC5B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,gBAAgB,CAAC,CAAS;gBAEtB,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,OAAe;IAO9D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK3C,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAInC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BlC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAevD,cAAc,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAuB5C,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IA4B1C,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQrF"}
|
|
@@ -46,6 +46,13 @@ class SessionService {
|
|
|
46
46
|
this.projectPath = projectPath;
|
|
47
47
|
this.isGitEnabled = isGitEnabled;
|
|
48
48
|
}
|
|
49
|
+
setInjectedFilePath(filePath) {
|
|
50
|
+
this.injectedFilePath = filePath;
|
|
51
|
+
log.debug(`Tracking script injection in file: ${filePath}`);
|
|
52
|
+
}
|
|
53
|
+
getInjectedFilePath() {
|
|
54
|
+
return this.injectedFilePath;
|
|
55
|
+
}
|
|
49
56
|
async initializeSession() {
|
|
50
57
|
if (!this.isGitEnabled) {
|
|
51
58
|
log.info('Git tracking disabled, skipping session initialization');
|
|
@@ -76,11 +83,11 @@ class SessionService {
|
|
|
76
83
|
return;
|
|
77
84
|
}
|
|
78
85
|
try {
|
|
79
|
-
const commitSha = await this.gitService.commitChange(this.projectPath, change);
|
|
80
|
-
log.info(`
|
|
86
|
+
const commitSha = await this.gitService.commitChange(this.projectPath, change, this.injectedFilePath);
|
|
87
|
+
log.info(`Successfully committed modification with SHA: ${commitSha} on branch: ${this.branchName}`);
|
|
81
88
|
}
|
|
82
89
|
catch (error) {
|
|
83
|
-
log.error(
|
|
90
|
+
log.error(`Failed to commit modification on branch ${this.branchName}:`, error);
|
|
84
91
|
throw error;
|
|
85
92
|
}
|
|
86
93
|
}
|
|
@@ -130,7 +137,7 @@ class SessionService {
|
|
|
130
137
|
async cleanupSession(framework, customInjectPath) {
|
|
131
138
|
try {
|
|
132
139
|
log.info('Cleaning up session - removing selection script');
|
|
133
|
-
await this.scriptInjectionService.removeScript(this.projectPath,
|
|
140
|
+
await this.scriptInjectionService.removeScript(this.projectPath, customInjectPath);
|
|
134
141
|
}
|
|
135
142
|
catch (error) {
|
|
136
143
|
log.warn('Failed to cleanup selection script:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionService.js","sourceRoot":"","sources":["../../src/services/SessionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA8D;AAC9D,qEAAkE;AAClE,4CAA+C;AAC/C,+CAAiC;AAWjC,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAC;AAE3C,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"SessionService.js","sourceRoot":"","sources":["../../src/services/SessionService.ts"],"names":[],"mappings":"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"}
|