Skip to content

Commit

Permalink
run prettier. add dev vite config
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandf committed Jun 27, 2024
1 parent c041a07 commit 58d90f3
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 31 deletions.
7 changes: 1 addition & 6 deletions lib/icicle-tapisui-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ import {
EnumTapisCoreService,
} from '@tapis/tapisui-extensions-core';
import { tasks as generatedTasks } from './gen';
import {
MLEdge,
SmartScheduler,
JupyterLab,
OpenWebUI,
} from './pages';
import { MLEdge, SmartScheduler, JupyterLab, OpenWebUI } from './pages';

const extension = createExtension({
allowMultiTenant: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ const JupyterLab: React.FC = () => {
);
};

export default JupyterLab
export default JupyterLab;
2 changes: 1 addition & 1 deletion lib/icicle-tapisui-extension/src/pages/JupyterLab/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as JupyterLab } from "./JupyterLab"
export { default as JupyterLab } from './JupyterLab';
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ const MLEdge: React.FC = () => {
);
};

export default MLEdge
export default MLEdge;
2 changes: 1 addition & 1 deletion lib/icicle-tapisui-extension/src/pages/MLEdge/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as MLEdge } from "./MLEdge"
export { default as MLEdge } from './MLEdge';
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ const OpenWebUI: React.FC = () => {
);
};

export default OpenWebUI
export default OpenWebUI;
2 changes: 1 addition & 1 deletion lib/icicle-tapisui-extension/src/pages/OpenWebUI/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as OpenWebUI } from "./OpenWebUI"
export { default as OpenWebUI } from './OpenWebUI';
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ const SmartScheduler: React.FC = () => {
);
};

export default SmartScheduler
export default SmartScheduler;
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as SmartScheduler } from "./SmartScheduler"
export { default as SmartScheduler } from './SmartScheduler';
16 changes: 4 additions & 12 deletions lib/icicle-tapisui-extension/src/pages/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
export { JupyterLab } from "./JupyterLab"
export { OpenWebUI } from "./OpenWebUI"
export { MLEdge } from "./MLEdge"
export { SmartScheduler } from "./SmartScheduler"








export { JupyterLab } from './JupyterLab';
export { OpenWebUI } from './OpenWebUI';
export { MLEdge } from './MLEdge';
export { SmartScheduler } from './SmartScheduler';
4 changes: 1 addition & 3 deletions lib/tapisui-api/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import viteTsconfigPaths from 'vite-tsconfig-paths';

export default defineConfig({
base: '',
plugins: [
viteTsconfigPaths(),
]
plugins: [viteTsconfigPaths()],
});
5 changes: 4 additions & 1 deletion lib/tapisui-common/src/ui/ProtectedRoute/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { Route, Redirect, RouteComponentProps } from 'react-router-dom';

// A wrapper for <Route> that redirects to the login
// screen if you're not yet authenticated.
type ProtectedRouteProps = RouteComponentProps & { accessToken: string | undefined, path: string };
type ProtectedRouteProps = RouteComponentProps & {
accessToken: string | undefined;
path: string;
};

const ProtectedRoute: React.FC<
React.PropsWithChildren<ProtectedRouteProps>
Expand Down
1 change: 0 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { HashRouter as Router } from 'react-router-dom';
import { createRoot } from 'react-dom/client';
import App from 'app';
Expand Down
2 changes: 2 additions & 0 deletions vite/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ export default defineConfig({
external: ['lib'],
},
},
logLevel: 'info',
server: {
open: false, // Open browser
host: '0.0.0.0',
port: 3000,
},
});
42 changes: 42 additions & 0 deletions vite/vite.dev.config.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import viteTsconfigPaths from 'vite-tsconfig-paths';
import envCompatible from 'vite-plugin-env-compatible';
import commonjs from '@rollup/plugin-commonjs';
import viteCommonjs from 'vite-plugin-commonjs';

export default defineConfig({
// depending on your application, base can also be "/"
base: '',
define: {
global: 'window',
define: {
'process.platform': null,
'process.version': null,
},
},
css: { preprocessorOptions: { scss: { charset: false } } },
plugins: [
react(),
commonjs({
include: /node_modules/, // Ensure CommonJS transformation for node_modules
requireReturnsDefault: 'auto', // Handle default exports correctly
}),
viteCommonjs(),
viteTsconfigPaths(),
envCompatible(),
],
build: {
outDir: 'build',
manifest: true,
rollupOptions: {
external: ['lib'],
},
},
logLevel: 'info',
server: {
open: false, // Open browser
host: '0.0.0.0',
port: 3000,
},
});
1 change: 1 addition & 0 deletions vite/vite.local.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export default defineConfig({
external: ['lib'],
},
},
logLevel: 'info',
server: {
open: true, // Opens browser
port: 3000,
Expand Down

0 comments on commit 58d90f3

Please sign in to comment.