Skip to content

Commit

Permalink
webpack to vite
Browse files Browse the repository at this point in the history
  • Loading branch information
@milahu
milahu committed Nov 25, 2022
1 parent 0aa8744 commit 12cd2de
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 118 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ node_modules
/sessions
/.env*
/session-store.db
/dist/
1 change: 0 additions & 1 deletion dist/.gitignore
View file

This file was deleted.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"make:application": "osjs-cli make:application",
"make:iframe-application": "osjs-cli make:iframe-application",
"make:provider": "osjs-cli make:provider",
"build": "webpack",
"watch": "webpack --watch"
"build": "vite build",
"watch": "vite build --watch"
},
"keywords": [
"osjs"
Expand All @@ -27,8 +27,8 @@
"license": "BSD-2-Clause",
"devDependencies": {
"@osjs/dev-meta": "^2.1.0",
"html-webpack-plugin": "^3.2.0",
"source-map-loader": "^0.2.4"
"vite": "^3.2.4",
"vite-plugin-html": "^3.2.0"
},
"dependencies": {
"@osjs/calculator-application": "^1.2.8",
Expand Down
4 changes: 3 additions & 1 deletion src/client/index.ejs → src/client/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<meta name="google" content="notranslate" />
<meta name="description" content="OS.js - JavaScript Cloud/Web Desktop Platform" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<title><%= htmlWebpackPlugin.options.title %></title>
<title>OS.js</title>
<script src="index.js" type="module" defer></script>
<link rel="icon" href="favicon.png">
</head>
<body>
</body>
Expand Down
10 changes: 5 additions & 5 deletions src/client/index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
// OS.js defaults.
//

@import "~typeface-roboto/index.css";
@import "~@osjs/client/dist/main.css";
@import "~@osjs/gui/dist/main.css";
@import "~@osjs/dialogs/dist/main.css";
@import "~@osjs/panels/dist/main.css";
@import "typeface-roboto/index.css";
@import "@osjs/client/dist/main.css";
@import "@osjs/gui/dist/main.css";
@import "@osjs/dialogs/dist/main.css";
@import "@osjs/panels/dist/main.css";

body,
html {
Expand Down
44 changes: 44 additions & 0 deletions vite.config.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@