Skip to content

Commit 0675366

Browse files
tftf
authored
Merge pull request #2390 from tf/rm-v2
Remove experimental frontend
2 parents 3a33422 + 06da21c commit 0675366

File tree

63 files changed

+53
-2901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+53
-2901
lines changed

‎entry_types/scrolled/app/helpers/pageflow_scrolled/generated_media_queries_helper.rb‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737

3838
<% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry, local_assigns[:seed_options] || {}) %>
3939

40-
<% if !local_assigns[:skip_ssr] && (params[:frontend] == 'v2' || entry.feature_state('frontend_v2')) %>
41-
<%= generated_media_queries_tags_for(ssr_html) %>
42-
<% end %>
4340
</head>
4441
<body>
4542
<%= structured_data_for_entry(entry) unless local_assigns[:skip_structured_data] %>

‎entry_types/scrolled/config/locales/de.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ de:
6767
values:
6868
large: Groß
6969
small: Klein
70-
frontend_v2:
71-
feature_name: Frontend v2
7270
hls_instead_of_dash:
7371
feature_name: HLS statt DASH für Videos verwenden
7472
iconInlineFileRights:

‎entry_types/scrolled/config/locales/en.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ en:
6767
values:
6868
large: Large
6969
small: Small
70-
frontend_v2:
71-
feature_name: Frontend v2
7270
hls_instead_of_dash:
7371
feature_name: Use HLS instead of DASH for videos
7472
iconInlineFileRights:

‎entry_types/scrolled/lib/pageflow_scrolled/plugin.rb‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ def configure(config)
208208
c.features.register('iframe_embed_content_element')
209209
c.features.register('social_embed_content_element')
210210
c.features.register('legacy_social_embed_content_elements')
211-
c.features.register('frontend_v2')
212211
c.features.register('scrolled_entry_fragment_caching')
213212
c.features.register('backdrop_content_elements')
214213
c.features.register('custom_palette_colors')
@@ -224,11 +223,6 @@ def configure(config)
224223
)
225224
end
226225

227-
c.additional_frontend_seed_data.register(
228-
'frontendVersion',
229-
FRONTEND_VERSION_SEED_DATA
230-
)
231-
232226
c.content_element_consent_vendors.register(
233227
IFRAME_EMBED_CONSENT_VENDOR,
234228
content_element_type_name: 'iframeEmbed'
@@ -260,13 +254,5 @@ def configure(config)
260254

261255
valid_providers.include?(provider) ? provider : nil
262256
end
263-
264-
FRONTEND_VERSION_SEED_DATA = lambda do |request:, entry:, **|
265-
if request.params[:frontend] == 'v2' || entry.feature_state('frontend_v2')
266-
2
267-
else
268-
1
269-
end
270-
end
271257
end
272258
end

entry_types/scrolled/package/spec/frontend/v1/Backdrop-spec.js renamed to entry_types/scrolled/package/spec/frontend/Backdrop-spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {renderInEntryWithSectionLifecycle} from 'support';
55
import {useFakeMedia, fakeMediaRenderQueries} from 'support/fakeMedia';
66

77
import {frontend} from 'pageflow-scrolled/frontend';
8-
import {Backdrop} from 'frontend/v1/Backdrop';
9-
import {useBackdrop} from 'frontend/v1/useBackdrop';
8+
import {Backdrop} from 'frontend/Backdrop';
9+
import {useBackdrop} from 'frontend/useBackdrop';
1010
import styles from 'frontend/Backdrop.module.css';
1111

1212
import {usePortraitOrientation} from 'frontend/usePortraitOrientation';

entry_types/scrolled/package/spec/frontend/v1/Backdrop/Effects-spec.js renamed to entry_types/scrolled/package/spec/frontend/Backdrop/Effects-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {getFilter} from 'frontend/v1/Backdrop/Effects';
1+
import {getFilter} from 'frontend/Backdrop/Effects';
22

33
describe('Backdrop Effects getFilter', () => {
44
it('uses normalized range for brightness, contrast and saturate', () => {

‎entry_types/scrolled/package/spec/frontend/Image-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {renderInEntry} from 'support';
55
import * as jsonLdQueries from 'support/jsonLdQueries';
66

77
import {Image} from 'frontend/Image';
8-
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
8+
import {useBackgroundFile} from 'frontend/useBackgroundFile';
99
import {useFile} from 'entryState';
1010

1111
describe('Image', () => {

entry_types/scrolled/package/spec/frontend/v1/MotifArea-spec.js renamed to entry_types/scrolled/package/spec/frontend/MotifArea-spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import '@testing-library/jest-dom/extend-expect'
44
import {renderInEntry} from 'support';
55

66
import {useFile} from 'entryState';
7-
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
8-
import {MotifArea} from 'frontend/v1/MotifArea';
7+
import {useBackgroundFile} from 'frontend/useBackgroundFile';
8+
import {MotifArea} from 'frontend/MotifArea';
99
import {MotifAreaVisibilityProvider} from 'frontend/MotifAreaVisibilityProvider';
1010
import styles from 'frontend/MotifArea.module.css';
1111

‎entry_types/scrolled/package/spec/frontend/VideoPlayer-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'support/mediaElementStub';
44
import {getInitialPlayerState, getPlayerActions} from 'support/fakePlayerState';
55

66
import {renderInEntry} from "../support";
7-
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
7+
import {useBackgroundFile} from 'frontend/useBackgroundFile';
88
import {useFile} from 'entryState';
99
import {VideoPlayer} from 'frontend/VideoPlayer';
1010
import {media, settings} from 'pageflow/frontend';

0 commit comments

Comments
 (0)