Fix $params in web bundle

Akryum · May 24, 2018 · 55fac61 · 55fac61
1 parent b1c61b6
commit 55fac61
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/build/webpack.bundle.conf.js b/build/webpack.bundle.conf.js
@@ -31,7 +31,8 @@ module.exports = merge(base, {
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {
-        NODE_ENV: '"production"'
+        NODE_ENV: '"production"',
+        BUILD: '"web"'
       }
     })
   ],

diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
@@ -19,7 +19,8 @@ module.exports = merge(baseWebpackConfig, {
   devtool: '#eval',
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': config.dev.env
+      'process.env': config.dev.env,
+      'process.env.BUILD': '"dev"'
     }),
     new webpack.HotModuleReplacementPlugin(),
     new HtmlWebpackPlugin({

diff --git a/build/webpack.docs.conf.js b/build/webpack.docs.conf.js
@@ -23,7 +23,8 @@ var webpackConfig = merge(baseWebpackConfig, {
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
-      'process.env': env
+      'process.env.NODE_ENV': env.NODE_ENV,
+      'process.env.BUILD': '"docs"'
     }),
     // extract css into its own file
     new MiniCssExtractPlugin({

diff --git a/dist/validators.min.js b/dist/validators.min.js
diff --git a/dist/vuelidate.min.js b/dist/vuelidate.min.js
diff --git a/src/withParamsBrowser.js b/src/withParamsBrowser.js
@@ -4,10 +4,10 @@
 // fallback to stubbed WithParams on failure.
 
 const root =
-  typeof global !== 'undefined'
-    ? global
-    : typeof window !== 'undefined'
-      ? window
+  typeof window !== 'undefined'
+    ? window
+    : typeof global !== 'undefined'
+      ? global
       : {}
 
 /* istanbul ignore next */