diff --git a/cypress/e2e/common/media_library.js b/cypress/e2e/common/media_library.js index 474751b66cd7..891ff1ead402 100644 --- a/cypress/e2e/common/media_library.js +++ b/cypress/e2e/common/media_library.js @@ -51,6 +51,7 @@ function chooseAnImage() { function waitForEntryToLoad() { cy.contains('button', 'Saving...').should('not.exist'); + cy.clock().tick(5000); cy.contains('div', 'Loading entry...').should('not.exist'); } @@ -143,10 +144,18 @@ export default function({ entries, getUser }) { it('should not show draft entry image in global media library', () => { newPostWithImage(entries[0]); - exitEditor(); - goToMediaLibrary(); - assertNoImagesInLibrary(); - matchImageSnapshot(); + cy.clock().then(clock => { + if (clock) { + clock.tick(150); + clock.tick(150); + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(500); + } + exitEditor(); + goToMediaLibrary(); + assertNoImagesInLibrary(); + matchImageSnapshot(); + }); }); it('should show published entry image in global media library', () => { diff --git a/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can change status on and publish multiple entries.json b/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can change status on and publish multiple entries.json index 4be8d195f403..85ed6aad333a 100644 --- a/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can change status on and publish multiple entries.json +++ b/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can change status on and publish multiple entries.json @@ -1235,7 +1235,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC4zMDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC42MDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", "method": "POST", "url": "/.netlify/git/github/git/blobs", "headers": { @@ -1329,7 +1329,7 @@ "status": 201 }, { - "body": "{\"message\":\"Create Post “1970-01-01-second-title”\",\"tree\":\"6b93ee23d19f7ae4a8806339fc2e686080554722\",\"parents\":[\"51309984749e40ea466e1ac66ea634cb985d60c3\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:00.600Z\"}}", + "body": "{\"message\":\"Create Post “1970-01-01-second-title”\",\"tree\":\"6b93ee23d19f7ae4a8806339fc2e686080554722\",\"parents\":[\"51309984749e40ea466e1ac66ea634cb985d60c3\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:00.900Z\"}}", "method": "POST", "url": "/.netlify/git/github/git/commits", "headers": { @@ -1816,7 +1816,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAwLjYwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAxLjIwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", "method": "POST", "url": "/.netlify/git/github/git/blobs", "headers": { @@ -1910,7 +1910,7 @@ "status": 201 }, { - "body": "{\"message\":\"Create Post “1970-01-01-third-title”\",\"tree\":\"a87e3d9d5e6f2b1aa81dfcdfe57ef8fb9f930f87\",\"parents\":[\"51309984749e40ea466e1ac66ea634cb985d60c3\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:00.900Z\"}}", + "body": "{\"message\":\"Create Post “1970-01-01-third-title”\",\"tree\":\"a87e3d9d5e6f2b1aa81dfcdfe57ef8fb9f930f87\",\"parents\":[\"51309984749e40ea466e1ac66ea634cb985d60c3\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:01.500Z\"}}", "method": "POST", "url": "/.netlify/git/github/git/commits", "headers": { diff --git a/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can update an entry.json b/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can update an entry.json index 72acdefd1922..92c21abb826c 100644 --- a/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can update an entry.json +++ b/cypress/fixtures/Git Gateway (GitHub) Backend Editorial Workflow__can update an entry.json @@ -1689,7 +1689,7 @@ "status": 200 }, { - "body": "{\"message\":\"Update Post “1970-01-01-first-title”\",\"tree\":\"9e7a708aa9d0ca8f4e33cfa987984cfc48263d79\",\"parents\":[\"e774625f38ae12e6bdc27574f3238a20bf71b6ca\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:00.600Z\"}}", + "body": "{\"message\":\"Update Post “1970-01-01-first-title”\",\"tree\":\"9e7a708aa9d0ca8f4e33cfa987984cfc48263d79\",\"parents\":[\"e774625f38ae12e6bdc27574f3238a20bf71b6ca\"],\"author\":{\"name\":\"decap\",\"email\":\"decap@p-m.si\",\"date\":\"1970-01-01T00:00:00.900Z\"}}", "method": "POST", "url": "/.netlify/git/github/git/commits", "headers": { diff --git a/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__can publish entry with image.json b/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__can publish entry with image.json index aa90c2f46ad6..6ca36d49e6bb 100644 --- a/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__can publish entry with image.json +++ b/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__can publish entry with image.json @@ -1080,6 +1080,36 @@ "response": "{\n \"url\": \"https://api.github.com/repos/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"html_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"permalink_url\": \"https://github.com/owner/repo/compare/owner:eedb8e2...owner:168a84a\",\n \"diff_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843.diff\",\n \"patch_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843.patch\",\n \"base_commit\": {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OmVlZGI4ZTIxY2VjOTRjNmNjMTE4YzIzNDEzOTMyZjcyNmM2ZTZmNDQ=\",\n \"commit\": {\n \"author\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"committer\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"message\": \"add .lfsconfig\",\n \"tree\": {\n \"sha\": \"76ada5408a3255f99373a2e4bca8994ef38705ed\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/76ada5408a3255f99373a2e4bca8994ef38705ed\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44/comments\",\n \"author\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"committer\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"parents\": [\n {\n \"sha\": \"8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"html_url\": \"https://github.com/owner/repo/commit/8d351de56609df4537efd4ef8915e160580bd8d0\"\n }\n ]\n },\n \"merge_base_commit\": {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OmVlZGI4ZTIxY2VjOTRjNmNjMTE4YzIzNDEzOTMyZjcyNmM2ZTZmNDQ=\",\n \"commit\": {\n \"author\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"committer\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"message\": \"add .lfsconfig\",\n \"tree\": {\n \"sha\": \"76ada5408a3255f99373a2e4bca8994ef38705ed\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/76ada5408a3255f99373a2e4bca8994ef38705ed\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44/comments\",\n \"author\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"committer\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"parents\": [\n {\n \"sha\": \"8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"html_url\": \"https://github.com/owner/repo/commit/8d351de56609df4537efd4ef8915e160580bd8d0\"\n }\n ]\n },\n \"status\": \"ahead\",\n \"ahead_by\": 1,\n \"behind_by\": 0,\n \"total_commits\": 1,\n \"commits\": [\n {\n \"sha\": \"168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OjE2OGE4NGFiYWM2ZWI1NjE5ZmY5NjZmMzAwOGExOTA1YzBkNjg4NDM=\",\n \"commit\": {\n \"author\": {\n \"name\": \"decap\",\n \"email\": \"decap@p-m.si\",\n \"date\": \"1970-01-01T00:00:00Z\"\n },\n \"committer\": {\n \"name\": \"decap\",\n \"email\": \"decap@p-m.si\",\n \"date\": \"1970-01-01T00:00:00Z\"\n },\n \"message\": \"Create Post “1970-01-01-first-title”\",\n \"tree\": {\n \"sha\": \"a4a6d3091570c2216aef0c8248d295071900c007\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/a4a6d3091570c2216aef0c8248d295071900c007\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"html_url\": \"https://github.com/owner/repo/commit/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/168a84abac6eb5619ff966f3008a1905c0d68843/comments\",\n \"author\": null,\n \"committer\": null,\n \"parents\": [\n {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\"\n }\n ]\n }\n ],\n \"files\": [\n {\n \"sha\": \"5712f24a02b758f8b5b5cc34b676cf0b25f53b86\",\n \"filename\": \"content/posts/1970-01-01-first-title.md\",\n \"status\": \"added\",\n \"additions\": 11,\n \"deletions\": 0,\n \"changes\": 11,\n \"blob_url\": \"https://github.com/owner/repo/blob/168a84abac6eb5619ff966f3008a1905c0d68843/content/posts/1970-01-01-first-title.md\",\n \"raw_url\": \"https://github.com/owner/repo/raw/168a84abac6eb5619ff966f3008a1905c0d68843/content/posts/1970-01-01-first-title.md\",\n \"contents_url\": \"https://api.github.com/repos/owner/repo/contents/content/posts/1970-01-01-first-title.md?ref=168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"patch\": \"@@ -0,0 +1,11 @@\\n+---\\n+template: post\\n+title: first title\\n+image: /media/netlify.png\\n+date: 1970-01-01T00:00:00.000Z\\n+description: first description\\n+category: first category\\n+tags:\\n+ - tag1\\n+---\\n+first body\\n\\\\ No newline at end of file\"\n },\n {\n \"sha\": \"a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"filename\": \"static/media/netlify.png\",\n \"status\": \"added\",\n \"additions\": 3,\n \"deletions\": 0,\n \"changes\": 3,\n \"blob_url\": \"https://github.com/owner/repo/blob/168a84abac6eb5619ff966f3008a1905c0d68843/static/media/netlify.png\",\n \"raw_url\": \"https://github.com/owner/repo/raw/168a84abac6eb5619ff966f3008a1905c0d68843/static/media/netlify.png\",\n \"contents_url\": \"https://api.github.com/repos/owner/repo/contents/static/media/netlify.png?ref=168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"patch\": \"@@ -0,0 +1,3 @@\\n+version https://git-lfs.github.com/spec/v1\\n+oid sha256:b1d40c19b912d2130d1bed8ff1a62a55c7d932978502e1d8559eb77951c5e8d3\\n+size 3470\"\n }\n ]\n}\n", "status": 200 }, + { + "method": "GET", + "url": "/.netlify/git/github/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset", + "Alt-Svc": "clear", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Content-Security-Policy": "default-src 'none'", + "Content-Type": "application/json; charset=utf-8", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Server": "Netlify", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "Via": "1.1 google", + "X-Accepted-Oauth-Scopes": "", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "deny", + "X-Github-Media-Type": "github.v3; format=json", + "X-Oauth-Scopes": "delete_repo, repo", + "X-Ratelimit-Limit": "5000", + "X-Xss-Protection": "1; mode=block", + "Age": "1", + "Connection": "keep-alive", + "Vary": "Origin,Accept,Authorization,Cookie,X-GitHub-OTP,Accept-Encoding,Accept,X-Requested-With", + "content-length": "13389" + }, + "response": "{\n \"url\": \"https://api.github.com/repos/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"html_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"permalink_url\": \"https://github.com/owner/repo/compare/owner:eedb8e2...owner:168a84a\",\n \"diff_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843.diff\",\n \"patch_url\": \"https://github.com/owner/repo/compare/master...168a84abac6eb5619ff966f3008a1905c0d68843.patch\",\n \"base_commit\": {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OmVlZGI4ZTIxY2VjOTRjNmNjMTE4YzIzNDEzOTMyZjcyNmM2ZTZmNDQ=\",\n \"commit\": {\n \"author\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"committer\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"message\": \"add .lfsconfig\",\n \"tree\": {\n \"sha\": \"76ada5408a3255f99373a2e4bca8994ef38705ed\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/76ada5408a3255f99373a2e4bca8994ef38705ed\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44/comments\",\n \"author\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"committer\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"parents\": [\n {\n \"sha\": \"8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"html_url\": \"https://github.com/owner/repo/commit/8d351de56609df4537efd4ef8915e160580bd8d0\"\n }\n ]\n },\n \"merge_base_commit\": {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OmVlZGI4ZTIxY2VjOTRjNmNjMTE4YzIzNDEzOTMyZjcyNmM2ZTZmNDQ=\",\n \"commit\": {\n \"author\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"committer\": {\n \"name\": \"owner\",\n \"email\": \"owner@users.noreply.github.com\",\n \"date\": \"2020-05-13T07:13:44Z\"\n },\n \"message\": \"add .lfsconfig\",\n \"tree\": {\n \"sha\": \"76ada5408a3255f99373a2e4bca8994ef38705ed\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/76ada5408a3255f99373a2e4bca8994ef38705ed\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44/comments\",\n \"author\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"committer\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"parents\": [\n {\n \"sha\": \"8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/8d351de56609df4537efd4ef8915e160580bd8d0\",\n \"html_url\": \"https://github.com/owner/repo/commit/8d351de56609df4537efd4ef8915e160580bd8d0\"\n }\n ]\n },\n \"status\": \"ahead\",\n \"ahead_by\": 1,\n \"behind_by\": 0,\n \"total_commits\": 1,\n \"commits\": [\n {\n \"sha\": \"168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"node_id\": \"MDY6Q29tbWl0MjYzNTUzNTU3OjE2OGE4NGFiYWM2ZWI1NjE5ZmY5NjZmMzAwOGExOTA1YzBkNjg4NDM=\",\n \"commit\": {\n \"author\": {\n \"name\": \"decap\",\n \"email\": \"decap@p-m.si\",\n \"date\": \"1970-01-01T00:00:00Z\"\n },\n \"committer\": {\n \"name\": \"decap\",\n \"email\": \"decap@p-m.si\",\n \"date\": \"1970-01-01T00:00:00Z\"\n },\n \"message\": \"Create Post “1970-01-01-first-title”\",\n \"tree\": {\n \"sha\": \"a4a6d3091570c2216aef0c8248d295071900c007\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/a4a6d3091570c2216aef0c8248d295071900c007\"\n },\n \"url\": \"https://api.github.com/repos/owner/repo/git/commits/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"comment_count\": 0,\n \"verification\": {\n \"verified\": false,\n \"reason\": \"unsigned\",\n \"signature\": null,\n \"payload\": null\n }\n },\n \"url\": \"https://api.github.com/repos/owner/repo/commits/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"html_url\": \"https://github.com/owner/repo/commit/168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/commits/168a84abac6eb5619ff966f3008a1905c0d68843/comments\",\n \"author\": null,\n \"committer\": null,\n \"parents\": [\n {\n \"sha\": \"eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/eedb8e21cec94c6cc118c23413932f726c6e6f44\",\n \"html_url\": \"https://github.com/owner/repo/commit/eedb8e21cec94c6cc118c23413932f726c6e6f44\"\n }\n ]\n }\n ],\n \"files\": [\n {\n \"sha\": \"5712f24a02b758f8b5b5cc34b676cf0b25f53b86\",\n \"filename\": \"content/posts/1970-01-01-first-title.md\",\n \"status\": \"added\",\n \"additions\": 11,\n \"deletions\": 0,\n \"changes\": 11,\n \"blob_url\": \"https://github.com/owner/repo/blob/168a84abac6eb5619ff966f3008a1905c0d68843/content/posts/1970-01-01-first-title.md\",\n \"raw_url\": \"https://github.com/owner/repo/raw/168a84abac6eb5619ff966f3008a1905c0d68843/content/posts/1970-01-01-first-title.md\",\n \"contents_url\": \"https://api.github.com/repos/owner/repo/contents/content/posts/1970-01-01-first-title.md?ref=168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"patch\": \"@@ -0,0 +1,11 @@\\n+---\\n+template: post\\n+title: first title\\n+image: /media/netlify.png\\n+date: 1970-01-01T00:00:00.000Z\\n+description: first description\\n+category: first category\\n+tags:\\n+ - tag1\\n+---\\n+first body\\n\\\\ No newline at end of file\"\n },\n {\n \"sha\": \"a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"filename\": \"static/media/netlify.png\",\n \"status\": \"added\",\n \"additions\": 3,\n \"deletions\": 0,\n \"changes\": 3,\n \"blob_url\": \"https://github.com/owner/repo/blob/168a84abac6eb5619ff966f3008a1905c0d68843/static/media/netlify.png\",\n \"raw_url\": \"https://github.com/owner/repo/raw/168a84abac6eb5619ff966f3008a1905c0d68843/static/media/netlify.png\",\n \"contents_url\": \"https://api.github.com/repos/owner/repo/contents/static/media/netlify.png?ref=168a84abac6eb5619ff966f3008a1905c0d68843\",\n \"patch\": \"@@ -0,0 +1,3 @@\\n+version https://git-lfs.github.com/spec/v1\\n+oid sha256:b1d40c19b912d2130d1bed8ff1a62a55c7d932978502e1d8559eb77951c5e8d3\\n+size 3470\"\n }\n ]\n}\n", + "status": 200 + }, { "method": "GET", "url": "/.netlify/git/github/git/blobs/5712f24a02b758f8b5b5cc34b676cf0b25f53b86", @@ -1140,6 +1170,36 @@ "response": "{\n \"sha\": \"a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"node_id\": \"MDQ6QmxvYjI2MzU1MzU1NzphMTM3ZmIzNDU4ZDM5MWYyNzQwZWNjNmViYmRhNTIxMDdkNjVkNmVm\",\n \"size\": 129,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"content\": \"dmVyc2lvbiBodHRwczovL2dpdC1sZnMuZ2l0aHViLmNvbS9zcGVjL3YxCm9p\\nZCBzaGEyNTY6YjFkNDBjMTliOTEyZDIxMzBkMWJlZDhmZjFhNjJhNTVjN2Q5\\nMzI5Nzg1MDJlMWQ4NTU5ZWI3Nzk1MWM1ZThkMwpzaXplIDM0NzAK\\n\",\n \"encoding\": \"base64\"\n}\n", "status": 200 }, + { + "method": "GET", + "url": "/.netlify/git/github/git/blobs/a137fb3458d391f2740ecc6ebbda52107d65d6ef", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset", + "Alt-Svc": "clear", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Content-Security-Policy": "default-src 'none'", + "Content-Type": "application/json; charset=utf-8", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Server": "Netlify", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "Via": "1.1 google", + "X-Accepted-Oauth-Scopes": "", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "deny", + "X-Github-Media-Type": "github.v3; format=json", + "X-Oauth-Scopes": "delete_repo, repo", + "X-Ratelimit-Limit": "5000", + "X-Xss-Protection": "1; mode=block", + "Age": "1", + "Connection": "keep-alive", + "Vary": "Origin,Accept,Authorization,Cookie,X-GitHub-OTP,Accept-Encoding,Accept,X-Requested-With", + "content-length": "539" + }, + "response": "{\n \"sha\": \"a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"node_id\": \"MDQ6QmxvYjI2MzU1MzU1NzphMTM3ZmIzNDU4ZDM5MWYyNzQwZWNjNmViYmRhNTIxMDdkNjVkNmVm\",\n \"size\": 129,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\n \"content\": \"dmVyc2lvbiBodHRwczovL2dpdC1sZnMuZ2l0aHViLmNvbS9zcGVjL3YxCm9p\\nZCBzaGEyNTY6YjFkNDBjMTliOTEyZDIxMzBkMWJlZDhmZjFhNjJhNTVjN2Q5\\nMzI5Nzg1MDJlMWQ4NTU5ZWI3Nzk1MWM1ZThkMwpzaXplIDM0NzAK\\n\",\n \"encoding\": \"base64\"\n}\n", + "status": 200 + }, { "method": "GET", "url": "/.netlify/git/github/commits?path=static/media/netlify.png&sha=master", diff --git a/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__should not show draft entry image in global media library.json b/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__should not show draft entry image in global media library.json index 0ab2e478e631..e1474dc0fa9a 100644 --- a/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__should not show draft entry image in global media library.json +++ b/cypress/fixtures/Git Gateway (GitHub) Backend Media Library - Large Media__should not show draft entry image in global media library.json @@ -593,6 +593,36 @@ "response": "{\n \"sha\": \"34892575e216c06e757093f036bd8e057c78a52f\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/34892575e216c06e757093f036bd8e057c78a52f\",\n \"tree\": [\n {\n \"path\": \"2016-01-09---Perfecting-the-Art-of-Perfection.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"6d51a38aed7139d2117724b1e307657b6ff2d043\",\n \"size\": 1707,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/6d51a38aed7139d2117724b1e307657b6ff2d043\"\n },\n {\n \"path\": \"2016-01-12---The-Origins-of-Social-Stationery-Lettering.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"d0582dd245a3f408fb3fe2333bf01400007476e9\",\n \"size\": 2565,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/d0582dd245a3f408fb3fe2333bf01400007476e9\"\n },\n {\n \"path\": \"2016-02-02---A-Brief-History-of-Typography.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"0eea554365f002d0f1572af9a58522d335a794d5\",\n \"size\": 2786,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/0eea554365f002d0f1572af9a58522d335a794d5\"\n },\n {\n \"path\": \"2017-18-08---The-Birth-of-Movable-Type.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"44f78c474d04273185a95821426f75affc9b0044\",\n \"size\": 16071,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/44f78c474d04273185a95821426f75affc9b0044\"\n },\n {\n \"path\": \"2017-19-08---Humane-Typography-in-the-Digital-Age.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"a532f0a9445cdf90a19c6812cff89d1674991774\",\n \"size\": 7465,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/a532f0a9445cdf90a19c6812cff89d1674991774\"\n }\n ],\n \"truncated\": false\n}\n", "status": 200 }, + { + "method": "GET", + "url": "/.netlify/git/github/git/trees/master:content%2Fposts", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset", + "Alt-Svc": "clear", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Content-Security-Policy": "default-src 'none'", + "Content-Type": "application/json; charset=utf-8", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Server": "Netlify", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "Via": "1.1 google", + "X-Accepted-Oauth-Scopes": "", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "deny", + "X-Github-Media-Type": "github.v3; format=json", + "X-Oauth-Scopes": "delete_repo, repo", + "X-Ratelimit-Limit": "5000", + "X-Xss-Protection": "1; mode=block", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept,Authorization,Cookie,X-GitHub-OTP,Accept-Encoding,Accept,X-Requested-With", + "content-length": "2060" + }, + "response": "{\n \"sha\": \"34892575e216c06e757093f036bd8e057c78a52f\",\n \"url\": \"https://api.github.com/repos/owner/repo/git/trees/34892575e216c06e757093f036bd8e057c78a52f\",\n \"tree\": [\n {\n \"path\": \"2016-01-09---Perfecting-the-Art-of-Perfection.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"6d51a38aed7139d2117724b1e307657b6ff2d043\",\n \"size\": 1707,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/6d51a38aed7139d2117724b1e307657b6ff2d043\"\n },\n {\n \"path\": \"2016-01-12---The-Origins-of-Social-Stationery-Lettering.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"d0582dd245a3f408fb3fe2333bf01400007476e9\",\n \"size\": 2565,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/d0582dd245a3f408fb3fe2333bf01400007476e9\"\n },\n {\n \"path\": \"2016-02-02---A-Brief-History-of-Typography.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"0eea554365f002d0f1572af9a58522d335a794d5\",\n \"size\": 2786,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/0eea554365f002d0f1572af9a58522d335a794d5\"\n },\n {\n \"path\": \"2017-18-08---The-Birth-of-Movable-Type.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"44f78c474d04273185a95821426f75affc9b0044\",\n \"size\": 16071,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/44f78c474d04273185a95821426f75affc9b0044\"\n },\n {\n \"path\": \"2017-19-08---Humane-Typography-in-the-Digital-Age.md\",\n \"mode\": \"100644\",\n \"type\": \"blob\",\n \"sha\": \"a532f0a9445cdf90a19c6812cff89d1674991774\",\n \"size\": 7465,\n \"url\": \"https://api.github.com/repos/owner/repo/git/blobs/a532f0a9445cdf90a19c6812cff89d1674991774\"\n }\n ],\n \"truncated\": false\n}\n", + "status": 200 + }, { "method": "GET", "url": "/.netlify/git/github/git/trees/master:", @@ -1248,6 +1278,36 @@ "response": "{\n \"state\": \"pending\",\n \"statuses\": [\n\n ],\n \"sha\": \"b71c249fecb69096f7bc51adbce1601ce3d78650\",\n \"total_count\": 0,\n \"repository\": {\n \"id\": 255075943,\n \"node_id\": \"MDEwOlJlcG9zaXRvcnkyNTUwNzU5NDM=\",\n \"name\": \"repo\",\n \"full_name\": \"owner/repo\",\n \"private\": false,\n \"owner\": {\n \"login\": \"owner\",\n \"id\": 26760571,\n \"node_id\": \"MDQ6VXNlcjI2NzYwNTcx\",\n \"avatar_url\": \"https://avatars1.githubusercontent.com/u/7892489?v=4\",\n \"gravatar_id\": \"\",\n \"url\": \"https://api.github.com/users/owner\",\n \"html_url\": \"https://github.com/owner\",\n \"followers_url\": \"https://api.github.com/users/owner/followers\",\n \"following_url\": \"https://api.github.com/users/owner/following{/other_user}\",\n \"gists_url\": \"https://api.github.com/users/owner/gists{/gist_id}\",\n \"starred_url\": \"https://api.github.com/users/owner/starred{/owner}{/repo}\",\n \"subscriptions_url\": \"https://api.github.com/users/owner/subscriptions\",\n \"organizations_url\": \"https://api.github.com/users/owner/orgs\",\n \"repos_url\": \"https://api.github.com/users/owner/repos\",\n \"events_url\": \"https://api.github.com/users/owner/events{/privacy}\",\n \"received_events_url\": \"https://api.github.com/users/owner/received_events\",\n \"type\": \"User\",\n \"site_admin\": false\n },\n \"html_url\": \"https://github.com/owner/repo\",\n \"description\": null,\n \"fork\": false,\n \"url\": \"https://api.github.com/repos/owner/repo\",\n \"forks_url\": \"https://api.github.com/repos/owner/repo/forks\",\n \"keys_url\": \"https://api.github.com/repos/owner/repo/keys{/key_id}\",\n \"collaborators_url\": \"https://api.github.com/repos/owner/repo/collaborators{/collaborator}\",\n \"teams_url\": \"https://api.github.com/repos/owner/repo/teams\",\n \"hooks_url\": \"https://api.github.com/repos/owner/repo/hooks\",\n \"issue_events_url\": \"https://api.github.com/repos/owner/repo/issues/events{/number}\",\n \"events_url\": \"https://api.github.com/repos/owner/repo/events\",\n \"assignees_url\": \"https://api.github.com/repos/owner/repo/assignees{/user}\",\n \"branches_url\": \"https://api.github.com/repos/owner/repo/branches{/branch}\",\n \"tags_url\": \"https://api.github.com/repos/owner/repo/tags\",\n \"blobs_url\": \"https://api.github.com/repos/owner/repo/git/blobs{/sha}\",\n \"git_tags_url\": \"https://api.github.com/repos/owner/repo/git/tags{/sha}\",\n \"git_refs_url\": \"https://api.github.com/repos/owner/repo/git/refs{/sha}\",\n \"trees_url\": \"https://api.github.com/repos/owner/repo/git/trees{/sha}\",\n \"statuses_url\": \"https://api.github.com/repos/owner/repo/statuses/{sha}\",\n \"languages_url\": \"https://api.github.com/repos/owner/repo/languages\",\n \"stargazers_url\": \"https://api.github.com/repos/owner/repo/stargazers\",\n \"contributors_url\": \"https://api.github.com/repos/owner/repo/contributors\",\n \"subscribers_url\": \"https://api.github.com/repos/owner/repo/subscribers\",\n \"subscription_url\": \"https://api.github.com/repos/owner/repo/subscription\",\n \"commits_url\": \"https://api.github.com/repos/owner/repo/commits{/sha}\",\n \"git_commits_url\": \"https://api.github.com/repos/owner/repo/git/commits{/sha}\",\n \"comments_url\": \"https://api.github.com/repos/owner/repo/comments{/number}\",\n \"issue_comment_url\": \"https://api.github.com/repos/owner/repo/issues/comments{/number}\",\n \"contents_url\": \"https://api.github.com/repos/owner/repo/contents/{+path}\",\n \"compare_url\": \"https://api.github.com/repos/owner/repo/compare/{base}...{head}\",\n \"merges_url\": \"https://api.github.com/repos/owner/repo/merges\",\n \"archive_url\": \"https://api.github.com/repos/owner/repo/{archive_format}{/ref}\",\n \"downloads_url\": \"https://api.github.com/repos/owner/repo/downloads\",\n \"issues_url\": \"https://api.github.com/repos/owner/repo/issues{/number}\",\n \"pulls_url\": \"https://api.github.com/repos/owner/repo/pulls{/number}\",\n \"milestones_url\": \"https://api.github.com/repos/owner/repo/milestones{/number}\",\n \"notifications_url\": \"https://api.github.com/repos/owner/repo/notifications{?since,all,participating}\",\n \"labels_url\": \"https://api.github.com/repos/owner/repo/labels{/name}\",\n \"releases_url\": \"https://api.github.com/repos/owner/repo/releases{/id}\",\n \"deployments_url\": \"https://api.github.com/repos/owner/repo/deployments\"\n },\n \"commit_url\": \"https://api.github.com/repos/owner/repo/commits/b71c249fecb69096f7bc51adbce1601ce3d78650\",\n \"url\": \"https://api.github.com/repos/owner/repo/commits/b71c249fecb69096f7bc51adbce1601ce3d78650/status\"\n}\n", "status": 200 }, + { + "method": "GET", + "url": "/.netlify/git/github/pulls?head=owner:cms/posts/1970-01-01-first-title&base=master&state=open&per_page=100", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset", + "Alt-Svc": "clear", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Content-Security-Policy": "default-src 'none'", + "Content-Type": "application/json; charset=utf-8", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Server": "Netlify", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "Via": "1.1 google", + "X-Accepted-Oauth-Scopes": "", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "deny", + "X-Github-Media-Type": "github.v3; format=json", + "X-Oauth-Scopes": "delete_repo, repo", + "X-Ratelimit-Limit": "5000", + "X-Xss-Protection": "1; mode=block", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Accept,Authorization,Cookie,X-GitHub-OTP,Accept-Encoding,Accept,X-Requested-With", + "content-length": "5" + }, + "response": "[\n\n]\n", + "status": 200 + }, { "method": "GET", "url": "/.netlify/git/github/pulls?head=owner:cms/posts/1970-01-01-first-title&base=master&state=open&per_page=100", diff --git a/cypress/fixtures/Git Gateway (GitLab) Backend Editorial Workflow__can change status on and publish multiple entries.json b/cypress/fixtures/Git Gateway (GitLab) Backend Editorial Workflow__can change status on and publish multiple entries.json index ba630af96eb7..e419133cb69b 100644 --- a/cypress/fixtures/Git Gateway (GitLab) Backend Editorial Workflow__can change status on and publish multiple entries.json +++ b/cypress/fixtures/Git Gateway (GitLab) Backend Editorial Workflow__can change status on and publish multiple entries.json @@ -1184,7 +1184,7 @@ "status": 200 }, { - "body": "{\"branch\":\"cms/posts/1970-01-01-second-title\",\"commit_message\":\"Create Post “1970-01-01-second-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-second-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC4zMDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}],\"start_branch\":\"master\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\"}", + "body": "{\"branch\":\"cms/posts/1970-01-01-second-title\",\"commit_message\":\"Create Post “1970-01-01-second-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-second-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC42MDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}],\"start_branch\":\"master\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\"}", "method": "POST", "url": "/.netlify/git/gitlab/repository/commits", "headers": { @@ -1687,7 +1687,7 @@ "status": 404 }, { - "body": "{\"branch\":\"cms/posts/1970-01-01-third-title\",\"commit_message\":\"Create Post “1970-01-01-third-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-third-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAwLjYwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}],\"start_branch\":\"master\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\"}", + "body": "{\"branch\":\"cms/posts/1970-01-01-third-title\",\"commit_message\":\"Create Post “1970-01-01-third-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-third-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAxLjIwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}],\"start_branch\":\"master\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\"}", "method": "POST", "url": "/.netlify/git/gitlab/repository/commits", "headers": { diff --git a/cypress/fixtures/Git Gateway (GitLab) Backend Media Library - Large Media__can publish entry with image.json b/cypress/fixtures/Git Gateway (GitLab) Backend Media Library - Large Media__can publish entry with image.json index 28a683380f70..4ed93cd5106e 100644 --- a/cypress/fixtures/Git Gateway (GitLab) Backend Media Library - Large Media__can publish entry with image.json +++ b/cypress/fixtures/Git Gateway (GitLab) Backend Media Library - Large Media__can publish entry with image.json @@ -1577,6 +1577,681 @@ "response": "---\ntemplate: post\ntitle: first title\nimage: /media/netlify.png\ndate: 1970-01-01T00:00:00.000Z\ndescription: first description\ncategory: first category\ntags:\n - tag1\n---\nfirst body", "status": 200 }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Accept-Ranges": "bytes", + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d53334ecf9d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d59717699950dd0325cd11be99ebfc0321586698468; expires=Tue, 12-May-20 13:34:28 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "0", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Origin", + "content-length": "2" + }, + "response": "[]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/compare?from=master&to=7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52cdfdc8e1de-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d8a387a08d540bfc2d63bb31da9babd541586698452; expires=Tue, 12-May-20 13:34:12 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "2182" + }, + "response": "{\"commit\":{\"id\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"short_id\":\"7d5888c4\",\"created_at\":\"2020-04-12T13:34:08.000+00:00\",\"parent_ids\":[\"154def7c46451986e53d4d3d9177576aef9ea7f4\"],\"title\":\"Create Post “1970-01-01-first-title”\",\"message\":\"Create Post “1970-01-01-first-title”\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\",\"authored_date\":\"2020-04-12T13:34:08.000+00:00\",\"committer_name\":\"owner\",\"committer_email\":\"owner@gmail.com\",\"committed_date\":\"2020-04-12T13:34:08.000+00:00\",\"web_url\":\"https://gitlab.com/owner/repo/-/commit/7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\"},\"commits\":[{\"id\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"short_id\":\"7d5888c4\",\"created_at\":\"2020-04-12T13:34:08.000+00:00\",\"parent_ids\":[\"154def7c46451986e53d4d3d9177576aef9ea7f4\"],\"title\":\"Create Post “1970-01-01-first-title”\",\"message\":\"Create Post “1970-01-01-first-title”\",\"author_name\":\"decap\",\"author_email\":\"decap@p-m.si\",\"authored_date\":\"2020-04-12T13:34:08.000+00:00\",\"committer_name\":\"owner\",\"committer_email\":\"owner@gmail.com\",\"committed_date\":\"2020-04-12T13:34:08.000+00:00\",\"web_url\":\"https://gitlab.com/owner/repo/-/commit/7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\"}],\"diffs\":[{\"old_path\":\"content/posts/1970-01-01-first-title.md\",\"new_path\":\"content/posts/1970-01-01-first-title.md\",\"a_mode\":\"0\",\"b_mode\":\"100644\",\"new_file\":true,\"renamed_file\":false,\"deleted_file\":false,\"diff\":\"@@ -0,0 +1,11 @@\\n+---\\n+template: post\\n+title: first title\\n+image: /media/netlify.png\\n+date: 1970-01-01T00:00:00.000Z\\n+description: first description\\n+category: first category\\n+tags:\\n+ - tag1\\n+---\\n+first body\\n\\\\ No newline at end of file\\n\"},{\"old_path\":\"static/media/netlify.png\",\"new_path\":\"static/media/netlify.png\",\"a_mode\":\"0\",\"b_mode\":\"100644\",\"new_file\":true,\"renamed_file\":false,\"deleted_file\":false,\"diff\":\"@@ -0,0 +1,3 @@\\n+version https://git-lfs.github.com/spec/v1\\n+oid sha256:b1d40c19b912d2130d1bed8ff1a62a55c7d932978502e1d8559eb77951c5e8d3\\n+size 3470\\n\"}],\"compare_timeout\":false,\"compare_same_ref\":false}", + "status": 200 + }, + { + "method": "HEAD", + "url": "/.netlify/git/gitlab/repository/files/static%2Fmedia%2Fnetlify.png?ref=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "no-cache", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52d30d639d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=dc3f2404a86e158ca70d3d643027824ba1586698452; expires=Tue, 12-May-20 13:34:12 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Gitlab-Blob-Id": "a137fb3458d391f2740ecc6ebbda52107d65d6ef", + "X-Gitlab-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Content-Sha256": "0b7f88af5df603865465cf38968bf912eb60b5d4a0279c190f7723544bcd5456", + "X-Gitlab-Encoding": "base64", + "X-Gitlab-File-Name": "netlify.png", + "X-Gitlab-File-Path": "static/media/netlify.png", + "X-Gitlab-Last-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Ref": "cms/posts/1970-01-01-first-title", + "X-Gitlab-Size": "129", + "Age": "1", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "0" + }, + "response": null, + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/files/content%2Fposts%2F1970-01-01-first-title.md/raw?ref=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate, no-store, no-cache", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52d6c87a9d89-ORD", + "Content-Disposition": "inline; filename=\"1970-01-01-first-title.md\"; filename*=UTF-8''1970-01-01-first-title.md", + "Content-Type": "text/plain; charset=utf-8", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Expires": "Fri, 01 Jan 1990 00:00:00 GMT", + "Gitlab-Sv": "localhost", + "Pragma": "no-cache", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d97f5898735831a4057c91edaddca0fd81586698453; expires=Tue, 12-May-20 13:34:13 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Gitlab-Blob-Id": "5712f24a02b758f8b5b5cc34b676cf0b25f53b86", + "X-Gitlab-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Content-Sha256": "1ebac253486a1e755650dcd96613c81cabb7b2c7626ee02d1183ea4b2c384940", + "X-Gitlab-Encoding": "base64", + "X-Gitlab-File-Name": "1970-01-01-first-title.md", + "X-Gitlab-File-Path": "content/posts/1970-01-01-first-title.md", + "X-Gitlab-Last-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Ref": "cms/posts/1970-01-01-first-title", + "X-Gitlab-Size": "180", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "180" + }, + "response": "---\ntemplate: post\ntitle: first title\nimage: /media/netlify.png\ndate: 1970-01-01T00:00:00.000Z\ndescription: first description\ncategory: first category\ntags:\n - tag1\n---\nfirst body", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/files/static%2Fmedia%2Fnetlify.png/raw?ref=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate, no-store, no-cache", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52db5c56e1de-ORD", + "Content-Disposition": "inline; filename=\"netlify.png\"; filename*=UTF-8''netlify.png", + "Content-Type": "text/plain; charset=utf-8", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Expires": "Fri, 01 Jan 1990 00:00:00 GMT", + "Gitlab-Sv": "localhost", + "Pragma": "no-cache", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d350cbf0f883d92477e3e2b5bbd2c49f41586698454; expires=Tue, 12-May-20 13:34:14 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Gitlab-Blob-Id": "a137fb3458d391f2740ecc6ebbda52107d65d6ef", + "X-Gitlab-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Content-Sha256": "0b7f88af5df603865465cf38968bf912eb60b5d4a0279c190f7723544bcd5456", + "X-Gitlab-Encoding": "base64", + "X-Gitlab-File-Name": "netlify.png", + "X-Gitlab-File-Path": "static/media/netlify.png", + "X-Gitlab-Last-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Ref": "cms/posts/1970-01-01-first-title", + "X-Gitlab-Size": "129", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "129" + }, + "response": "version https://git-lfs.github.com/spec/v1\noid sha256:b1d40c19b912d2130d1bed8ff1a62a55c7d932978502e1d8559eb77951c5e8d3\nsize 3470\n", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/commits?path=static/media/netlify.png&ref_name=master", + "headers": { + "Accept-Ranges": "bytes", + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52dbac049d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d238c021a9cd509d8b29a1f9f360425001586698454; expires=Tue, 12-May-20 13:34:14 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "0", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Origin", + "content-length": "2" + }, + "response": "[]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/large-media/origin/b1d40c19b912d2130d1bed8ff1a62a55c7d932978502e1d8559eb77951c5e8d3?nf_resize=fit&w=560&h=320", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Origin": "*", + "Alt-Svc": "clear", + "Cache-Control": "public, max-age=0, must-revalidate", + "Content-Length": "8467", + "Content-Type": "image/png", + "Via": "1.1 google", + "X-Bb-Gen-Id": "", + "Age": "0", + "Connection": "keep-alive", + "Server": "Netlify", + "Vary": "Origin" + }, + "response": { + "encoding": "base64", + "content": "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" + }, + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52e6abc8e1de-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=da3c960bbbf1887aa041250e3c14ca41a1586698456; expires=Tue, 12-May-20 13:34:16 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "1", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "1613" + }, + "response": "[{\"id\":55487773,\"iid\":1,\"project_id\":18084683,\"title\":\"Create Post “1970-01-01-first-title”\",\"description\":\"Automatically generated by Decap CMS\",\"state\":\"opened\",\"created_at\":\"2020-04-12T13:34:10.166Z\",\"updated_at\":\"2020-04-12T13:34:10.166Z\",\"merged_by\":null,\"merged_at\":null,\"closed_by\":null,\"closed_at\":null,\"target_branch\":\"master\",\"source_branch\":\"cms/posts/1970-01-01-first-title\",\"user_notes_count\":0,\"upvotes\":0,\"downvotes\":0,\"assignee\":null,\"author\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"assignees\":[],\"source_project_id\":18084683,\"target_project_id\":18084683,\"labels\":[\"decap-cms/draft\"],\"work_in_progress\":false,\"milestone\":null,\"merge_when_pipeline_succeeds\":false,\"merge_status\":\"can_be_merged\",\"sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"merge_commit_sha\":null,\"squash_commit_sha\":null,\"discussion_locked\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":true,\"reference\":\"!1\",\"references\":{\"short\":\"!1\",\"relative\":\"!1\",\"full\":\"owner/repo!1\"},\"web_url\":\"https://gitlab.com/owner/repo/-/merge_requests/1\",\"time_stats\":{\"time_estimate\":0,\"total_time_spent\":0,\"human_time_estimate\":null,\"human_total_time_spent\":null},\"squash\":false,\"task_completion_status\":{\"count\":0,\"completed_count\":0},\"has_conflicts\":false,\"blocking_discussions_resolved\":true,\"approvals_before_merge\":null}]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52eb6a419d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d582797da18f99daa9893ad6e307ca52a1586698456; expires=Tue, 12-May-20 13:34:16 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "1", + "X-Total-Pages": "1", + "Age": "1", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "1613" + }, + "response": "[{\"id\":55487773,\"iid\":1,\"project_id\":18084683,\"title\":\"Create Post “1970-01-01-first-title”\",\"description\":\"Automatically generated by Decap CMS\",\"state\":\"opened\",\"created_at\":\"2020-04-12T13:34:10.166Z\",\"updated_at\":\"2020-04-12T13:34:10.166Z\",\"merged_by\":null,\"merged_at\":null,\"closed_by\":null,\"closed_at\":null,\"target_branch\":\"master\",\"source_branch\":\"cms/posts/1970-01-01-first-title\",\"user_notes_count\":0,\"upvotes\":0,\"downvotes\":0,\"assignee\":null,\"author\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"assignees\":[],\"source_project_id\":18084683,\"target_project_id\":18084683,\"labels\":[\"decap-cms/draft\"],\"work_in_progress\":false,\"milestone\":null,\"merge_when_pipeline_succeeds\":false,\"merge_status\":\"can_be_merged\",\"sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"merge_commit_sha\":null,\"squash_commit_sha\":null,\"discussion_locked\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":true,\"reference\":\"!1\",\"references\":{\"short\":\"!1\",\"relative\":\"!1\",\"full\":\"owner/repo!1\"},\"web_url\":\"https://gitlab.com/owner/repo/-/merge_requests/1\",\"time_stats\":{\"time_estimate\":0,\"total_time_spent\":0,\"human_time_estimate\":null,\"human_total_time_spent\":null},\"squash\":false,\"task_completion_status\":{\"count\":0,\"completed_count\":0},\"has_conflicts\":false,\"blocking_discussions_resolved\":true,\"approvals_before_merge\":null}]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/commits/7d5888c4fca42055cec7d97bcc2a4dc98e18c37c/statuses?ref=cms/posts/1970-01-01-first-title", + "headers": { + "Accept-Ranges": "bytes", + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52eb9f37e1de-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=da3c960bbbf1887aa041250e3c14ca41a1586698456; expires=Tue, 12-May-20 13:34:16 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "0", + "X-Total-Pages": "1", + "Age": "1", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Origin", + "content-length": "2" + }, + "response": "[]", + "status": 200 + }, + { + "method": "PUT", + "url": "/.netlify/git/gitlab/merge_requests/1?labels=decap-cms/pending_publish", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52f02f1e9d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d1b7af1c78fdbb2c11bd488374406da491586698457; expires=Tue, 12-May-20 13:34:17 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "2020" + }, + "response": "{\"id\":55487773,\"iid\":1,\"project_id\":18084683,\"title\":\"Create Post “1970-01-01-first-title”\",\"description\":\"Automatically generated by Decap CMS\",\"state\":\"opened\",\"created_at\":\"2020-04-12T13:34:10.166Z\",\"updated_at\":\"2020-04-12T13:34:17.751Z\",\"merged_by\":null,\"merged_at\":null,\"closed_by\":null,\"closed_at\":null,\"target_branch\":\"master\",\"source_branch\":\"cms/posts/1970-01-01-first-title\",\"user_notes_count\":0,\"upvotes\":0,\"downvotes\":0,\"assignee\":null,\"author\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"assignees\":[],\"source_project_id\":18084683,\"target_project_id\":18084683,\"labels\":[\"decap-cms/pending_publish\"],\"work_in_progress\":false,\"milestone\":null,\"merge_when_pipeline_succeeds\":false,\"merge_status\":\"can_be_merged\",\"sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"merge_commit_sha\":null,\"squash_commit_sha\":null,\"discussion_locked\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":true,\"reference\":\"!1\",\"references\":{\"short\":\"!1\",\"relative\":\"!1\",\"full\":\"owner/repo!1\"},\"web_url\":\"https://gitlab.com/owner/repo/-/merge_requests/1\",\"time_stats\":{\"time_estimate\":0,\"total_time_spent\":0,\"human_time_estimate\":null,\"human_total_time_spent\":null},\"squash\":false,\"task_completion_status\":{\"count\":0,\"completed_count\":0},\"has_conflicts\":false,\"blocking_discussions_resolved\":true,\"approvals_before_merge\":null,\"subscribed\":true,\"changes_count\":\"2\",\"latest_build_started_at\":null,\"latest_build_finished_at\":null,\"first_deployed_to_production_at\":null,\"pipeline\":null,\"head_pipeline\":null,\"diff_refs\":{\"base_sha\":\"154def7c46451986e53d4d3d9177576aef9ea7f4\",\"head_sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"start_sha\":\"154def7c46451986e53d4d3d9177576aef9ea7f4\"},\"merge_error\":null,\"user\":{\"can_merge\":true}}", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d52fafec0c528-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d7b4e157d3e0ff745073c71d1c59fae9d1586698459; expires=Tue, 12-May-20 13:34:19 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "1", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "1623" + }, + "response": "[{\"id\":55487773,\"iid\":1,\"project_id\":18084683,\"title\":\"Create Post “1970-01-01-first-title”\",\"description\":\"Automatically generated by Decap CMS\",\"state\":\"opened\",\"created_at\":\"2020-04-12T13:34:10.166Z\",\"updated_at\":\"2020-04-12T13:34:17.751Z\",\"merged_by\":null,\"merged_at\":null,\"closed_by\":null,\"closed_at\":null,\"target_branch\":\"master\",\"source_branch\":\"cms/posts/1970-01-01-first-title\",\"user_notes_count\":0,\"upvotes\":0,\"downvotes\":0,\"assignee\":null,\"author\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"assignees\":[],\"source_project_id\":18084683,\"target_project_id\":18084683,\"labels\":[\"decap-cms/pending_publish\"],\"work_in_progress\":false,\"milestone\":null,\"merge_when_pipeline_succeeds\":false,\"merge_status\":\"can_be_merged\",\"sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"merge_commit_sha\":null,\"squash_commit_sha\":null,\"discussion_locked\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":true,\"reference\":\"!1\",\"references\":{\"short\":\"!1\",\"relative\":\"!1\",\"full\":\"owner/repo!1\"},\"web_url\":\"https://gitlab.com/owner/repo/-/merge_requests/1\",\"time_stats\":{\"time_estimate\":0,\"total_time_spent\":0,\"human_time_estimate\":null,\"human_total_time_spent\":null},\"squash\":false,\"task_completion_status\":{\"count\":0,\"completed_count\":0},\"has_conflicts\":false,\"blocking_discussions_resolved\":true,\"approvals_before_merge\":null}]", + "status": 200 + }, + { + "method": "PUT", + "url": "/.netlify/git/gitlab/merge_requests/1/merge?merge_commit_message=Automatically generated. Merged on Decap CMS.&squash_commit_message=Automatically generated. Merged on Decap CMS.&squash=false&should_remove_source_branch=true", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d53003bc5e1de-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d794f87b23027dc9ed9e5b41e1beb9b651586698460; expires=Tue, 12-May-20 13:34:20 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "Age": "2", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "2296" + }, + "response": "{\"id\":55487773,\"iid\":1,\"project_id\":18084683,\"title\":\"Create Post “1970-01-01-first-title”\",\"description\":\"Automatically generated by Decap CMS\",\"state\":\"merged\",\"created_at\":\"2020-04-12T13:34:10.166Z\",\"updated_at\":\"2020-04-12T13:34:21.085Z\",\"merged_by\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"merged_at\":\"2020-04-12T13:34:21.108Z\",\"closed_by\":null,\"closed_at\":null,\"target_branch\":\"master\",\"source_branch\":\"cms/posts/1970-01-01-first-title\",\"user_notes_count\":0,\"upvotes\":0,\"downvotes\":0,\"assignee\":null,\"author\":{\"id\":4843565,\"name\":\"owner\",\"username\":\"owner\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/2c95a9ee2f890f6c9ccdbf2438c88ca7?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/owner\"},\"assignees\":[],\"source_project_id\":18084683,\"target_project_id\":18084683,\"labels\":[\"decap-cms/pending_publish\"],\"work_in_progress\":false,\"milestone\":null,\"merge_when_pipeline_succeeds\":false,\"merge_status\":\"can_be_merged\",\"sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"merge_commit_sha\":\"409811aa7b81dccb5216c360e2adda41c797dc3a\",\"squash_commit_sha\":null,\"discussion_locked\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":true,\"reference\":\"!1\",\"references\":{\"short\":\"!1\",\"relative\":\"!1\",\"full\":\"owner/repo!1\"},\"web_url\":\"https://gitlab.com/owner/repo/-/merge_requests/1\",\"time_stats\":{\"time_estimate\":0,\"total_time_spent\":0,\"human_time_estimate\":null,\"human_total_time_spent\":null},\"squash\":false,\"task_completion_status\":{\"count\":0,\"completed_count\":0},\"has_conflicts\":false,\"blocking_discussions_resolved\":true,\"approvals_before_merge\":null,\"subscribed\":true,\"changes_count\":\"2\",\"latest_build_started_at\":null,\"latest_build_finished_at\":null,\"first_deployed_to_production_at\":null,\"pipeline\":null,\"head_pipeline\":null,\"diff_refs\":{\"base_sha\":\"154def7c46451986e53d4d3d9177576aef9ea7f4\",\"head_sha\":\"7d5888c4fca42055cec7d97bcc2a4dc98e18c37c\",\"start_sha\":\"154def7c46451986e53d4d3d9177576aef9ea7f4\"},\"merge_error\":null,\"user\":{\"can_merge\":true}}", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Accept-Ranges": "bytes", + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d530f7826c528-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d14534926280e6643c774112d39407c371586698462; expires=Tue, 12-May-20 13:34:22 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "0", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Origin", + "content-length": "2" + }, + "response": "[]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/tree?path=static/media&ref=master&per_page=100&recursive=false", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d53103bfa9d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=de4683d0db08d290ff191cc2b4f0026201586698462; expires=Tue, 12-May-20 13:34:22 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "100", + "X-Prev-Page": "", + "X-Total": "1", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "136" + }, + "response": "[{\"id\":\"a137fb3458d391f2740ecc6ebbda52107d65d6ef\",\"name\":\"netlify.png\",\"type\":\"blob\",\"path\":\"static/media/netlify.png\",\"mode\":\"100644\"}]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/files/content%2Fposts%2F1970-01-01-first-title.md/raw?ref=master", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate, no-store, no-cache", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d53165de7e1de-ORD", + "Content-Disposition": "inline; filename=\"1970-01-01-first-title.md\"; filename*=UTF-8''1970-01-01-first-title.md", + "Content-Type": "text/plain; charset=utf-8", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Expires": "Fri, 01 Jan 1990 00:00:00 GMT", + "Gitlab-Sv": "localhost", + "Pragma": "no-cache", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d639cd5dc80e59d1fd21c005d77921d041586698463; expires=Tue, 12-May-20 13:34:23 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Gitlab-Blob-Id": "5712f24a02b758f8b5b5cc34b676cf0b25f53b86", + "X-Gitlab-Commit-Id": "409811aa7b81dccb5216c360e2adda41c797dc3a", + "X-Gitlab-Content-Sha256": "1ebac253486a1e755650dcd96613c81cabb7b2c7626ee02d1183ea4b2c384940", + "X-Gitlab-Encoding": "base64", + "X-Gitlab-File-Name": "1970-01-01-first-title.md", + "X-Gitlab-File-Path": "content/posts/1970-01-01-first-title.md", + "X-Gitlab-Last-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Ref": "master", + "X-Gitlab-Size": "180", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "180" + }, + "response": "---\ntemplate: post\ntitle: first title\nimage: /media/netlify.png\ndate: 1970-01-01T00:00:00.000Z\ndescription: first description\ncategory: first category\ntags:\n - tag1\n---\nfirst body", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", + "headers": { + "Accept-Ranges": "bytes", + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d531d4dc79d89-ORD", + "Content-Type": "application/json", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Gitlab-Sv": "localhost", + "Link": "; rel=\"first\",; rel=\"last\"", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=d366d858572c49304788a63ffc2088a6e1586698464; expires=Tue, 12-May-20 13:34:24 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Next-Page": "", + "X-Page": "1", + "X-Per-Page": "20", + "X-Prev-Page": "", + "X-Total": "0", + "X-Total-Pages": "1", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Accept-Encoding,Origin", + "content-length": "2" + }, + "response": "[]", + "status": 200 + }, + { + "method": "GET", + "url": "/.netlify/git/gitlab/repository/files/content%2Fposts%2F1970-01-01-first-title.md/raw?ref=master", + "headers": { + "Access-Control-Allow-Credentials": "true", + "Access-Control-Allow-Methods": "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS", + "Access-Control-Allow-Origin": "http://localhost:8080", + "Access-Control-Expose-Headers": "Link, X-Total, X-Total-Pages, X-Per-Page, X-Page, X-Next-Page, X-Prev-Page, X-Gitlab-Blob-Id, X-Gitlab-Commit-Id, X-Gitlab-Content-Sha256, X-Gitlab-Encoding, X-Gitlab-File-Name, X-Gitlab-File-Path, X-Gitlab-Last-Commit-Id, X-Gitlab-Ref, X-Gitlab-Size", + "Access-Control-Max-Age": "7200", + "Alt-Svc": "clear", + "Cache-Control": "max-age=0, private, must-revalidate, no-store, no-cache", + "Cf-Cache-Status": "DYNAMIC", + "Cf-Ray": "582d5322afe3c528-ORD", + "Content-Disposition": "inline; filename=\"1970-01-01-first-title.md\"; filename*=UTF-8''1970-01-01-first-title.md", + "Content-Type": "text/plain; charset=utf-8", + "Expect-Ct": "max-age=604800, report-uri=\"https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct\"", + "Expires": "Fri, 01 Jan 1990 00:00:00 GMT", + "Gitlab-Sv": "localhost", + "Pragma": "no-cache", + "Referrer-Policy": "strict-origin-when-cross-origin", + "Server": "Netlify", + "Set-Cookie": "__cfduid=db8286ace52f0ef58db5f5680fa56fba61586698465; expires=Tue, 12-May-20 13:34:25 GMT; path=/; domain=.gitlab.com; HttpOnly; SameSite=Lax; Secure", + "Strict-Transport-Security": "max-age=31536000", + "Via": "1.1 google", + "X-Content-Type-Options": "nosniff", + "X-Frame-Options": "SAMEORIGIN", + "X-Gitlab-Blob-Id": "5712f24a02b758f8b5b5cc34b676cf0b25f53b86", + "X-Gitlab-Commit-Id": "409811aa7b81dccb5216c360e2adda41c797dc3a", + "X-Gitlab-Content-Sha256": "1ebac253486a1e755650dcd96613c81cabb7b2c7626ee02d1183ea4b2c384940", + "X-Gitlab-Encoding": "base64", + "X-Gitlab-File-Name": "1970-01-01-first-title.md", + "X-Gitlab-File-Path": "content/posts/1970-01-01-first-title.md", + "X-Gitlab-Last-Commit-Id": "7d5888c4fca42055cec7d97bcc2a4dc98e18c37c", + "X-Gitlab-Ref": "master", + "X-Gitlab-Size": "180", + "Age": "0", + "Connection": "keep-alive", + "Vary": "Origin,Origin", + "content-length": "180" + }, + "response": "---\ntemplate: post\ntitle: first title\nimage: /media/netlify.png\ndate: 1970-01-01T00:00:00.000Z\ndescription: first description\ncategory: first category\ntags:\n - tag1\n---\nfirst body", + "status": 200 + }, { "method": "GET", "url": "/.netlify/git/gitlab/merge_requests?state=opened&labels=Any&per_page=100&target_branch=master&source_branch=cms/posts/1970-01-01-first-title", diff --git a/cypress/fixtures/GitLab Backend Editorial Workflow__can change status on and publish multiple entries.json b/cypress/fixtures/GitLab Backend Editorial Workflow__can change status on and publish multiple entries.json index cdb7fbb7178a..606228c54504 100644 --- a/cypress/fixtures/GitLab Backend Editorial Workflow__can change status on and publish multiple entries.json +++ b/cypress/fixtures/GitLab Backend Editorial Workflow__can change status on and publish multiple entries.json @@ -985,7 +985,7 @@ "status": 404 }, { - "body": "{\"branch\":\"cms/posts/1970-01-01-second-title\",\"commit_message\":\"Create Post “1970-01-01-second-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-second-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC4zMDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}],\"start_branch\":\"master\"}", + "body": "{\"branch\":\"cms/posts/1970-01-01-second-title\",\"commit_message\":\"Create Post “1970-01-01-second-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-second-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC42MDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}],\"start_branch\":\"master\"}", "method": "POST", "url": "/api/v4/projects/owner%2Frepo/repository/commits", "headers": { @@ -1432,7 +1432,7 @@ "status": 404 }, { - "body": "{\"branch\":\"cms/posts/1970-01-01-third-title\",\"commit_message\":\"Create Post “1970-01-01-third-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-third-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAwLjYwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}],\"start_branch\":\"master\"}", + "body": "{\"branch\":\"cms/posts/1970-01-01-third-title\",\"commit_message\":\"Create Post “1970-01-01-third-title”\",\"actions\":[{\"action\":\"create\",\"file_path\":\"content/posts/1970-01-01-third-title.md\",\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAxLjIwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}],\"start_branch\":\"master\"}", "method": "POST", "url": "/api/v4/projects/owner%2Frepo/repository/commits", "headers": { diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json b/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json index 44be3780abdd..b2dfa817530a 100644 --- a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json +++ b/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json @@ -915,7 +915,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC4zMDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC42MDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", "method": "POST", "url": "/repos/owner/repo/git/blobs", "headers": { @@ -1403,7 +1403,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAwLjYwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAxLjIwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", "method": "POST", "url": "/repos/owner/repo/git/blobs", "headers": { diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json b/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json index 171a75b520e8..913ec93b74f3 100644 --- a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json +++ b/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json @@ -920,7 +920,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC4zMDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiBzZWNvbmQgdGl0bGUKZGF0ZTogMTk3MC0wMS0wMVQwMDowMDowMC42MDBaCmRlc2NyaXB0aW9uOiBzZWNvbmQgZGVzY3JpcHRpb24KY2F0ZWdvcnk6IHNlY29uZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMgotLS0Kc2Vjb25kIGJvZHk=\",\"encoding\":\"base64\"}", "method": "POST", "url": "/repos/owner/repo/git/blobs", "headers": { @@ -1425,7 +1425,7 @@ "status": 200 }, { - "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAwLjYwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", + "body": "{\"content\":\"LS0tCnRlbXBsYXRlOiBwb3N0CnRpdGxlOiB0aGlyZCB0aXRsZQpkYXRlOiAxOTcwLTAxLTAxVDAwOjAwOjAxLjIwMFoKZGVzY3JpcHRpb246IHRoaXJkIGRlc2NyaXB0aW9uCmNhdGVnb3J5OiB0aGlyZCBjYXRlZ29yeQp0YWdzOgogIC0gdGFnMwotLS0KdGhpcmQgYm9keQ==\",\"encoding\":\"base64\"}", "method": "POST", "url": "/repos/owner/repo/git/blobs", "headers": { diff --git a/cypress/utils/steps.js b/cypress/utils/steps.js index 30b940dbd7a0..464365f802b6 100644 --- a/cypress/utils/steps.js +++ b/cypress/utils/steps.js @@ -288,7 +288,8 @@ function populateEntry(entry, onDone = flushClockAndSave) { } function newPost() { - cy.contains('a', 'New Post').click(); + // click even if covered by toast + cy.contains('a', 'New Post').click({ force: true }); } function createPost(entry) { @@ -298,6 +299,7 @@ function createPost(entry) { function createPostAndExit(entry) { createPost(entry); + cy.clock().then(clock => { advanceClock(clock); }); exitEditor(); } diff --git a/package.json b/package.json index d5d65745e816..0da8d120fdca 100644 --- a/package.json +++ b/package.json @@ -186,6 +186,7 @@ "@emotion/babel-preset-css-prop": "^11.11.0", "browserify": "^17.0.0", "buffer": "^6.0.3", + "dayjs": "^1.11.10", "emotion": "^11.0.0", "eslint-config-prettier": "^8.0.0", "eslint-plugin-babel": "^5.3.0", diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md index e34fe522898d..0635a6c2878c 100644 --- a/packages/decap-cms-app/CHANGELOG.md +++ b/packages/decap-cms-app/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.1.0-beta.3](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.0-beta.2...decap-cms-app@3.1.0-beta.3) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + +# [3.1.0-beta.2](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.0-beta.1...decap-cms-app@3.1.0-beta.2) (2023-11-23) + +**Note:** Version bump only for package decap-cms-app + + + + + # [3.1.0-beta.1](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.0-beta.0...decap-cms-app@3.1.0-beta.1) (2023-11-15) **Note:** Version bump only for package decap-cms-app diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json index b6f8e84abe1a..1d40ec82637d 100644 --- a/packages/decap-cms-app/package.json +++ b/packages/decap-cms-app/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-app", "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.", - "version": "3.1.0-beta.1", + "version": "3.1.0-beta.3", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -36,17 +36,17 @@ "decap-cms-backend-gitlab": "^3.1.0-beta.0", "decap-cms-backend-proxy": "^3.1.0-beta.0", "decap-cms-backend-test": "^3.1.0-beta.0", - "decap-cms-core": "^3.3.0-beta.0", + "decap-cms-core": "^3.3.0-beta.2", "decap-cms-editor-component-image": "^3.1.0-beta.0", "decap-cms-lib-auth": "^3.0.2", "decap-cms-lib-util": "^3.0.1", - "decap-cms-lib-widgets": "^3.0.0", - "decap-cms-locales": "^3.1.2", + "decap-cms-lib-widgets": "^3.0.1-beta.0", + "decap-cms-locales": "^3.1.3-beta.0", "decap-cms-ui-default": "^3.1.0-beta.0", "decap-cms-widget-boolean": "^3.1.0-beta.0", "decap-cms-widget-code": "^3.1.0-beta.0", "decap-cms-widget-colorstring": "^3.1.0-beta.0", - "decap-cms-widget-datetime": "^3.1.0-beta.0", + "decap-cms-widget-datetime": "^3.1.0-beta.1", "decap-cms-widget-file": "^3.1.0-beta.0", "decap-cms-widget-image": "^3.1.0-beta.0", "decap-cms-widget-list": "^3.1.0-beta.0", @@ -60,12 +60,12 @@ "decap-cms-widget-text": "^3.1.0-beta.0", "immutable": "^3.7.6", "lodash": "^4.17.11", - "moment": "^2.24.0", "prop-types": "^15.7.2", "react-immutable-proptypes": "^2.1.0", "uuid": "^8.3.2" }, "peerDependencies": { + "dayjs": "^1.11.10", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/packages/decap-cms-app/src/index.js b/packages/decap-cms-app/src/index.js index cfd6fcba7e10..9545ebc35a49 100644 --- a/packages/decap-cms-app/src/index.js +++ b/packages/decap-cms-app/src/index.js @@ -1,5 +1,5 @@ import { DecapCmsCore as CMS } from 'decap-cms-core'; -import moment from 'moment'; +import dayjs from 'dayjs'; import './extensions.js'; // Log version @@ -11,6 +11,6 @@ if (typeof window !== 'undefined') { export const DecapCmsApp = { ...CMS, - moment, + dayjs, }; export default CMS; diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md index e56421db5942..9d7aafc3de74 100644 --- a/packages/decap-cms-core/CHANGELOG.md +++ b/packages/decap-cms-core/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.3.0-beta.2](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.0-beta.1...decap-cms-core@3.3.0-beta.2) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + +# [3.3.0-beta.1](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.0-beta.0...decap-cms-core@3.3.0-beta.1) (2023-11-23) + +**Note:** Version bump only for package decap-cms-core + + + + + # [3.3.0-beta.0](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.0...decap-cms-core@3.3.0-beta.0) (2023-10-20) diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json index 9adecfed1bd0..1a5427a97ca0 100644 --- a/packages/decap-cms-core/package.json +++ b/packages/decap-cms-core/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-core", "description": "Decap CMS core application, see decap-cms package for the main distribution.", - "version": "3.3.0-beta.0", + "version": "3.3.0-beta.2", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-core", "bugs": "https://github.com/decaporg/decap-cms/issues", "module": "dist/esm/index.js", @@ -77,6 +77,7 @@ "peerDependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", + "dayjs": "^1.11.10", "decap-cms-editor-component-image": "^3.0.0", "decap-cms-lib-auth": "^3.0.0", "decap-cms-lib-util": "^3.0.0", @@ -84,7 +85,6 @@ "decap-cms-ui-default": "^3.0.0", "immutable": "^3.7.6", "lodash": "^4.17.11", - "moment": "^2.24.0", "prop-types": "^15.7.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/decap-cms-core/src/actions/editorialWorkflow.ts b/packages/decap-cms-core/src/actions/editorialWorkflow.ts index e9abc3d576aa..231caa75de76 100644 --- a/packages/decap-cms-core/src/actions/editorialWorkflow.ts +++ b/packages/decap-cms-core/src/actions/editorialWorkflow.ts @@ -387,7 +387,7 @@ export function persistUnpublishedEntry(collection: Collection, existingUnpublis dispatch(unpublishedEntryPersisted(collection, serializedEntry)); if (entry.get('slug') !== newSlug) { - dispatch(loadUnpublishedEntry(collection, newSlug)); + await dispatch(loadUnpublishedEntry(collection, newSlug)); navigateToEntry(collection.get('name'), newSlug); } } catch (error) { diff --git a/packages/decap-cms-core/src/components/Workflow/WorkflowList.js b/packages/decap-cms-core/src/components/Workflow/WorkflowList.js index 18fd2dc99b69..7d929b2f6cb9 100644 --- a/packages/decap-cms-core/src/components/Workflow/WorkflowList.js +++ b/packages/decap-cms-core/src/components/Workflow/WorkflowList.js @@ -3,7 +3,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { css } from '@emotion/react'; import styled from '@emotion/styled'; -import moment from 'moment'; +import dayjs from 'dayjs'; import { translate } from 'react-polyglot'; import { colors, lengths } from 'decap-cms-ui-default'; @@ -205,9 +205,7 @@ class WorkflowList extends React.Component { return (
{entries.map(entry => { - const timestamp = moment(entry.get('updatedOn')).format( - t('workflow.workflow.dateFormat'), - ); + const timestamp = dayjs(entry.get('updatedOn')).format(t('workflow.workflow.dateFormat')); const slug = entry.get('slug'); const collectionName = entry.get('collection'); const editLink = `collections/${collectionName}/entries/${slug}?ref=workflow`; diff --git a/packages/decap-cms-core/src/formats/toml.ts b/packages/decap-cms-core/src/formats/toml.ts index a1b8a1413ba9..dff2050ba7c5 100644 --- a/packages/decap-cms-core/src/formats/toml.ts +++ b/packages/decap-cms-core/src/formats/toml.ts @@ -1,12 +1,12 @@ import toml from '@iarna/toml'; import tomlify from 'tomlify-j0.4'; -import moment from 'moment'; +import dayjs from 'dayjs'; import AssetProxy from '../valueObjects/AssetProxy'; import { sortKeys } from './helpers'; function outputReplacer(_key: string, value: unknown) { - if (moment.isMoment(value)) { + if (dayjs.isDayjs(value)) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore return value.format(value._f); diff --git a/packages/decap-cms-core/src/lib/formatters.ts b/packages/decap-cms-core/src/lib/formatters.ts index c64b145ea167..edb37e0ebbd0 100644 --- a/packages/decap-cms-core/src/lib/formatters.ts +++ b/packages/decap-cms-core/src/lib/formatters.ts @@ -195,7 +195,7 @@ export function previewUrlFormatter( compiledPath = compileStringTemplate(pathTemplate, date, slug, fields, processSegment); } catch (err) { // Print an error and ignore `preview_path` if both: - // 1. Date is invalid (according to Moment), and + // 1. Date is invalid (according to DayJs), and // 2. A date expression (eg. `{{year}}`) is used in `preview_path` if (err.name === SLUG_MISSING_REQUIRED_DATE) { console.error(stripIndent` diff --git a/packages/decap-cms-core/src/lib/registry.js b/packages/decap-cms-core/src/lib/registry.js index 238f8fdf66c7..573d8867762c 100644 --- a/packages/decap-cms-core/src/lib/registry.js +++ b/packages/decap-cms-core/src/lib/registry.js @@ -1,5 +1,5 @@ import { Map } from 'immutable'; -import produce from 'immer'; +import { produce } from 'immer'; import { oneLine } from 'common-tags'; import EditorComponent from '../valueObjects/EditorComponent'; diff --git a/packages/decap-cms-default-exports/CHANGELOG.md b/packages/decap-cms-default-exports/CHANGELOG.md index 764163e9110c..33b35aea5bb7 100644 --- a/packages/decap-cms-default-exports/CHANGELOG.md +++ b/packages/decap-cms-default-exports/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.1.0-beta.1](https://github.com/decaporg/decap-cms/compare/decap-cms-default-exports@3.1.0-beta.0...decap-cms-default-exports@3.1.0-beta.1) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + # [3.1.0-beta.0](https://github.com/decaporg/decap-cms/compare/decap-cms-default-exports@3.1.0...decap-cms-default-exports@3.1.0-beta.0) (2023-10-20) diff --git a/packages/decap-cms-default-exports/package.json b/packages/decap-cms-default-exports/package.json index 658a249d67c9..9f4913f8b49d 100644 --- a/packages/decap-cms-default-exports/package.json +++ b/packages/decap-cms-default-exports/package.json @@ -1,6 +1,6 @@ { "name": "decap-cms-default-exports", - "version": "3.1.0-beta.0", + "version": "3.1.0-beta.1", "description": "Decap CMS default exports", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-default-exports", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -23,12 +23,12 @@ "@emotion/styled": "^11.11.0", "immutable": "^3.7.6", "lodash": "^4.17.11", - "moment": "^2.24.0", "prop-types": "^15.7.2", "react-immutable-proptypes": "^2.1.0", "uuid": "^8.3.2" }, "peerDependencies": { + "dayjs": "^1.11.10", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/packages/decap-cms-default-exports/src/index.js b/packages/decap-cms-default-exports/src/index.js index e582e41028ca..84bbb991a4fe 100644 --- a/packages/decap-cms-default-exports/src/index.js +++ b/packages/decap-cms-default-exports/src/index.js @@ -13,7 +13,7 @@ import EmotionStyled from '@emotion/styled'; import Immutable from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import Lodash from 'lodash/lodash'; -import Moment from 'moment'; +import Dayjs from 'dayjs'; import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -35,7 +35,7 @@ export const DecapCmsDefaultExports = { Immutable, ImmutablePropTypes, Lodash, - Moment, + Dayjs, PropTypes, React, ReactDOM, diff --git a/packages/decap-cms-lib-widgets/CHANGELOG.md b/packages/decap-cms-lib-widgets/CHANGELOG.md index 28a4cd8aa44a..1e4dcbf6d074 100644 --- a/packages/decap-cms-lib-widgets/CHANGELOG.md +++ b/packages/decap-cms-lib-widgets/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.1-beta.0](https://github.com/decaporg/decap-cms/compare/decap-cms-lib-widgets@3.0.0...decap-cms-lib-widgets@3.0.1-beta.0) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + # [3.0.0](https://github.com/decaporg/decap-cms/compare/decap-cms-lib-widgets@1.9.0...decap-cms-lib-widgets@3.0.0) (2023-08-18) **Note:** Version bump only for package decap-cms-lib-widgets diff --git a/packages/decap-cms-lib-widgets/package.json b/packages/decap-cms-lib-widgets/package.json index a3771e5fa172..c13306d58ebe 100644 --- a/packages/decap-cms-lib-widgets/package.json +++ b/packages/decap-cms-lib-widgets/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-lib-widgets", "description": "Shared utilities for Decap CMS.", - "version": "3.0.0", + "version": "3.0.1-beta.0", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-lib-widgets", "bugs": "https://github.com/decaporg/decap-cms/issues", "module": "dist/esm/index.js", @@ -17,8 +17,8 @@ "build:esm": "cross-env NODE_ENV=esm babel src --out-dir dist/esm --ignore \"**/__tests__\" --root-mode upward --extensions \".js,.jsx,.ts,.tsx\"" }, "peerDependencies": { + "dayjs": "^1.11.10", "immutable": "^3.7.6", - "lodash": "^4.17.11", - "moment": "^2.24.0" + "lodash": "^4.17.11" } } diff --git a/packages/decap-cms-lib-widgets/src/stringTemplate.ts b/packages/decap-cms-lib-widgets/src/stringTemplate.ts index 43f16a16d866..1675756f1db0 100644 --- a/packages/decap-cms-lib-widgets/src/stringTemplate.ts +++ b/packages/decap-cms-lib-widgets/src/stringTemplate.ts @@ -1,6 +1,6 @@ import { Map } from 'immutable'; import { get, trimEnd, truncate } from 'lodash'; -import moment from 'moment'; +import dayjs from 'dayjs'; import { basename, dirname, extname } from 'path'; const filters = [ @@ -11,7 +11,7 @@ const filters = [ }, { pattern: /^date\('(.+)'\)$/, - transform: (str: string, match: RegExpMatchArray) => moment(str).format(match[1]), + transform: (str: string, match: RegExpMatchArray) => dayjs(str).format(match[1]), }, { pattern: /^default\('(.+)'\)$/, @@ -60,9 +60,9 @@ export function parseDateFromEntry(entry: Map, dateFieldName?: } const dateValue = entry.getIn(['data', dateFieldName]); - const dateMoment = dateValue && moment(dateValue); - if (dateMoment && dateMoment.isValid()) { - return dateMoment.toDate(); + const dateDayjs = dateValue && dayjs(dateValue); + if (dateDayjs && dateDayjs.isValid()) { + return dateDayjs.toDate(); } } diff --git a/packages/decap-cms-locales/CHANGELOG.md b/packages/decap-cms-locales/CHANGELOG.md index ea254be4e9f6..81740b782b73 100644 --- a/packages/decap-cms-locales/CHANGELOG.md +++ b/packages/decap-cms-locales/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.3-beta.0](https://github.com/decaporg/decap-cms/compare/decap-cms-locales@3.1.2...decap-cms-locales@3.1.3-beta.0) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + ## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-locales@3.1.0...decap-cms-locales@3.1.2) (2023-10-20) diff --git a/packages/decap-cms-locales/package.json b/packages/decap-cms-locales/package.json index f15d164551f6..7abfc4cae898 100644 --- a/packages/decap-cms-locales/package.json +++ b/packages/decap-cms-locales/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-locales", "description": "Locales for Decap CMS.", - "version": "3.1.2", + "version": "3.1.3-beta.0", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-locales", "bugs": "https://github.com/decaporg/decap-cms/issues", "license": "MIT", diff --git a/packages/decap-cms-locales/src/bg/index.js b/packages/decap-cms-locales/src/bg/index.js index f047e9f826a6..9c70a652125d 100644 --- a/packages/decap-cms-locales/src/bg/index.js +++ b/packages/decap-cms-locales/src/bg/index.js @@ -195,6 +195,7 @@ const bg = { }, datetime: { now: 'Сега', + clear: 'Изчисти', }, }, }, diff --git a/packages/decap-cms-locales/src/ca/index.js b/packages/decap-cms-locales/src/ca/index.js index cd4fc94f2a59..0218949ae095 100644 --- a/packages/decap-cms-locales/src/ca/index.js +++ b/packages/decap-cms-locales/src/ca/index.js @@ -193,6 +193,7 @@ const ca = { }, datetime: { now: 'Ara', + clear: 'Netejar', }, }, }, diff --git a/packages/decap-cms-locales/src/cs/index.js b/packages/decap-cms-locales/src/cs/index.js index 96cfcd52c50f..25accc2fa61e 100644 --- a/packages/decap-cms-locales/src/cs/index.js +++ b/packages/decap-cms-locales/src/cs/index.js @@ -194,6 +194,7 @@ const cs = { }, datetime: { now: 'Teď', + clear: 'Vymazat', }, }, }, diff --git a/packages/decap-cms-locales/src/da/index.js b/packages/decap-cms-locales/src/da/index.js index 700352eb281f..6404be48a7db 100644 --- a/packages/decap-cms-locales/src/da/index.js +++ b/packages/decap-cms-locales/src/da/index.js @@ -205,6 +205,7 @@ const da = { }, datetime: { now: 'Nu', + clear: 'Ryd', }, list: { add: 'Tilføj %{item}', diff --git a/packages/decap-cms-locales/src/de/index.js b/packages/decap-cms-locales/src/de/index.js index 5e96416f2776..0fd385cea27f 100644 --- a/packages/decap-cms-locales/src/de/index.js +++ b/packages/decap-cms-locales/src/de/index.js @@ -204,6 +204,7 @@ const de = { }, datetime: { now: 'Jetzt', + clear: 'Löschen', }, list: { add: '%{item} hinzufügen', diff --git a/packages/decap-cms-locales/src/en/index.js b/packages/decap-cms-locales/src/en/index.js index f3f968cd0acb..5cba0d853d43 100644 --- a/packages/decap-cms-locales/src/en/index.js +++ b/packages/decap-cms-locales/src/en/index.js @@ -206,6 +206,7 @@ const en = { }, datetime: { now: 'Now', + clear: 'Clear', }, list: { add: 'Add %{item}', diff --git a/packages/decap-cms-locales/src/es/index.js b/packages/decap-cms-locales/src/es/index.js index 6f49732c1b79..a99fc99ef2b1 100644 --- a/packages/decap-cms-locales/src/es/index.js +++ b/packages/decap-cms-locales/src/es/index.js @@ -159,6 +159,7 @@ const es = { }, datetime: { now: 'Ahora', + clear: 'Limpiar', }, }, }, diff --git a/packages/decap-cms-locales/src/fr/index.js b/packages/decap-cms-locales/src/fr/index.js index ba160efea89f..eb11b2709f60 100644 --- a/packages/decap-cms-locales/src/fr/index.js +++ b/packages/decap-cms-locales/src/fr/index.js @@ -196,6 +196,7 @@ const fr = { }, datetime: { now: 'Maintenant', + clear: 'Effacer', }, list: { add: 'Ajouter %{item}', diff --git a/packages/decap-cms-locales/src/he/index.js b/packages/decap-cms-locales/src/he/index.js index 18237423173b..293266fa0ab2 100644 --- a/packages/decap-cms-locales/src/he/index.js +++ b/packages/decap-cms-locales/src/he/index.js @@ -197,6 +197,7 @@ const he = { }, datetime: { now: 'עכשיו', + clear: 'ניקוי', }, list: { add: 'הוספת %{item}', diff --git a/packages/decap-cms-locales/src/hr/index.js b/packages/decap-cms-locales/src/hr/index.js index aa6c463b7017..96b54ff3dfb6 100644 --- a/packages/decap-cms-locales/src/hr/index.js +++ b/packages/decap-cms-locales/src/hr/index.js @@ -184,6 +184,7 @@ const hr = { }, datetime: { now: 'Sad', + clear: 'Očisti', }, }, }, diff --git a/packages/decap-cms-locales/src/ja/index.js b/packages/decap-cms-locales/src/ja/index.js index db7ba980f041..ff4c85ba8571 100644 --- a/packages/decap-cms-locales/src/ja/index.js +++ b/packages/decap-cms-locales/src/ja/index.js @@ -198,6 +198,7 @@ const ja = { }, datetime: { now: '現時刻', + clear: 'クリア', }, }, }, diff --git a/packages/decap-cms-locales/src/ko/index.js b/packages/decap-cms-locales/src/ko/index.js index 6e8dba0bf997..c7c9e31e19a9 100644 --- a/packages/decap-cms-locales/src/ko/index.js +++ b/packages/decap-cms-locales/src/ko/index.js @@ -205,6 +205,7 @@ const ko = { }, datetime: { now: '현재시각', + clear: '지우기', }, list: { add: '%{item} 추가', diff --git a/packages/decap-cms-locales/src/lt/index.js b/packages/decap-cms-locales/src/lt/index.js index 1b3ce684cfa6..12101ef86fdb 100644 --- a/packages/decap-cms-locales/src/lt/index.js +++ b/packages/decap-cms-locales/src/lt/index.js @@ -186,6 +186,7 @@ const lt = { }, datetime: { now: 'Dabar', + clear: 'Išvalyti', }, }, }, diff --git a/packages/decap-cms-locales/src/nb_no/index.js b/packages/decap-cms-locales/src/nb_no/index.js index d1fa0e2ca5c8..569d2d2688b2 100644 --- a/packages/decap-cms-locales/src/nb_no/index.js +++ b/packages/decap-cms-locales/src/nb_no/index.js @@ -156,6 +156,7 @@ const nb_no = { }, datetime: { now: 'Nå', + clear: 'Nullstill', }, }, }, diff --git a/packages/decap-cms-locales/src/nl/index.js b/packages/decap-cms-locales/src/nl/index.js index 6baefaad427b..5aa89ccf7f87 100644 --- a/packages/decap-cms-locales/src/nl/index.js +++ b/packages/decap-cms-locales/src/nl/index.js @@ -193,6 +193,7 @@ const nl = { }, datetime: { now: 'Nu', + clear: 'Wissen', }, list: { add: 'Voeg %{item} toe', diff --git a/packages/decap-cms-locales/src/nn_no/index.js b/packages/decap-cms-locales/src/nn_no/index.js index c59391d8e159..a42129127251 100644 --- a/packages/decap-cms-locales/src/nn_no/index.js +++ b/packages/decap-cms-locales/src/nn_no/index.js @@ -157,6 +157,7 @@ const nn_no = { }, datetime: { now: 'No', + clear: 'Nullstill', }, }, }, diff --git a/packages/decap-cms-locales/src/pl/index.js b/packages/decap-cms-locales/src/pl/index.js index 3331e2eecf7b..a7b797bb9fea 100644 --- a/packages/decap-cms-locales/src/pl/index.js +++ b/packages/decap-cms-locales/src/pl/index.js @@ -198,6 +198,7 @@ const pl = { }, datetime: { now: 'Teraz', + clear: 'Wyczyść', }, list: { add: 'Dodaj %{item}', diff --git a/packages/decap-cms-locales/src/pt/index.js b/packages/decap-cms-locales/src/pt/index.js index 0031761df1aa..bd05036d65b5 100644 --- a/packages/decap-cms-locales/src/pt/index.js +++ b/packages/decap-cms-locales/src/pt/index.js @@ -199,6 +199,7 @@ const pt = { }, datetime: { now: 'Agora', + clear: 'Limpar', }, list: { add: 'Adicionar %{item}', diff --git a/packages/decap-cms-locales/src/ro/index.js b/packages/decap-cms-locales/src/ro/index.js index 4a4a88294ffb..12a3eab09abe 100644 --- a/packages/decap-cms-locales/src/ro/index.js +++ b/packages/decap-cms-locales/src/ro/index.js @@ -196,6 +196,7 @@ const ro = { }, datetime: { now: 'Acum', + clear: 'Șterge', }, }, }, diff --git a/packages/decap-cms-locales/src/ru/index.js b/packages/decap-cms-locales/src/ru/index.js index f2ec4c3ab020..02dcaedb6400 100644 --- a/packages/decap-cms-locales/src/ru/index.js +++ b/packages/decap-cms-locales/src/ru/index.js @@ -209,6 +209,7 @@ const ru = { }, datetime: { now: 'Сейчас', + clear: 'Очистить', }, list: { add: 'Добавить %{item}', diff --git a/packages/decap-cms-locales/src/sl/index.js b/packages/decap-cms-locales/src/sl/index.js index f9e7dc0b48d0..33266b29c712 100644 --- a/packages/decap-cms-locales/src/sl/index.js +++ b/packages/decap-cms-locales/src/sl/index.js @@ -206,6 +206,7 @@ const sl = { }, datetime: { now: 'Zdaj', + clear: 'Počisti', }, list: { add: 'Dodaj %{item}', diff --git a/packages/decap-cms-locales/src/sv/index.js b/packages/decap-cms-locales/src/sv/index.js index e874cdb41b5e..961d628d6093 100644 --- a/packages/decap-cms-locales/src/sv/index.js +++ b/packages/decap-cms-locales/src/sv/index.js @@ -195,6 +195,7 @@ const sv = { }, datetime: { now: 'Nu', + clear: 'Rensa', }, }, }, diff --git a/packages/decap-cms-locales/src/th/index.js b/packages/decap-cms-locales/src/th/index.js index 89e8a36e277f..72e0f74085fb 100644 --- a/packages/decap-cms-locales/src/th/index.js +++ b/packages/decap-cms-locales/src/th/index.js @@ -167,6 +167,7 @@ const th = { }, datetime: { now: 'เวลาตอนนี้', + clear: 'ล้าง', }, }, }, diff --git a/packages/decap-cms-locales/src/tr/index.js b/packages/decap-cms-locales/src/tr/index.js index 1d46b2b215f0..c6c3358e3b94 100644 --- a/packages/decap-cms-locales/src/tr/index.js +++ b/packages/decap-cms-locales/src/tr/index.js @@ -203,6 +203,7 @@ const tr = { }, datetime: { now: 'Şimdi', + clear: 'Temizle', }, list: { add: '%{item} Ekle', diff --git a/packages/decap-cms-locales/src/vi/index.js b/packages/decap-cms-locales/src/vi/index.js index 8c5c71789ad8..efedd2c081c0 100644 --- a/packages/decap-cms-locales/src/vi/index.js +++ b/packages/decap-cms-locales/src/vi/index.js @@ -165,6 +165,7 @@ const vi = { }, datetime: { now: 'Ngay lúc này', + clear: 'Xóa', }, }, }, diff --git a/packages/decap-cms-locales/src/zh_Hans/index.js b/packages/decap-cms-locales/src/zh_Hans/index.js index e0059feeff25..af1df505f82a 100644 --- a/packages/decap-cms-locales/src/zh_Hans/index.js +++ b/packages/decap-cms-locales/src/zh_Hans/index.js @@ -191,6 +191,7 @@ const zh_Hans = { }, datetime: { now: '现在', + clear: '清除', }, }, }, diff --git a/packages/decap-cms-locales/src/zh_Hant/index.js b/packages/decap-cms-locales/src/zh_Hant/index.js index 1856ce1d6c12..9b1c09ba140f 100644 --- a/packages/decap-cms-locales/src/zh_Hant/index.js +++ b/packages/decap-cms-locales/src/zh_Hant/index.js @@ -174,6 +174,7 @@ const zh_Hant = { }, datetime: { now: '現在', + clear: '清除', }, }, }, diff --git a/packages/decap-cms-widget-datetime/CHANGELOG.md b/packages/decap-cms-widget-datetime/CHANGELOG.md index 3e610bef04fd..f2f720c4b4bf 100644 --- a/packages/decap-cms-widget-datetime/CHANGELOG.md +++ b/packages/decap-cms-widget-datetime/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.1.0-beta.1](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-datetime@3.1.0-beta.0...decap-cms-widget-datetime@3.1.0-beta.1) (2023-11-23) + + +### Performance Improvements + +* replace moment with dayjs ([#6980](https://github.com/decaporg/decap-cms/issues/6980)) ([22370b1](https://github.com/decaporg/decap-cms/commit/22370b13e49a4a5f58a60ebd4bc40ce4b141eb11)) + + + + + # [3.1.0-beta.0](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-datetime@3.1.0...decap-cms-widget-datetime@3.1.0-beta.0) (2023-10-20) diff --git a/packages/decap-cms-widget-datetime/package.json b/packages/decap-cms-widget-datetime/package.json index 1a066231181c..c9429424bcb4 100644 --- a/packages/decap-cms-widget-datetime/package.json +++ b/packages/decap-cms-widget-datetime/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-widget-datetime", "description": "Widget for editing dates and times in Decap CMS.", - "version": "3.1.0-beta.0", + "version": "3.1.0-beta.1", "homepage": "https://www.decapcms.org/docs/widgets/#datetime", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-datetime", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -23,9 +23,7 @@ }, "peerDependencies": { "@emotion/react": "^11.11.1", + "dayjs": "^1.11.10", "react": "^18.2.0" - }, - "dependencies": { - "react-datetime": "^3.1.1" } } diff --git a/packages/decap-cms-widget-datetime/src/DateTimeControl.js b/packages/decap-cms-widget-datetime/src/DateTimeControl.js index 797ec9620744..edff14f8d647 100644 --- a/packages/decap-cms-widget-datetime/src/DateTimeControl.js +++ b/packages/decap-cms-widget-datetime/src/DateTimeControl.js @@ -2,20 +2,16 @@ import React from 'react'; import PropTypes from 'prop-types'; import { jsx, css } from '@emotion/react'; -import reactDateTimeStyles from 'react-datetime/css/react-datetime.css'; -import DateTime from 'react-datetime'; -import moment from 'moment'; +import dayjs from 'dayjs'; import { buttons } from 'decap-cms-ui-default'; -function NowButton({ t, handleChange }) { +function Buttons({ t, handleChange }) { return (
+
); } @@ -44,24 +47,10 @@ export default class DateTimeControl extends React.Component { value: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), }; - getFormats() { + getFormat() { const { field } = this.props; const format = field.get('format'); - - // dateFormat and timeFormat are strictly for modifying - // input field with the date/time pickers - const dateFormat = field.get('date_format'); - // show time-picker? false hides it, true shows it using default format - let timeFormat = field.get('time_format'); - if (typeof timeFormat === 'undefined') { - timeFormat = true; - } - - return { - format, - dateFormat, - timeFormat, - }; + return format; } getDefaultValue() { @@ -70,15 +59,8 @@ export default class DateTimeControl extends React.Component { return defaultValue; } - getPickerUtc() { - const { field } = this.props; - const pickerUtc = field.get('picker_utc'); - return pickerUtc; - } - - formats = this.getFormats(); + format = this.getFormat(); defaultValue = this.getDefaultValue(); - pickerUtc = this.getPickerUtc(); componentDidMount() { const { value } = this.props; @@ -94,10 +76,9 @@ export default class DateTimeControl extends React.Component { } } - // Date is valid if datetime is a moment or Date object otherwise it's a string. + // Date is valid if datetime is a dayjs or Date object otherwise it's a string. // Handle the empty case, if the user wants to empty the field. - isValidDate = datetime => - moment.isMoment(datetime) || datetime instanceof Date || datetime === ''; + isValidDate = datetime => dayjs.isDayjs(datetime) || datetime instanceof Date || datetime === ''; handleChange = datetime => { /** @@ -108,59 +89,43 @@ export default class DateTimeControl extends React.Component { } const { onChange } = this.props; - const { format } = this.formats; /** * Produce a formatted string only if a format is set in the config. * Otherwise produce a date object. */ - if (format) { - const formattedValue = datetime ? moment(datetime).format(format) : ''; + if (this.format) { + const formattedValue = datetime ? dayjs(datetime).format(this.format) : ''; onChange(formattedValue); } else { - const value = moment.isMoment(datetime) ? datetime.toDate() : datetime; + const value = dayjs.isDayjs(datetime) ? datetime.toDate() : datetime; onChange(value); } }; - onClose = datetime => { - const { setInactiveStyle } = this.props; - - if (!this.isValidDate(datetime)) { - const parsedDate = moment(datetime); - - if (parsedDate.isValid()) { - this.handleChange(datetime); - } else { - window.alert('The date you entered is invalid.'); - } - } - - setInactiveStyle(); - }; - render() { - const { forID, value, classNameWrapper, setActiveStyle, t, isDisabled } = this.props; - const { format, dateFormat, timeFormat } = this.formats; + const { forID, value, classNameWrapper, setActiveStyle, setInactiveStyle, t, isDisabled } = + this.props; return (
- this.handleChange(dayjs(e.target.value))} + onFocus={setActiveStyle} + onBlur={setInactiveStyle} + disabled={isDisabled} /> - {!isDisabled && this.handleChange(v)} />} + {!isDisabled && this.handleChange(v)} />}
); } diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md index c1291cee8421..1e6f3f662b3f 100644 --- a/packages/decap-cms/CHANGELOG.md +++ b/packages/decap-cms/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.1.0-beta.3](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.0-beta.2...decap-cms@3.1.0-beta.3) (2023-11-23) + +**Note:** Version bump only for package decap-cms + + + + + +# [3.1.0-beta.2](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.0-beta.1...decap-cms@3.1.0-beta.2) (2023-11-23) + +**Note:** Version bump only for package decap-cms + + + + + # [3.1.0-beta.1](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.0-beta.0...decap-cms@3.1.0-beta.1) (2023-11-15) **Note:** Version bump only for package decap-cms diff --git a/packages/decap-cms/package.json b/packages/decap-cms/package.json index 495c3bae58d4..9e97a85b04a0 100644 --- a/packages/decap-cms/package.json +++ b/packages/decap-cms/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms", "description": "An extensible, open source, Git-based, React CMS for static sites.", - "version": "3.1.0-beta.1", + "version": "3.1.0-beta.3", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -22,7 +22,7 @@ "dependencies": { "codemirror": "^5.46.0", "create-react-class": "^15.7.0", - "decap-cms-app": "^3.1.0-beta.1", + "decap-cms-app": "^3.1.0-beta.3", "decap-cms-media-library-cloudinary": "^3.0.1", "decap-cms-media-library-uploadcare": "^3.0.0", "file-loader": "^6.2.0", diff --git a/scripts/externals.js b/scripts/externals.js index f0f491d25a65..133fc8768873 100644 --- a/scripts/externals.js +++ b/scripts/externals.js @@ -70,12 +70,12 @@ module.exports = { amd: 'immutable', umd: 'immutable', }, - moment: { - root: ['DecapCmsDefaultExports', 'Moment'], - commonjs2: 'moment', - commonjs: 'moment', - amd: 'moment', - umd: 'moment', + dayjs: { + root: ['DecapCmsDefaultExports', 'Dayjs'], + commonjs2: 'dayjs', + commonjs: 'dayjs', + amd: 'dayjs', + umd: 'dayjs', }, 'prop-types': { root: ['DecapCmsDefaultExports', 'PropTypes'], diff --git a/scripts/webpack.js b/scripts/webpack.js index acd639b39a18..9c1c68a37a79 100644 --- a/scripts/webpack.js +++ b/scripts/webpack.js @@ -28,7 +28,7 @@ function rules() { css: () => [ { test: /\.css$/, - include: ['ol', 'react-toastify', 'react-datetime', 'codemirror'].map(moduleNameToPath), + include: ['ol', 'react-toastify', 'codemirror'].map(moduleNameToPath), use: ['to-string-loader', 'css-loader'], }, ], @@ -56,8 +56,6 @@ function plugins() { return { ignoreEsprima: () => new webpack.IgnorePlugin({ resourceRegExp: /^esprima$/, contextRegExp: /js-yaml/ }), - ignoreMomentOptionalDeps: () => - new webpack.IgnorePlugin({ resourceRegExp: /^\.\/locale$/, contextRegExp: /moment$/ }), friendlyErrors: () => new FriendlyErrorsWebpackPlugin(), buffer: () => new webpack.ProvidePlugin({ @@ -142,9 +140,6 @@ function baseConfig({ target = isProduction ? 'umd' : 'umddir' } = {}) { }, resolve: { extensions: ['.ts', '.tsx', '.js', '.json'], - alias: { - moment$: 'moment/moment.js', - }, fallback: { path: require.resolve('path-browserify'), stream: require.resolve('stream-browserify'), diff --git a/website/src/components/layout.js b/website/src/components/layout.js index 44079f27194c..a6a6774e1297 100644 --- a/website/src/components/layout.js +++ b/website/src/components/layout.js @@ -53,7 +53,11 @@ function Layout({ hasPageHero, children }) { > - +