Browse Source

update webpack and package json

Trevor Baron 6 years ago
parent
commit
d4737eca9b
2 changed files with 5 additions and 49 deletions
  1. 2 0
      Viewer/package.json
  2. 3 49
      Viewer/webpack.config.js

+ 2 - 0
Viewer/package.json

@@ -39,6 +39,8 @@
         "webpack-dev-server": "^3.1.4"
     },
     "dependencies": {
+        "@babylonjs/core": "^4.0.0-alpha.18",
+        "@babylonjs/loaders": "^4.0.0-alpha.18",
         "pepjs": "^0.4.3"
     }
 }

+ 3 - 49
Viewer/webpack.config.js

@@ -1,52 +1,11 @@
 const path = require('path');
 const webpack = require('webpack');
 
-module.exports = /*[
-    {
-    entry: {
-        'assets': './src/assets/index.ts'
-    },
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: '[name].js',
-        devtoolModuleFilenameTemplate: '[relative-resource-path]'
-    },
-    plugins: [
-        new webpack.WatchIgnorePlugin([
-            /\.d\.ts$/
-        ])
-    ],
-    resolve: {
-        extensions: ['.ts', '.js']
-    },
-    module: {
-        loaders: [{
-            test: /\.tsx?$/,
-            loader: 'ts-loader',
-            exclude: /node_modules/
-        },
-        {
-            test: /\.(html)$/,
-            use: {
-                loader: 'html-loader',
-                options: {
-                    minimize: true
-                }
-            }
-        },
-        {
-            test: /\.(jpe?g|png|ttf|eot|svg?)(\?[a-z0-9=&.]+)?$/,
-            use: 'base64-image-loader?limit=1000&name=[name].[ext]'
-        },
-        {
-            test: /\.(woff|ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-            loader: 'base64-font-loader'
-        }]
-    }
-},*/
+module.exports = 
     {
         entry: {
             'viewer': './src/index.ts',
+            'renderOnlyViewer': './src/renderOnlyIndex.ts',
         },
         output: {
             path: path.resolve(__dirname, 'dist'),
@@ -59,10 +18,6 @@ module.exports = /*[
         resolve: {
             extensions: ['.ts', '.js'],
             alias: {
-                "babylonjs": __dirname + '/../dist/preview release/babylon.max.js',
-                "babylonjs-materials": __dirname + '/../dist/preview release/materialsLibrary/babylonjs.materials.js',
-                "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js',
-                "babylonjs-viewer-assets": __dirname + '/src/assets/index.ts'
             }
         },
         mode: "development",
@@ -102,5 +57,4 @@ module.exports = /*[
             //open: true,
             port: 9000
         }
-    }
-//]
+    }