From 33c3af284cbbb228199f1e2bd369c6e8efd9763d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 6 May 2020 15:53:51 +0100
Subject: [PATCH] [Blocks Fixture] Remove remaining Blocks (#18840)

---
 fixtures/blocks/src/server/App.js             |  3 +--
 fixtures/blocks/src/server/Comments.js        |  3 +--
 fixtures/blocks/src/server/Link.block.js      | 22 -------------------
 fixtures/blocks/src/server/Post.js            |  3 +--
 .../blocks/src/server/ProfileNav.block.js     | 22 -------------------
 fixtures/blocks/src/server/ProfilePage.js     |  3 +--
 fixtures/blocks/src/server/Shell.block.js     | 22 -------------------
 7 files changed, 4 insertions(+), 74 deletions(-)
 delete mode 100644 fixtures/blocks/src/server/Link.block.js
 delete mode 100644 fixtures/blocks/src/server/ProfileNav.block.js
 delete mode 100644 fixtures/blocks/src/server/Shell.block.js

diff --git a/fixtures/blocks/src/server/App.js b/fixtures/blocks/src/server/App.js
index 792e1f7c76..a8f1a5706d 100644
--- a/fixtures/blocks/src/server/App.js
+++ b/fixtures/blocks/src/server/App.js
@@ -12,7 +12,7 @@ import FeedPage from './FeedPage';
 import ProfilePage from './ProfilePage';
 
 // TODO: Replace with asset reference.
-import loadShell from './Shell.block';
+import Shell from '../client/Shell';
 
 // TODO: Router component?
 const AppRoutes = {
@@ -23,7 +23,6 @@ const AppRoutes = {
 };
 
 export default function App(props) {
-  const Shell = loadShell();
   const match = matchRoute(props, AppRoutes);
   return <Shell>{match}</Shell>;
 }
diff --git a/fixtures/blocks/src/server/Comments.js b/fixtures/blocks/src/server/Comments.js
index 14f37f6a99..cf954d841a 100644
--- a/fixtures/blocks/src/server/Comments.js
+++ b/fixtures/blocks/src/server/Comments.js
@@ -10,10 +10,9 @@ import * as React from 'react';
 import {fetch} from 'react-data/fetch';
 
 // TODO: Replace with asset reference.
-import loadLink from './Link.block';
+import Link from '../client/Link';
 
 export default function Comments({postId}) {
-  const Link = loadLink();
   const comments = fetch(`/comments?postId=${postId}&_expand=user`).json();
   return (
     <>
diff --git a/fixtures/blocks/src/server/Link.block.js b/fixtures/blocks/src/server/Link.block.js
deleted file mode 100644
index da8f36bbbc..0000000000
--- a/fixtures/blocks/src/server/Link.block.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/* eslint-disable import/first */
-
-import * as React from 'react';
-import {unstable_block as block} from 'react';
-
-// Client
-
-// TODO: delete this wrapper.
-
-import ClientLink from '../client/Link';
-
-function Link(props, _) {
-  return <ClientLink {...props} />;
-}
-
-export default block(Link);
diff --git a/fixtures/blocks/src/server/Post.js b/fixtures/blocks/src/server/Post.js
index dc9fc10bc9..cbea72d1e1 100644
--- a/fixtures/blocks/src/server/Post.js
+++ b/fixtures/blocks/src/server/Post.js
@@ -11,10 +11,9 @@ import {Suspense} from 'react';
 import Comments from './Comments';
 
 // TODO: Replace with asset reference.
-import loadLink from './Link.block';
+import Link from '../client/Link';
 
 export default function Post({post}) {
-  const Link = loadLink();
   return (
     <div
       style={{
diff --git a/fixtures/blocks/src/server/ProfileNav.block.js b/fixtures/blocks/src/server/ProfileNav.block.js
deleted file mode 100644
index 794a1d85fa..0000000000
--- a/fixtures/blocks/src/server/ProfileNav.block.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/* eslint-disable import/first */
-
-import * as React from 'react';
-import {unstable_block as block} from 'react';
-
-// Client
-
-// TODO: delete this wrapper.
-
-import ClientProfileNav from '../client/ProfileNav';
-
-function ProfileNav(props, _) {
-  return <ClientProfileNav {...props} />;
-}
-
-export default block(ProfileNav);
diff --git a/fixtures/blocks/src/server/ProfilePage.js b/fixtures/blocks/src/server/ProfilePage.js
index 8aaaa2e6a1..ca70741e92 100644
--- a/fixtures/blocks/src/server/ProfilePage.js
+++ b/fixtures/blocks/src/server/ProfilePage.js
@@ -13,7 +13,7 @@ import ProfileTimeline from './ProfileTimeline';
 import ProfileBio from './ProfileBio';
 
 // TODO: Replace with asset reference.
-import loadProfileNav from './ProfileNav.block';
+import ProfileNav from '../client/ProfileNav';
 
 // TODO: Router component?
 const ProfileRoutes = {
@@ -23,7 +23,6 @@ const ProfileRoutes = {
 
 export default function ProfilePage(props) {
   const user = fetch(`/users/${props.userId}`).json();
-  const ProfileNav = loadProfileNav();
   const match = matchRoute(props, ProfileRoutes);
   return (
     <>
diff --git a/fixtures/blocks/src/server/Shell.block.js b/fixtures/blocks/src/server/Shell.block.js
deleted file mode 100644
index 053fd88468..0000000000
--- a/fixtures/blocks/src/server/Shell.block.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/* eslint-disable import/first */
-
-import * as React from 'react';
-import {unstable_block as block} from 'react';
-
-// Client
-
-// TODO: delete this wrapper.
-
-import ClientShell from '../client/Shell';
-
-function Shell(props, _) {
-  return <ClientShell {...props} />;
-}
-
-export default block(Shell);