@silexlabs/silex 3.0.0-alpha.145 → 3.0.0-alpha.147

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 (117) hide show
  1. package/dist/client/client/config.d.ts +7 -0
  2. package/dist/client/client/events.d.ts +2 -1
  3. package/dist/client/client/utils.d.ts +4 -0
  4. package/dist/client/js/main.js +16 -16
  5. package/dist/plugins/client/client/events.d.ts +2 -1
  6. package/dist/plugins/client/client/events.js +1 -0
  7. package/dist/plugins/client/client/events.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/ts/client/config.ts +8 -0
  10. package/src/ts/client/events.ts +1 -0
  11. package/src/ts/client/grapesjs/PublicationManager.ts +11 -6
  12. package/src/ts/client/grapesjs/index.ts +4 -1
  13. package/src/ts/client/grapesjs/settings.ts +14 -0
  14. package/src/ts/client/publication-transformers.test.ts +10 -3
  15. package/src/ts/client/publication-transformers.ts +11 -4
  16. package/src/ts/client/utils.ts +18 -0
  17. package/dist/plugins/client/client/api.d.ts +0 -90
  18. package/dist/plugins/client/client/api.js +0 -118
  19. package/dist/plugins/client/client/api.js.map +0 -1
  20. package/dist/plugins/client/client/assetUrl.d.ts +0 -54
  21. package/dist/plugins/client/client/assetUrl.js +0 -242
  22. package/dist/plugins/client/client/assetUrl.js.map +0 -1
  23. package/dist/plugins/client/client/config.d.ts +0 -82
  24. package/dist/plugins/client/client/config.js +0 -155
  25. package/dist/plugins/client/client/config.js.map +0 -1
  26. package/dist/plugins/client/client/grapesjs/LoginDialog.d.ts +0 -15
  27. package/dist/plugins/client/client/grapesjs/LoginDialog.js +0 -195
  28. package/dist/plugins/client/client/grapesjs/LoginDialog.js.map +0 -1
  29. package/dist/plugins/client/client/grapesjs/PublicationManager.d.ts +0 -73
  30. package/dist/plugins/client/client/grapesjs/PublicationManager.js +0 -376
  31. package/dist/plugins/client/client/grapesjs/PublicationManager.js.map +0 -1
  32. package/dist/plugins/client/client/grapesjs/PublicationUi.d.ts +0 -62
  33. package/dist/plugins/client/client/grapesjs/PublicationUi.js +0 -338
  34. package/dist/plugins/client/client/grapesjs/PublicationUi.js.map +0 -1
  35. package/dist/plugins/client/client/grapesjs/blocks.d.ts +0 -1
  36. package/dist/plugins/client/client/grapesjs/blocks.js +0 -37
  37. package/dist/plugins/client/client/grapesjs/blocks.js.map +0 -1
  38. package/dist/plugins/client/client/grapesjs/breadcrumbs.d.ts +0 -1
  39. package/dist/plugins/client/client/grapesjs/breadcrumbs.js +0 -75
  40. package/dist/plugins/client/client/grapesjs/breadcrumbs.js.map +0 -1
  41. package/dist/plugins/client/client/grapesjs/css-props.d.ts +0 -6
  42. package/dist/plugins/client/client/grapesjs/css-props.js +0 -537
  43. package/dist/plugins/client/client/grapesjs/css-props.js.map +0 -1
  44. package/dist/plugins/client/client/grapesjs/footer.d.ts +0 -2
  45. package/dist/plugins/client/client/grapesjs/footer.js +0 -43
  46. package/dist/plugins/client/client/grapesjs/footer.js.map +0 -1
  47. package/dist/plugins/client/client/grapesjs/img.d.ts +0 -6
  48. package/dist/plugins/client/client/grapesjs/img.js +0 -144
  49. package/dist/plugins/client/client/grapesjs/img.js.map +0 -1
  50. package/dist/plugins/client/client/grapesjs/index.d.ts +0 -5
  51. package/dist/plugins/client/client/grapesjs/index.js +0 -344
  52. package/dist/plugins/client/client/grapesjs/index.js.map +0 -1
  53. package/dist/plugins/client/client/grapesjs/internal-links.d.ts +0 -1
  54. package/dist/plugins/client/client/grapesjs/internal-links.js +0 -218
  55. package/dist/plugins/client/client/grapesjs/internal-links.js.map +0 -1
  56. package/dist/plugins/client/client/grapesjs/new-page-dialog.d.ts +0 -2
  57. package/dist/plugins/client/client/grapesjs/new-page-dialog.js +0 -82
  58. package/dist/plugins/client/client/grapesjs/new-page-dialog.js.map +0 -1
  59. package/dist/plugins/client/client/grapesjs/openImport.d.ts +0 -9
  60. package/dist/plugins/client/client/grapesjs/openImport.js +0 -74
  61. package/dist/plugins/client/client/grapesjs/openImport.js.map +0 -1
  62. package/dist/plugins/client/client/grapesjs/page-panel.d.ts +0 -3
  63. package/dist/plugins/client/client/grapesjs/page-panel.js +0 -136
  64. package/dist/plugins/client/client/grapesjs/page-panel.js.map +0 -1
  65. package/dist/plugins/client/client/grapesjs/project-bar.d.ts +0 -17
  66. package/dist/plugins/client/client/grapesjs/project-bar.js +0 -106
  67. package/dist/plugins/client/client/grapesjs/project-bar.js.map +0 -1
  68. package/dist/plugins/client/client/grapesjs/resize-panel.d.ts +0 -1
  69. package/dist/plugins/client/client/grapesjs/resize-panel.js +0 -21
  70. package/dist/plugins/client/client/grapesjs/resize-panel.js.map +0 -1
  71. package/dist/plugins/client/client/grapesjs/rich-text.d.ts +0 -4
  72. package/dist/plugins/client/client/grapesjs/rich-text.js +0 -36
  73. package/dist/plugins/client/client/grapesjs/rich-text.js.map +0 -1
  74. package/dist/plugins/client/client/grapesjs/semantic.d.ts +0 -1
  75. package/dist/plugins/client/client/grapesjs/semantic.js +0 -110
  76. package/dist/plugins/client/client/grapesjs/semantic.js.map +0 -1
  77. package/dist/plugins/client/client/grapesjs/settings-sections.d.ts +0 -15
  78. package/dist/plugins/client/client/grapesjs/settings-sections.js +0 -108
  79. package/dist/plugins/client/client/grapesjs/settings-sections.js.map +0 -1
  80. package/dist/plugins/client/client/grapesjs/settings.d.ts +0 -4
  81. package/dist/plugins/client/client/grapesjs/settings.js +0 -225
  82. package/dist/plugins/client/client/grapesjs/settings.js.map +0 -1
  83. package/dist/plugins/client/client/grapesjs/storage.d.ts +0 -1
  84. package/dist/plugins/client/client/grapesjs/storage.js +0 -126
  85. package/dist/plugins/client/client/grapesjs/storage.js.map +0 -1
  86. package/dist/plugins/client/client/grapesjs/symbolDialogs.d.ts +0 -3
  87. package/dist/plugins/client/client/grapesjs/symbolDialogs.js +0 -35
  88. package/dist/plugins/client/client/grapesjs/symbolDialogs.js.map +0 -1
  89. package/dist/plugins/client/client/grapesjs/view-buttons.d.ts +0 -1
  90. package/dist/plugins/client/client/grapesjs/view-buttons.js +0 -40
  91. package/dist/plugins/client/client/grapesjs/view-buttons.js.map +0 -1
  92. package/dist/plugins/client/client/publication-transformers.d.ts +0 -42
  93. package/dist/plugins/client/client/publication-transformers.js +0 -239
  94. package/dist/plugins/client/client/publication-transformers.js.map +0 -1
  95. package/dist/plugins/client/client/publish-custom-code-block.d.ts +0 -4
  96. package/dist/plugins/client/client/publish-custom-code-block.js +0 -30
  97. package/dist/plugins/client/client/publish-custom-code-block.js.map +0 -1
  98. package/dist/plugins/client/client/publish-fonts.d.ts +0 -4
  99. package/dist/plugins/client/client/publish-fonts.js +0 -34
  100. package/dist/plugins/client/client/publish-fonts.js.map +0 -1
  101. package/dist/plugins/client/client/utils.d.ts +0 -2
  102. package/dist/plugins/client/client/utils.js +0 -25
  103. package/dist/plugins/client/client/utils.js.map +0 -1
  104. package/dist/plugins/client/constants.d.ts +0 -30
  105. package/dist/plugins/client/constants.js +0 -47
  106. package/dist/plugins/client/constants.js.map +0 -1
  107. package/dist/plugins/client/page.d.ts +0 -2
  108. package/dist/plugins/client/page.js +0 -31
  109. package/dist/plugins/client/page.js.map +0 -1
  110. package/dist/plugins/client/plugins/client/11ty.d.ts +0 -17
  111. package/dist/plugins/client/plugins/client/11ty.js +0 -83
  112. package/dist/plugins/client/plugins/client/11ty.js.map +0 -1
  113. package/dist/plugins/client/plugins/client/publicationRenderer.d.ts +0 -2
  114. package/dist/plugins/client/plugins/client/publicationRenderer.js +0 -147
  115. package/dist/plugins/client/plugins/client/publicationRenderer.js.map +0 -1
  116. package/src/ts/plugins/client/11ty.ts +0 -101
  117. package/src/ts/plugins/client/publicationRenderer.ts +0 -149
@@ -14,5 +14,6 @@ export declare enum ClientEvent {
14
14
  SETTINGS_OPEN = "silex:settings:open",
15
15
  SETTINGS_CLOSE = "silex:settings:close",
16
16
  SETTINGS_SAVE_START = "silex:settings:save:start",
17
- SETTINGS_SAVE_END = "silex:settings:save:end"
17
+ SETTINGS_SAVE_END = "silex:settings:save:end",
18
+ SETTINGS_SECTION_CHANGE = "silex:settings:section-change"
18
19
  }
@@ -34,5 +34,6 @@ export var ClientEvent;
34
34
  ClientEvent["SETTINGS_CLOSE"] = "silex:settings:close";
35
35
  ClientEvent["SETTINGS_SAVE_START"] = "silex:settings:save:start";
36
36
  ClientEvent["SETTINGS_SAVE_END"] = "silex:settings:save:end";
37
+ ClientEvent["SETTINGS_SECTION_CHANGE"] = "silex:settings:section-change";
37
38
  })(ClientEvent || (ClientEvent = {}));
38
39
  //# sourceMappingURL=events.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"events.js","sourceRoot":"","sources":["../../../../src/ts/client/events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAN,IAAY,WAoBX;AApBD,WAAY,WAAW;IACrB,4BAA4B;IAC5B,oDAAqC,CAAA;IACrC,gDAAiC,CAAA;IACjC,sDAAuC,CAAA;IACvC,kDAAmC,CAAA;IAEnC,4BAA4B;IAC5B,oDAAqC,CAAA;IACrC,kDAAmC,CAAA;IACnC,gDAAiC,CAAA;IACjC,oDAAqC,CAAA;IACrC,gEAAiD,CAAA;IACjD,4DAA6C,CAAA;IAC7C,wDAAyC,CAAA;IACzC,4CAA6B,CAAA;IAC7B,oDAAqC,CAAA;IACrC,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,4DAA6C,CAAA;AAC/C,CAAC,EApBW,WAAW,KAAX,WAAW,QAoBtB"}
1
+ {"version":3,"file":"events.js","sourceRoot":"","sources":["../../../../src/ts/client/events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAN,IAAY,WAqBX;AArBD,WAAY,WAAW;IACrB,4BAA4B;IAC5B,oDAAqC,CAAA;IACrC,gDAAiC,CAAA;IACjC,sDAAuC,CAAA;IACvC,kDAAmC,CAAA;IAEnC,4BAA4B;IAC5B,oDAAqC,CAAA;IACrC,kDAAmC,CAAA;IACnC,gDAAiC,CAAA;IACjC,oDAAqC,CAAA;IACrC,gEAAiD,CAAA;IACjD,4DAA6C,CAAA;IAC7C,wDAAyC,CAAA;IACzC,4CAA6B,CAAA;IAC7B,oDAAqC,CAAA;IACrC,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,4DAA6C,CAAA;IAC7C,wEAAyD,CAAA;AAC3D,CAAC,EArBW,WAAW,KAAX,WAAW,QAqBtB"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@silexlabs/silex",
3
3
  "description": "Free and easy website builder for everyone.",
4
- "version": "3.0.0-alpha.145",
4
+ "version": "3.0.0-alpha.147",
5
5
  "version:backwardcompat": "3.0.0",
6
6
  "author": {
7
7
  "name": "Alex Hoyau",
@@ -64,6 +64,14 @@ export class ClientConfig extends Config {
64
64
  */
65
65
  debug = false
66
66
 
67
+ /**
68
+ * Add hash in the file name of CSS at the time of publication
69
+ * If true, CSS files of generated pages will look like `page-name.123456.css` instead of `page-name.css`
70
+ * This is useful to avoid caching issues
71
+ * @default true
72
+ */
73
+ addHashInCssFileName = true
74
+
67
75
  /**
68
76
  * Replaced elements
69
77
  * This is a list of elements which support the object-fit and object-position CSS properties
@@ -35,4 +35,5 @@ export enum ClientEvent {
35
35
  SETTINGS_CLOSE = 'silex:settings:close',
36
36
  SETTINGS_SAVE_START = 'silex:settings:save:start',
37
37
  SETTINGS_SAVE_END = 'silex:settings:save:end',
38
+ SETTINGS_SECTION_CHANGE = 'silex:settings:section-change',
38
39
  }
@@ -24,6 +24,7 @@ import { API_CONNECTOR_LOGIN, API_CONNECTOR_PATH, API_PATH } from '../../constan
24
24
  import { ClientEvent } from '../events'
25
25
  import { resetRenderComponents, resetRenderCssRules, transformPermalink, transformFiles, transformPath, renderComponents, renderCssRules } from '../publication-transformers'
26
26
  import { displayedToStored } from '../assetUrl'
27
+ import { hashString } from '../utils'
27
28
 
28
29
  /**
29
30
  * @fileoverview Publication manager for Silex
@@ -322,20 +323,24 @@ export class PublicationManager {
322
323
  }
323
324
 
324
325
  async getHtmlFiles(siteSettings: WebsiteSettings): Promise<WebsiteFile[]> {
325
- return this.editor.Pages.getAll().map(page => {
326
+ return Promise.all(this.editor.Pages.getAll().map(async page => {
326
327
  const pageSettings = page.get('settings') as WebsiteSettings
327
328
  function getSetting(name) {
328
329
  return (pageSettings || {})[name] || (siteSettings || [])[name] || ''
329
330
  }
330
331
  const component = page.getMainComponent()
332
+
333
+ // Get the content from GrapesJS
334
+ const cssContent = this.editor.getCss({ component })
335
+ const htmlContent = this.editor.getHtml({ component })
336
+
331
337
  // Transform the file paths
332
338
  const slug = getPageSlug(page.get('name'))
333
- const cssInitialPath = `/css/${slug}.css`
339
+ const cssInitialPath = `/css/${slug}-${await hashString(cssContent)}.css`
334
340
  const htmlInitialPath = `/${slug}.html`
335
341
  const cssPermalink = transformPermalink(this.editor, cssInitialPath, ClientSideFileType.CSS, Initiator.HTML)
336
342
  const cssPath = transformPath(this.editor, cssInitialPath, ClientSideFileType.CSS)
337
343
  const htmlPath = transformPath(this.editor, htmlInitialPath, ClientSideFileType.HTML)
338
- const body = this.editor.getHtml({ component })
339
344
  return {
340
345
  html: `<!DOCTYPE html>
341
346
  <html lang="${getSetting('lang')}">
@@ -351,13 +356,13 @@ ${['description', 'og:title', 'og:description', 'og:image']
351
356
  .join('\n')
352
357
  }
353
358
  </head>
354
- ${body}
359
+ ${htmlContent}
355
360
  </html>`,
356
- css: this.editor.getCss({ component }),
361
+ css: cssContent,
357
362
  cssPath,
358
363
  htmlPath,
359
364
  }
360
- })
365
+ }))
361
366
  }
362
367
 
363
368
  async trackProgress() {
@@ -283,7 +283,10 @@ export function getEditorConfig(config: ClientConfig): EditorConfig {
283
283
  blockLabel: 'HTML',
284
284
  blockCustomCode: {
285
285
  category: catComponents,
286
- }
286
+ },
287
+ codeViewOptions: {
288
+ autoFormat: false,
289
+ },
287
290
  },
288
291
  [symbolsPlugin.toString()]: {
289
292
  appendTo: '.symbols-list-container',
@@ -88,6 +88,14 @@ export const settingsDialog = (editor, opts) => {
88
88
  model.set('settings', data.settings || {})
89
89
  model.set('name', data.name)
90
90
  })
91
+ // On chrome this is needed to apply the head content to the DOM
92
+ editor.on('storage:end:load', () => {
93
+ setTimeout(() => {
94
+ updateDom(editor)
95
+ })
96
+ })
97
+ // Normal way to apply the head content to the DOM
98
+ // fix #1559 Custom <head> code must be reapplied
91
99
  editor.on('canvas:frame:load', () => {
92
100
  updateDom(editor)
93
101
  })
@@ -101,6 +109,7 @@ export const settingsDialog = (editor, opts) => {
101
109
  codeName: 'htmlmixed',
102
110
  lineNumbers: true,
103
111
  lineWrapping: true,
112
+ autoFormat: false,
104
113
  })
105
114
  }
106
115
 
@@ -165,6 +174,11 @@ function displaySettings(editor, config, model = editor.getModel()) {
165
174
  mainItem.classList.remove('silex-hidden')
166
175
  // This messes up with the save / cancel mechanism
167
176
  // displaySettings(editor, config, model)
177
+ // Refresh the code editor just in case it went from hidden to visible
178
+ // This makes it ready to be used when the user clicks on the tab
179
+ headEditor.refresh()
180
+ // Notify other plugins
181
+ editor.trigger(ClientEvent.SETTINGS_SECTION_CHANGE, item.id)
168
182
  }}
169
183
  >
170
184
  ${item.label}
@@ -137,13 +137,20 @@ describe('publication-transformers', () => {
137
137
  expect(transformPermalink.mock.calls[0][0]).toBe('test.png')
138
138
  expect(transformPermalink.mock.calls[0][1]).toBe('asset')
139
139
  })
140
+
140
141
  it('should transform a style rule with background image', () => {
141
142
  expect(transformBgImage(editor, { 'background-image': 'url(test.png)' })).toEqual({ 'background-image': 'url(test.png)' })
142
143
  const transformPermalink = transformer.transformPermalink as Mock
143
144
  const transformedSrc = 'transformed.png'
144
- transformPermalink.mockImplementation((url, type) => (url as string).replace('test.png', transformedSrc))
145
- expect(transformBgImage(editor, { 'background-image': 'url(test.png)' })).toEqual({ 'background-image': 'url(transformed.png)' })
146
- expect(transformBgImage(editor, { 'background-image': 'url("test.png")' })).toEqual({ 'background-image': 'url(transformed.png)' })
145
+ const transformedSrc2 = 'transformed2.png'
146
+ transformPermalink.mockImplementation((url, type) => (url as string).replace('test.png', transformedSrc).replace('test2.png', transformedSrc2))
147
+ expect(transformBgImage(editor, { 'background-image': 'url(test.png)' })).toEqual({ 'background-image': `url(${transformedSrc})` })
148
+ expect(transformBgImage(editor, { 'background-image': 'url("test.png")' })).toEqual({ 'background-image': `url(${transformedSrc})` })
149
+ expect(transformBgImage(editor, {
150
+ 'background-image': 'linear-gradient(to right, rgb(30 75 115 / 100%), url(test.png), linear-gradient(to left, rgb(30 75 115 / 10%), url(test2.png), rgb(255 255 255 / 0%));',
151
+ })).toEqual({
152
+ 'background-image': `linear-gradient(to right, rgb(30 75 115 / 100%), url(${transformedSrc}), linear-gradient(to left, rgb(30 75 115 / 10%), url(${transformedSrc2}), rgb(255 255 255 / 0%));`,
153
+ })
147
154
  })
148
155
 
149
156
  it('should transform permalinks of background images in inline css', () => {
@@ -185,12 +185,19 @@ export function renderCssRules(editor: Editor) {
185
185
  * Transform background image url according to the transformed path of assets
186
186
  */
187
187
  export function transformBgImage(editor: Editor, style: ObjectStrings): ObjectStrings {
188
- const url = style['background-image']
189
- const bgUrl = url?.match(/url\(["']?(.*?)["']?\)/)?.pop()
190
- if (bgUrl) {
188
+ const cssValue = style['background-image']
189
+ if (cssValue) {
190
+ const newCssValue = cssValue.replace(/url\(([^)]+)\)/g, (match, url) => {
191
+ // Support URLs with or without quotes
192
+ const cleanUrl = url.replace(/['"]/g, '')
193
+ // Transform URLs
194
+ const newUrl = transformPermalink(editor, cleanUrl, ClientSideFileType.ASSET, Initiator.CSS)
195
+ // Return the new URL with url keyword
196
+ return `url(${newUrl})`
197
+ })
191
198
  return {
192
199
  ...style,
193
- 'background-image': `url(${transformPermalink(editor, bgUrl, ClientSideFileType.ASSET, Initiator.CSS)})`,
200
+ 'background-image': newCssValue,
194
201
  }
195
202
  }
196
203
  return style
@@ -26,3 +26,21 @@ export function onAll(editor: Editor, cbk: (c: Component) => void) {
26
26
  .onAll(c => cbk(c))
27
27
  })
28
28
  }
29
+
30
+ /**
31
+ * SHA256 hash a string
32
+ */
33
+ export async function hashString(str: string): Promise<string> {
34
+ // Convert the string to an ArrayBuffer
35
+ const encoder = new TextEncoder()
36
+ const data = encoder.encode(str)
37
+
38
+ // Hash the data with SHA-256
39
+ const hashBuffer = await crypto.subtle.digest('SHA-256', data)
40
+
41
+ // Convert the ArrayBuffer to hex string
42
+ const hashArray = Array.from(new Uint8Array(hashBuffer))
43
+ const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
44
+
45
+ return hashHex
46
+ }
@@ -1,90 +0,0 @@
1
- import { ConnectorId, JobId, PublicationJobData, WebsiteId, ConnectorData, ConnectorType, WebsiteData, ClientSideFile, PublicationData, ConnectorUser, WebsiteMeta, WebsiteMetaFileContent, ConnectorOptions } from '../types';
2
- export declare enum ApiRoute {
3
- PUBLICATION_PUBLISH = "/api/publication/",
4
- PUBLICATION_STATUS = "/api/publication/publication/status",
5
- CONNECTOR_USER = "/api/connector/user",
6
- CONNECTOR_LOGOUT = "/api/connector/logout",
7
- CONNECTOR_LIST = "/api/connector/",
8
- WEBSITE_READ = "/api/website/",
9
- WEBSITE_WRITE = "/api/website/",
10
- WEBSITE_DELETE = "/api/website/",
11
- WEBSITE_DUPLICATE = "/api/website/duplicate",
12
- WEBSITE_CREATE = "/api/website/",
13
- WEBSITE_LIST = "/api/website/",
14
- WEBSITE_ASSETS_READ = "/api/website/assets",
15
- WEBSITE_ASSETS_WRITE = "/api/website/assets",
16
- WEBSITE_META_READ = "/api/website/meta",
17
- WEBSITE_META_WRITE = "/api/website/meta"
18
- }
19
- export declare function setServerUrl(url: string): void;
20
- export declare function getServerUrl(): string;
21
- export declare function getUser({ type, connectorId }: {
22
- type: ConnectorType;
23
- connectorId?: ConnectorId;
24
- }): Promise<ConnectorUser>;
25
- export declare function logout({ type, connectorId }: {
26
- type: ConnectorType;
27
- connectorId?: ConnectorId;
28
- }): Promise<void>;
29
- export declare function publish({ websiteId, hostingId, storageId, data, options }: {
30
- websiteId: WebsiteId;
31
- hostingId: ConnectorId;
32
- storageId: ConnectorId;
33
- data: PublicationData;
34
- options: ConnectorOptions;
35
- }): Promise<[url: string, job: PublicationJobData]>;
36
- export declare function publicationStatus({ jobId }: {
37
- jobId: JobId;
38
- }): Promise<PublicationJobData>;
39
- export declare function connectorList({ type }: {
40
- type: ConnectorType;
41
- }): Promise<ConnectorData[]>;
42
- export declare function websiteList({ connectorId }: {
43
- connectorId?: ConnectorId;
44
- }): Promise<WebsiteMeta[]>;
45
- export declare function websiteLoad({ websiteId, connectorId }: {
46
- websiteId: WebsiteId;
47
- connectorId?: ConnectorId;
48
- }): Promise<WebsiteData>;
49
- export declare function websiteSave({ websiteId, data, connectorId }: {
50
- websiteId: WebsiteId;
51
- data: WebsiteData;
52
- connectorId?: ConnectorId;
53
- }): Promise<void>;
54
- export declare function websiteDelete({ websiteId, connectorId }: {
55
- websiteId: WebsiteId;
56
- connectorId?: ConnectorId;
57
- }): Promise<void>;
58
- export declare function websiteDuplicate({ websiteId, connectorId }: {
59
- websiteId: WebsiteId;
60
- connectorId?: ConnectorId;
61
- }): Promise<void>;
62
- export declare function websiteCreate({ websiteId, data, connectorId }: {
63
- websiteId: WebsiteId;
64
- data: WebsiteMetaFileContent;
65
- connectorId?: ConnectorId;
66
- }): Promise<void>;
67
- export declare function websiteMetaWrite({ websiteId, data, connectorId }: {
68
- websiteId: WebsiteId;
69
- data: WebsiteMetaFileContent;
70
- connectorId?: ConnectorId;
71
- }): Promise<void>;
72
- export declare function websiteMetaRead({ websiteId, connectorId }: {
73
- websiteId: WebsiteId;
74
- connectorId?: ConnectorId;
75
- }): Promise<WebsiteMeta>;
76
- export declare function websiteAssetsLoad({ path, websiteId, connectorId }: {
77
- path: string;
78
- websiteId: WebsiteId;
79
- connectorId: ConnectorId;
80
- }): Promise<string>;
81
- /**
82
- * Not used directly, grapesjs handles the upload
83
- * @see assetManager in src/ts/client/grapesjs/index.ts
84
- */
85
- export declare function websiteAssetsSave({ websiteId, connectorId, files }: {
86
- websiteId: WebsiteId;
87
- connectorId: ConnectorId;
88
- files: ClientSideFile[];
89
- }): Promise<string[]>;
90
- export declare function api<ReqQuery, ReqBody, ResBody>(route: ApiRoute | string, method: string, query?: ReqQuery, payload?: ReqBody): Promise<ResBody>;
@@ -1,118 +0,0 @@
1
- /*
2
- * Silex website builder, free/libre no-code tool for makers.
3
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
4
- *
5
- * This program is free software: you can redistribute it and/or modify
6
- * it under the terms of the GNU Affero General Public License as published by
7
- * the Free Software Foundation, either version 3 of the License, or any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
- * GNU Affero General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU Affero General Public License
15
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
16
- */
17
- import { API_CONNECTOR_LIST, API_CONNECTOR_USER, API_CONNECTOR_LOGOUT, API_CONNECTOR_PATH, API_PATH, API_PUBLICATION_PATH, API_PUBLICATION_PUBLISH, API_PUBLICATION_STATUS, API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_DELETE, API_WEBSITE_LIST, API_WEBSITE_PATH, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_CREATE, API_WEBSITE_DUPLICATE } from '../constants';
18
- import { ApiError } from '../types';
19
- export var ApiRoute;
20
- (function (ApiRoute) {
21
- ApiRoute["PUBLICATION_PUBLISH"] = "/api/publication/";
22
- ApiRoute["PUBLICATION_STATUS"] = "/api/publication/publication/status";
23
- ApiRoute["CONNECTOR_USER"] = "/api/connector/user";
24
- ApiRoute["CONNECTOR_LOGOUT"] = "/api/connector/logout";
25
- ApiRoute["CONNECTOR_LIST"] = "/api/connector/";
26
- ApiRoute["WEBSITE_READ"] = "/api/website/";
27
- ApiRoute["WEBSITE_WRITE"] = "/api/website/";
28
- ApiRoute["WEBSITE_DELETE"] = "/api/website/";
29
- ApiRoute["WEBSITE_DUPLICATE"] = "/api/website/duplicate";
30
- ApiRoute["WEBSITE_CREATE"] = "/api/website/";
31
- ApiRoute["WEBSITE_LIST"] = "/api/website/";
32
- ApiRoute["WEBSITE_ASSETS_READ"] = "/api/website/assets";
33
- ApiRoute["WEBSITE_ASSETS_WRITE"] = "/api/website/assets";
34
- ApiRoute["WEBSITE_META_READ"] = "/api/website/meta";
35
- ApiRoute["WEBSITE_META_WRITE"] = "/api/website/meta";
36
- })(ApiRoute || (ApiRoute = {}));
37
- // Root URL of Silex server, should we use config.rootUrl ?
38
- let serverUrl = window.location.origin + window.location.pathname.replace(/\/$/, '');
39
- export function setServerUrl(url) {
40
- serverUrl = url;
41
- }
42
- export function getServerUrl() {
43
- return serverUrl;
44
- }
45
- export async function getUser({ type, connectorId }) {
46
- return api(ApiRoute.CONNECTOR_USER, 'GET', {
47
- type,
48
- connectorId,
49
- });
50
- }
51
- export async function logout({ type, connectorId }) {
52
- return api(ApiRoute.CONNECTOR_LOGOUT, 'POST', { connectorId, type });
53
- }
54
- export async function publish({ websiteId, hostingId, storageId, data, options }) {
55
- const { url, job } = await api(ApiRoute.PUBLICATION_PUBLISH, 'POST', { websiteId, hostingId, storageId, options }, data);
56
- return [url, job];
57
- }
58
- export async function publicationStatus({ jobId }) {
59
- return api(ApiRoute.PUBLICATION_STATUS, 'GET', { jobId });
60
- }
61
- export async function connectorList({ type }) {
62
- const list = await api(ApiRoute.CONNECTOR_LIST, 'GET', { type });
63
- return list;
64
- }
65
- export async function websiteList({ connectorId }) {
66
- return api(ApiRoute.WEBSITE_LIST, 'GET', { connectorId });
67
- }
68
- export async function websiteLoad({ websiteId, connectorId }) {
69
- return api(ApiRoute.WEBSITE_READ, 'GET', { websiteId, connectorId });
70
- }
71
- export async function websiteSave({ websiteId, data, connectorId }) {
72
- const { message } = await api(ApiRoute.WEBSITE_WRITE, 'POST', { websiteId, connectorId }, data);
73
- }
74
- export async function websiteDelete({ websiteId, connectorId }) {
75
- await api(ApiRoute.WEBSITE_DELETE, 'DELETE', { websiteId, connectorId });
76
- }
77
- export async function websiteDuplicate({ websiteId, connectorId }) {
78
- await api(ApiRoute.WEBSITE_DUPLICATE, 'POST', { websiteId, connectorId });
79
- }
80
- export async function websiteCreate({ websiteId, data, connectorId }) {
81
- await api(ApiRoute.WEBSITE_CREATE, 'PUT', { connectorId }, data);
82
- }
83
- export async function websiteMetaWrite({ websiteId, data, connectorId }) {
84
- await api(ApiRoute.WEBSITE_META_WRITE, 'POST', { websiteId, connectorId }, data);
85
- }
86
- export async function websiteMetaRead({ websiteId, connectorId }) {
87
- return api(ApiRoute.WEBSITE_META_WRITE, 'GET', { websiteId, connectorId });
88
- }
89
- export async function websiteAssetsLoad({ path, websiteId, connectorId }) {
90
- return api(`${ApiRoute.WEBSITE_ASSETS_READ}/${path}`, 'GET', { websiteId, connectorId });
91
- }
92
- /**
93
- * Not used directly, grapesjs handles the upload
94
- * @see assetManager in src/ts/client/grapesjs/index.ts
95
- */
96
- export async function websiteAssetsSave({ websiteId, connectorId, files }) {
97
- const { data } = await api(ApiRoute.WEBSITE_ASSETS_WRITE, 'POST', { websiteId, connectorId }, files);
98
- return data;
99
- }
100
- export async function api(route, method, query, payload) {
101
- const url = `${serverUrl}${route.toString()}?${new URLSearchParams(Object.entries(query)
102
- .filter(([key, value]) => !!value)
103
- .map(([key, value]) => [key, typeof value === 'string' ? value : JSON.stringify(value)])).toString()}`;
104
- const response = await fetch(url, {
105
- method,
106
- headers: {
107
- 'Content-Type': 'application/json',
108
- },
109
- body: payload && JSON.stringify(payload),
110
- credentials: 'include', // sends the cookies with the request
111
- });
112
- if (!response.ok) {
113
- const json = await response.json();
114
- throw new ApiError(json.message, response.status);
115
- }
116
- return response.json();
117
- }
118
- //# sourceMappingURL=api.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/ts/client/api.ts"],"names":[],"mappings":"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"}
@@ -1,54 +0,0 @@
1
- import { Asset, ClientSideFileType, ConnectorId, Page, Style, WebsiteId } from '../types';
2
- /**
3
- * Function to convert a path from it stored version to the displayed version
4
- * Stored version is like `/assets/image.webp`
5
- * Grapesjs version is like `/api/website/assets/image.webp?websiteId=47868975&connectorId=gitlab`
6
- * Exported for unit tests
7
- */
8
- export declare function storedToDisplayed(path: string, websiteId: WebsiteId, storageId: ConnectorId): string;
9
- /**
10
- * Function to convert a path from the one we give to grapesjs to the stored version
11
- * Grapesjs version is like `/api/website/assets/image.webp?websiteId=47868975&connectorId=gitlab`
12
- * Stored version is like `/assets/image.webp`
13
- * @param path the path to convert
14
- * @returns the converted path
15
- * Exported for unit tests
16
- */
17
- export declare function displayedToStored(path: string): string;
18
- /**
19
- * Publication transformer to convert the asset URL during publication
20
- */
21
- export declare const assetsPublicationTransformer: {
22
- transformPath(path: string, type: ClientSideFileType): string;
23
- transformPermalink(path: string, type: ClientSideFileType): string;
24
- };
25
- /**
26
- * Update asset URL to use the current storage connector and website ID
27
- * Assets URLs are stored in the project data in the form `/assets/image.webp`
28
- * This function adds the API path and the connectorId and websiteId like so: `/api/website/assets/image.webp?websiteId=47868975&connectorId=gitlab`
29
- */
30
- export declare function addTempDataToAssetUrl(assets: Asset[], websiteId: WebsiteId, storageId: ConnectorId): Asset[];
31
- /**
32
- * Remove the temporary data from the asset URL
33
- * Remove the API path and the connectorId and websiteId like so: `/assets/image.webp`
34
- */
35
- export declare function removeTempDataFromAssetUrl(assets: Asset[]): Asset[];
36
- /**
37
- * Add temp data to pages
38
- */
39
- export declare function addTempDataToPages(pages: Page[], websiteId: WebsiteId, storageId: ConnectorId): Page[];
40
- /**
41
- * Remove temp data from asset URL in the components
42
- */
43
- export declare function removeTempDataFromPages(pages: Page[]): Page[];
44
- /**
45
- * Add data to stylesheets
46
- * e.g. linear-gradient(to right, #1fb101 0%, #df1313 67%, rgba(234, 97, 97, 255) 78%, white 100%), url('/assets/qIg7JPRc.webp'), linear-gradient(#0ca311 0%, #0ca311 100%)
47
- */
48
- export declare function addTempDataToStyles(styles: Style[], websiteId: WebsiteId, storageId: ConnectorId): Style[];
49
- /**
50
- * Remove temp data from stylesheets
51
- * The property `background-image` contains the URLs of the assets and other values,
52
- * e.g. `linear-gradient(to right, #1fb101 0%, #df1313 67%, rgba(234, 97, 97, 255) 78%, white 100%), url('/api/website/assets/qIg7JPRc.webp?websiteId=default&connectorId=fs-storage'), linear-gradient(#0ca311 0%, #0ca311 100%)`
53
- */
54
- export declare function removeTempDataFromStyles(styles: Style[]): Style[];