浏览代码

Fix viewer visual tests

sebavan 6 年之前
父节点
当前提交
b48d79e4c9
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 0 3
      Tools/Gulp/tasks/gulpTasks-viewerLibraries.js
  2. 6 1
      Viewer/webpack.gulp.config.js

+ 0 - 3
Tools/Gulp/tasks/gulpTasks-viewerLibraries.js

@@ -10,7 +10,6 @@ var rename = require("gulp-rename");
 // Gulp Helpers
 var processDeclaration = require('../helpers/gulp-processModuleDeclarationToNamespace');
 var addModuleExports = require("../helpers/gulp-addModuleExports");
-const ViewerResolve = require('../../WebpackPlugins/viewerResolve');
 // Import Build Config
 var config = require("../../Config/config.json");
 
@@ -27,8 +26,6 @@ var buildViewerLibrary = function(library, settings) {
             wpConfig.mode = "development";
         }
 
-        wpConfig.resolve.plugins = [new ViewerResolve(["babylonjs", "babylonjs-loaders"])];
-
         let wpBuild = webpackStream(wpConfig, require("webpack"));
 
         //shoud dtsBundle create the declaration?

+ 6 - 1
Viewer/webpack.gulp.config.js

@@ -1,6 +1,8 @@
 const path = require('path');
 const webpack = require('webpack');
 
+const ViewerResolve = require('../Tools/WebpackPlugins/viewerResolve');
+
 module.exports = {
     context: __dirname,
     entry: [
@@ -18,7 +20,10 @@ module.exports = {
             "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'
-        }
+        },
+        plugins: [
+            new ViewerResolve(["babylonjs", "babylonjs-loaders"])
+        ]
     },
     mode: "production",
     module: {