@manuscripts/article-editor 3.7.24-LEAN-3843.0 → 3.7.24
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/cjs/api/Api.js +12 -13
- package/dist/cjs/api/Api.js.map +1 -1
- package/dist/cjs/api/StepsExchanger.js +15 -43
- package/dist/cjs/api/StepsExchanger.js.map +1 -1
- package/dist/es/api/Api.js +12 -13
- package/dist/es/api/Api.js.map +1 -1
- package/dist/es/api/StepsExchanger.js +15 -43
- package/dist/es/api/StepsExchanger.js.map +1 -1
- package/dist/types/api/Api.d.ts +0 -2
- package/dist/types/api/StepsExchanger.d.ts +1 -1
- package/package.json +3 -3
package/dist/cjs/api/Api.js
CHANGED
|
@@ -36,7 +36,6 @@ class Api {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
this.post = async (path, data) => {
|
|
39
|
-
console.log('post', path, data);
|
|
40
39
|
return this.instance
|
|
41
40
|
.post(path, data)
|
|
42
41
|
.then((result) => result.data)
|
|
@@ -97,6 +96,7 @@ class Api {
|
|
|
97
96
|
const config = (0, config_1.getConfig)();
|
|
98
97
|
const base = config.api.url.replace('http', 'ws');
|
|
99
98
|
const url = `${base}/doc/${projectID}/manuscript/${manuscriptID}/listen`;
|
|
99
|
+
let ws;
|
|
100
100
|
const onOpen = () => {
|
|
101
101
|
console.log('Established WebSocket connection');
|
|
102
102
|
};
|
|
@@ -118,14 +118,14 @@ class Api {
|
|
|
118
118
|
rejoin();
|
|
119
119
|
};
|
|
120
120
|
const close = () => {
|
|
121
|
-
if (!
|
|
121
|
+
if (!ws) {
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
124
|
+
ws.removeEventListener('open', onOpen);
|
|
125
|
+
ws.removeEventListener('message', onMessage);
|
|
126
|
+
ws.removeEventListener('close', onClose);
|
|
127
|
+
ws.removeEventListener('error', onError);
|
|
128
|
+
ws.close();
|
|
129
129
|
};
|
|
130
130
|
const rejoin = () => {
|
|
131
131
|
close();
|
|
@@ -133,11 +133,11 @@ class Api {
|
|
|
133
133
|
};
|
|
134
134
|
const join = () => {
|
|
135
135
|
try {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
136
|
+
ws = new WebSocket(url);
|
|
137
|
+
ws.addEventListener('open', onOpen);
|
|
138
|
+
ws.addEventListener('message', onMessage);
|
|
139
|
+
ws.addEventListener('close', onClose);
|
|
140
|
+
ws.addEventListener('error', onError);
|
|
141
141
|
}
|
|
142
142
|
catch (e) {
|
|
143
143
|
console.log(e);
|
|
@@ -153,7 +153,6 @@ class Api {
|
|
|
153
153
|
baseURL: config.api.url,
|
|
154
154
|
headers: { ...config.api.headers, Authorization: 'Bearer ' + authToken },
|
|
155
155
|
});
|
|
156
|
-
this.token = authToken;
|
|
157
156
|
}
|
|
158
157
|
}
|
|
159
158
|
exports.Api = Api;
|
package/dist/cjs/api/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAMiC;AAEjC,kDAAwD;AACxD,iCAAiD;AAEjD,sCAAqC;AAWrC,MAAa,GAAG;
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ exports.StepsExchanger = exports.ObservableBoolean = void 0;
|
|
|
10
10
|
*
|
|
11
11
|
* The Original Developer is the Initial Developer. The Initial Developer of the Original Code is Atypon Systems LLC.
|
|
12
12
|
*
|
|
13
|
-
* All portions of the code written by Atypon Systems LLC are Copyright (c)
|
|
13
|
+
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
|
14
14
|
*/
|
|
15
15
|
const body_editor_1 = require("@manuscripts/body-editor");
|
|
16
16
|
const transform_1 = require("@manuscripts/transform");
|
|
@@ -48,49 +48,21 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
48
48
|
}
|
|
49
49
|
async sendSteps(version, steps, clientID, flush = false) {
|
|
50
50
|
this.flushImmediately = this.debounce(async () => {
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
steps: steps.map((s) => s.toJSON()),
|
|
51
|
+
const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
|
|
52
|
+
steps: steps,
|
|
54
53
|
version,
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
const data = JSON.parse(event.data);
|
|
65
|
-
if (data.status === 'error') {
|
|
66
|
-
if (data.InternalErrorCode === 'VERSION_MISMATCH' &&
|
|
67
|
-
this.attempt < MAX_ATTEMPTS) {
|
|
68
|
-
console.warn('Retrying');
|
|
69
|
-
this.newStepsListener();
|
|
70
|
-
this.attempt++;
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
console.error('Failed to send steps', data.message);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
else if (data.status === 'success') {
|
|
77
|
-
this.attempt = 0;
|
|
78
|
-
}
|
|
79
|
-
};
|
|
54
|
+
clientID,
|
|
55
|
+
});
|
|
56
|
+
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
57
|
+
console.warn('Retrying');
|
|
58
|
+
this.newStepsListener();
|
|
59
|
+
this.attempt++;
|
|
60
|
+
}
|
|
61
|
+
else if (response.error) {
|
|
62
|
+
console.error('Failed to send steps', response.error);
|
|
80
63
|
}
|
|
81
64
|
else {
|
|
82
|
-
|
|
83
|
-
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
84
|
-
console.warn('Retrying');
|
|
85
|
-
this.newStepsListener();
|
|
86
|
-
this.attempt++;
|
|
87
|
-
}
|
|
88
|
-
else if (response.error) {
|
|
89
|
-
console.error('Failed to send steps', response.error);
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
this.attempt = 0;
|
|
93
|
-
}
|
|
65
|
+
this.attempt = 0;
|
|
94
66
|
}
|
|
95
67
|
}, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
|
|
96
68
|
if (!flush) {
|
|
@@ -102,8 +74,8 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
102
74
|
this.currentVersion = version;
|
|
103
75
|
this.updateStoreVersion(version);
|
|
104
76
|
if (steps.length) {
|
|
105
|
-
|
|
106
|
-
this.newStepsListener(
|
|
77
|
+
//TODO send steps to listener
|
|
78
|
+
this.newStepsListener();
|
|
107
79
|
}
|
|
108
80
|
}
|
|
109
81
|
start() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,0DAAyD;AACzD,sDAA+C;AAC/C,iEAA4C;AAG5C,uDAAoD;AAEpD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,mBAAmB,GAAG,IAAI,CAAA;AAIhC,MAAa,iBAAiB;IAA9B;QACE,UAAK,GAAG,KAAK,CAAA;QACL,SAAI,GAAmB,EAAE,CAAA;IAUnC,CAAC;IARC,QAAQ,CAAC,KAAc;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC;IAED,QAAQ,CAAC,GAAiB;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrB,CAAC;CACF;AAZD,8CAYC;AAED,MAAa,cAAe,SAAQ,4BAAc;IAahD,YACE,SAAiB,EACjB,YAAoB,EACpB,cAAsB,EACtB,GAAQ,EACR,kBAA6C;QAE7C,KAAK,EAAE,CAAA;QATT,YAAO,GAAG,CAAC,CAAA;QAUT,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAA;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAA,kCAAgB,GAAE,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,SAAS,CACb,OAAe,EACf,KAAa,EACb,QAAgB,EAChB,KAAK,GAAG,KAAK;QAEb,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CACnC,KAAK,IAAI,EAAE;YACT,MAAM,
|
|
1
|
+
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
|
package/dist/es/api/Api.js
CHANGED
|
@@ -30,7 +30,6 @@ export class Api {
|
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
32
|
this.post = async (path, data) => {
|
|
33
|
-
console.log('post', path, data);
|
|
34
33
|
return this.instance
|
|
35
34
|
.post(path, data)
|
|
36
35
|
.then((result) => result.data)
|
|
@@ -91,6 +90,7 @@ export class Api {
|
|
|
91
90
|
const config = getConfig();
|
|
92
91
|
const base = config.api.url.replace('http', 'ws');
|
|
93
92
|
const url = `${base}/doc/${projectID}/manuscript/${manuscriptID}/listen`;
|
|
93
|
+
let ws;
|
|
94
94
|
const onOpen = () => {
|
|
95
95
|
console.log('Established WebSocket connection');
|
|
96
96
|
};
|
|
@@ -112,14 +112,14 @@ export class Api {
|
|
|
112
112
|
rejoin();
|
|
113
113
|
};
|
|
114
114
|
const close = () => {
|
|
115
|
-
if (!
|
|
115
|
+
if (!ws) {
|
|
116
116
|
return;
|
|
117
117
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
118
|
+
ws.removeEventListener('open', onOpen);
|
|
119
|
+
ws.removeEventListener('message', onMessage);
|
|
120
|
+
ws.removeEventListener('close', onClose);
|
|
121
|
+
ws.removeEventListener('error', onError);
|
|
122
|
+
ws.close();
|
|
123
123
|
};
|
|
124
124
|
const rejoin = () => {
|
|
125
125
|
close();
|
|
@@ -127,11 +127,11 @@ export class Api {
|
|
|
127
127
|
};
|
|
128
128
|
const join = () => {
|
|
129
129
|
try {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
130
|
+
ws = new WebSocket(url);
|
|
131
|
+
ws.addEventListener('open', onOpen);
|
|
132
|
+
ws.addEventListener('message', onMessage);
|
|
133
|
+
ws.addEventListener('close', onClose);
|
|
134
|
+
ws.addEventListener('error', onError);
|
|
135
135
|
}
|
|
136
136
|
catch (e) {
|
|
137
137
|
console.log(e);
|
|
@@ -147,7 +147,6 @@ export class Api {
|
|
|
147
147
|
baseURL: config.api.url,
|
|
148
148
|
headers: { ...config.api.headers, Authorization: 'Bearer ' + authToken },
|
|
149
149
|
});
|
|
150
|
-
this.token = authToken;
|
|
151
150
|
}
|
|
152
151
|
}
|
|
153
152
|
export const ApiContext = createContext(undefined);
|
package/dist/es/api/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAGL,WAAW,GAGZ,MAAM,0BAA0B,CAAA;AAEjC,OAAO,KAAoC,MAAM,OAAO,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAWrC,MAAM,OAAO,GAAG;
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*
|
|
8
8
|
* The Original Developer is the Initial Developer. The Initial Developer of the Original Code is Atypon Systems LLC.
|
|
9
9
|
*
|
|
10
|
-
* All portions of the code written by Atypon Systems LLC are Copyright (c)
|
|
10
|
+
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
12
|
import { CollabProvider } from '@manuscripts/body-editor';
|
|
13
13
|
import { schema } from '@manuscripts/transform';
|
|
@@ -44,49 +44,21 @@ export class StepsExchanger extends CollabProvider {
|
|
|
44
44
|
}
|
|
45
45
|
async sendSteps(version, steps, clientID, flush = false) {
|
|
46
46
|
this.flushImmediately = this.debounce(async () => {
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
steps: steps.map((s) => s.toJSON()),
|
|
47
|
+
const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
|
|
48
|
+
steps: steps,
|
|
50
49
|
version,
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const data = JSON.parse(event.data);
|
|
61
|
-
if (data.status === 'error') {
|
|
62
|
-
if (data.InternalErrorCode === 'VERSION_MISMATCH' &&
|
|
63
|
-
this.attempt < MAX_ATTEMPTS) {
|
|
64
|
-
console.warn('Retrying');
|
|
65
|
-
this.newStepsListener();
|
|
66
|
-
this.attempt++;
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
console.error('Failed to send steps', data.message);
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
else if (data.status === 'success') {
|
|
73
|
-
this.attempt = 0;
|
|
74
|
-
}
|
|
75
|
-
};
|
|
50
|
+
clientID,
|
|
51
|
+
});
|
|
52
|
+
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
53
|
+
console.warn('Retrying');
|
|
54
|
+
this.newStepsListener();
|
|
55
|
+
this.attempt++;
|
|
56
|
+
}
|
|
57
|
+
else if (response.error) {
|
|
58
|
+
console.error('Failed to send steps', response.error);
|
|
76
59
|
}
|
|
77
60
|
else {
|
|
78
|
-
|
|
79
|
-
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
80
|
-
console.warn('Retrying');
|
|
81
|
-
this.newStepsListener();
|
|
82
|
-
this.attempt++;
|
|
83
|
-
}
|
|
84
|
-
else if (response.error) {
|
|
85
|
-
console.error('Failed to send steps', response.error);
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
this.attempt = 0;
|
|
89
|
-
}
|
|
61
|
+
this.attempt = 0;
|
|
90
62
|
}
|
|
91
63
|
}, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
|
|
92
64
|
if (!flush) {
|
|
@@ -98,8 +70,8 @@ export class StepsExchanger extends CollabProvider {
|
|
|
98
70
|
this.currentVersion = version;
|
|
99
71
|
this.updateStoreVersion(version);
|
|
100
72
|
if (steps.length) {
|
|
101
|
-
|
|
102
|
-
this.newStepsListener(
|
|
73
|
+
//TODO send steps to listener
|
|
74
|
+
this.newStepsListener();
|
|
103
75
|
}
|
|
104
76
|
}
|
|
105
77
|
start() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,mBAAmB,GAAG,IAAI,CAAA;AAIhC,MAAM,OAAO,iBAAiB;IAA9B;QACE,UAAK,GAAG,KAAK,CAAA;QACL,SAAI,GAAmB,EAAE,CAAA;IAUnC,CAAC;IARC,QAAQ,CAAC,KAAc;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC;IAED,QAAQ,CAAC,GAAiB;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrB,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,cAAc;IAahD,YACE,SAAiB,EACjB,YAAoB,EACpB,cAAsB,EACtB,GAAQ,EACR,kBAA6C;QAE7C,KAAK,EAAE,CAAA;QATT,YAAO,GAAG,CAAC,CAAA;QAUT,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAA;QAC3C,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,SAAS,CACb,OAAe,EACf,KAAa,EACb,QAAgB,EAChB,KAAK,GAAG,KAAK;QAEb,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CACnC,KAAK,IAAI,EAAE;YACT,MAAM,
|
|
1
|
+
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
|
package/dist/types/api/Api.d.ts
CHANGED
|
@@ -17,8 +17,6 @@ import { ManuscriptDoc, ManuscriptSnapshot } from '../lib/doc';
|
|
|
17
17
|
import { CreateSnapshotResponse, SendStepsPayload, SendStepsResponse, StepsListener, StepsSinceResponse } from './types';
|
|
18
18
|
export declare class Api {
|
|
19
19
|
instance: AxiosInstance;
|
|
20
|
-
ws: WebSocket;
|
|
21
|
-
token: string;
|
|
22
20
|
constructor(authToken: string);
|
|
23
21
|
get: <T>(url: string) => Promise<T | undefined>;
|
|
24
22
|
post: <T>(path: string, data: unknown) => Promise<T>;
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*
|
|
8
8
|
* The Original Developer is the Initial Developer. The Initial Developer of the Original Code is Atypon Systems LLC.
|
|
9
9
|
*
|
|
10
|
-
* All portions of the code written by Atypon Systems LLC are Copyright (c)
|
|
10
|
+
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
12
|
import { CollabProvider } from '@manuscripts/body-editor';
|
|
13
13
|
import { Step } from 'prosemirror-transform';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@manuscripts/article-editor",
|
|
3
|
-
"version": "3.7.24
|
|
3
|
+
"version": "3.7.24",
|
|
4
4
|
"license": "CPAL-1.0",
|
|
5
5
|
"description": "React components for editing and viewing manuscripts",
|
|
6
6
|
"repository": "github:Atypon-OpenSource/manuscripts-article-editor",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@fontsource/lato": "^4.5.10",
|
|
36
36
|
"@fontsource/pt-sans": "^4.5.11",
|
|
37
37
|
"@fontsource/pt-serif": "^4.5.11",
|
|
38
|
-
"@manuscripts/body-editor": "2.7.19
|
|
38
|
+
"@manuscripts/body-editor": "2.7.19",
|
|
39
39
|
"@manuscripts/json-schema": "2.2.11",
|
|
40
40
|
"@manuscripts/library": "1.3.11",
|
|
41
41
|
"@manuscripts/style-guide": "2.0.32",
|
|
@@ -107,4 +107,4 @@
|
|
|
107
107
|
"resolutions": {
|
|
108
108
|
"@types/react": "^18.3.1"
|
|
109
109
|
}
|
|
110
|
-
}
|
|
110
|
+
}
|