Revert "Merge branch 'materialManager' into 'master'"

This reverts commit 222e979, reversing changes made to 8e1d302.
BobRazowsky · May 27, 2019 · de791fe · de791fe
1 parent 222e979
commit de791fe
Show file tree

Hide file tree

Showing 24 changed files with 1,429 additions and 1,794 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -10,8 +10,6 @@
   "rules": {
     "quotes": ["error", "double"],
     "indent": ["error", 4],
-    "no-underscore-dangle": "off",
-    "no-plusplus": "off",
     "padded-blocks": [
       "error",
       {
@@ -36,23 +34,15 @@
         "functions": "ignore"
       }
     ],
-    "no-param-reassign": ["error", {
-      "props": false
-    }],
-    "global-require": "off",
-    "object-shorthand": "off"
+    "no-param-reassign": ["error", { "props": false }],
+    "global-require": "off"
   },
-  "overrides": [{
-    "files": ["*.test.js"],
-    "env": {
-      "jest": true
-    }
-  }],
-  "settings": {
-    "import/resolver": {
-      "webpack": {
-        "config": "config/webpack.common.js"
+  "overrides": [
+    {
+      "files": ["*.test.js"],
+      "env": {
+        "jest": true
       }
     }
-  }
+  ]
 }
diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # Notice :
 
-This is a fork of https://git.wanadev.org/obsidian/starter with a babylonjs 3D scene and vueJs.  
-It uses the **[obsidian-babylon-engine](https://git.wanadev.org/obsidian/obsidian-engine-babylonjs)** and **[obsidian-material-manager](https://git.wanadev.org/ldemicheli/obsidian-material-manager)** modules.
+This is a fork of https://github.com/wanadev/obsidianjs-starter adding Wanadev
+specific (private) configuration for deployment & caas.
 
-Upstream repository url: `git@git.wanadev.org:obsidian/starter.git`
+Please do not submit merge requests or open issues here if not linked to Wanadev
+infrastructure.
+
+Upstream repository url: `git@github.com:wanadev/obsidianjs-starter.git`
 
 ---
 

diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -4,10 +4,6 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 
-// Vue Config
-const VueLoaderPlugin = require("vue-loader/lib/plugin");
-
-
 const ROOT_DIR = path.resolve(__dirname, "../");
 
 module.exports = {
@@ -16,71 +12,55 @@ module.exports = {
     },
     target: "web",
     module: {
-        rules: [{
-            test: /\.(js|jsx)$/,
-            use: [{
-                loader: "babel-loader",
-                options: {
-                    cacheDirectory: true,
-                    presets: ["@babel/preset-env"],
-                },
-            }],
-            exclude: path.join(ROOT_DIR, "node_modules"),
-        },
-        {
-            test: /\.css$/,
-            use: [MiniCssExtractPlugin.loader, "css-loader", "postcss-loader"],
-        },
-        {
-            test: /\.less$/,
-            use: [MiniCssExtractPlugin.loader, "css-loader", "less-loader", "postcss-loader"],
-        },
-        {
-            test: /\.glsl$/,
-            use: [{
-                loader: "webpack-glsl-loader",
-            }],
-        },
-        {
-            test: /\.vue$/,
-            use: [{
-                loader: "vue-loader",
-            }],
-            exclude: path.join(ROOT_DIR, "node_modules"),
-        },
+        rules: [
+            {
+                test: /\.(js|jsx)$/,
+                use: [
+                    {
+                        loader: "babel-loader",
+                        options: {
+                            cacheDirectory: true,
+                        },
+                    },
+                ],
+                exclude: path.join(ROOT_DIR, "node_modules"),
+            },
+            {
+                test: /\.css$/,
+                use: [MiniCssExtractPlugin.loader, "css-loader", "postcss-loader"],
+            },
+            {
+                test: /\.less$/,
+                use: [MiniCssExtractPlugin.loader, "css-loader", "less-loader", "postcss-loader"],
+            },
+            {
+                test: /\.glsl$/,
+                use: [
+                    {
+                        loader: "webpack-glsl-loader",
+                    },
+                ],
+            },
         ],
     },
     plugins: [
         new MiniCssExtractPlugin({
             filename: "style/[name].[chunkhash].bundle.css",
         }),
-        new CopyWebpackPlugin([{
-            from: "**/*",
-            to: "assets",
-            context: "src/assets",
-        },
-        {
-            from: "*/assets/**/*",
-            to: "assets/modules/[1]/[2]",
-            test: /.*src[\\/]modules[\\/]([^\\/]*)[\\/]assets[\\/](.+)$/,
-            context: "src/modules",
-        },
+        new CopyWebpackPlugin([
+            { from: "**/*", to: "assets", context: "src/assets" },
+            {
+                from: "*/assets/**/*",
+                to: "assets/modules/[1]/[2]",
+                test: /.*src[\\/]modules[\\/]([^\\/]*)[\\/]assets[\\/](.+)$/,
+                context: "src/modules",
+            },
         ]),
         new HtmlWebpackPlugin({
             template: "src/index.html",
             inject: true,
             sourceMap: true,
             chunksSortMode: "dependency",
         }),
-
-        // VueJs !
-        new VueLoaderPlugin(),
     ],
-
-    resolve: {
-        alias: {
-            vue: "vue/dist/vue.js",
-            src: path.resolve("src"),
-        },
-    },
 };
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
@@ -13,7 +13,7 @@ const PORT = process.env.PORT || 8080;
 
 module.exports = merge(common, {
     mode: "development",
-    devtool: "eval-source-map",
+    devtool: "cheap-eval-source-map",
     output: {
         path: DIST_DIR,
         filename: "bundle.js",