Merge branch 'master' into fix-access-control-args

keystonejs · Oct 30, 2020 · 41943ae · 41943ae
2 parents b3ee14e + 14c5228
commit 41943ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages-next/fields/src/types/relationship/views/index.tsx b/packages-next/fields/src/types/relationship/views/index.tsx
@@ -17,7 +17,7 @@ import { Fragment, useState } from 'react';
 import { Button } from '@keystone-ui/button';
 import { Tooltip } from '@keystone-ui/tooltip';
 import { PlusIcon } from '@keystone-ui/icons/icons/PlusIcon';
-import { CreateItemDrawer } from '@keystone-next/admin-ui/src/components/CreateItemDrawer';
+import { CreateItemDrawer } from '@keystone-next/admin-ui/components';
 import { DrawerController } from '@keystone-ui/modals';
 
 function LinkToRelatedItems({

diff --git a/packages-next/keystone/src/scripts/dev.ts b/packages-next/keystone/src/scripts/dev.ts
@@ -12,6 +12,13 @@ const PORT = process.env.PORT || 3000;
 
 // TODO: Don't generate or start an Admin UI if it isn't configured!!
 
+const devLoadingHTMLFilepath = path.join(
+  path.dirname(require.resolve('@keystone-next/keystone/package.json')),
+  'src',
+  'static',
+  'dev-loading.html'
+);
+
 export const dev = async () => {
   console.log('🤞 Starting Keystone');
 
@@ -40,7 +47,7 @@ export const dev = async () => {
   });
   server.use((req, res, next) => {
     if (adminUIServer) return adminUIServer(req, res, next);
-    res.sendFile(path.resolve(__dirname, '../static/dev-loading.html'));
+    res.sendFile(devLoadingHTMLFilepath);
   });
   server.listen(PORT, (err?: any) => {
     if (err) throw err;