webpack to vite

os-js · Nov 25, 2022 · ebcd151 · ebcd151
1 parent 0aa8744
commit ebcd151
Show file tree

Hide file tree

Showing 8 changed files with 338 additions and 392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ node_modules
 /sessions
 /.env*
 /session-store.db
+/dist/
diff --git a/dist/.gitignore b/dist/.gitignore
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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"
@@ -27,8 +27,7 @@
   "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"
   },
   "dependencies": {
     "@osjs/calculator-application": "^1.2.8",

diff --git a/src/client/index.ejs → src/client/index.html b/src/client/index.ejs → src/client/index.html
@@ -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>

diff --git a/src/client/index.scss b/src/client/index.scss
@@ -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 {

diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,42 @@
+// @ts-ignore
+const npm = require('./package.json');
+
+const assetsDir = '';
+
+const outputDefaults = {
+  // remove hashes from filenames
+  entryFileNames: `${assetsDir}[name].js`,
+  chunkFileNames: `${assetsDir}[name].js`,
+  assetFileNames: `${assetsDir}[name].[ext]`,
+};
+
+/** @type {import("vite").UserConfig} */
+module.exports = {
+  clearScreen: false,
+  root: "src/client",
+  base: "./", // generate relative paths in html
+  define: {
+    OSJS_VERSION: JSON.stringify(npm.version),
+  },
+  worker: {
+    rollupOptions: {
+      output: {
+        ...outputDefaults,
+      }
+    },
+  },
+  build: {
+    outDir: "../../dist", // relative to root
+    emptyOutDir: true,
+    target: 'esnext',
+    minify: false,
+    sourcemap: true,
+    rollupOptions: {
+      output: {
+        ...outputDefaults,
+      },
+    },
+  },
+  plugins: [
+  ],
+};
diff --git a/webpack.config.js b/webpack.config.js