FIX: The real fix of requireWeak(..) use compatibility with npm link?

Author: birdofpreyru

config/webpack/lib-base.js

@@ -59,9 +59,6 @@ module.exports = function configFactory(ops) {
       'url-parse',
     ],
     mode: ops.mode,
-    node: {
-      __dirname: false,
-    },
     output: {
       filename: 'index.js',
 

package.json

@@ -123,9 +123,9 @@
   },
   "scripts": {
     "build": "npm run clean && npm run build:dev && npm run build:prod",
-    "build:dev": "npm run mkDistDir:dev && ./node_modules/.bin/webpack --env=development --bail --colors --display-optimization-bailout --profile --progress && BABEL_ENV=development babel src/server --out-dir dist/dev/server && BABEL_ENV=development babel src/shared/utils/jest.jsx --out-file dist/dev/jest.js && BABEL_ENV=development babel src/client/init.js --out-file dist/dev/client/init.js",
-    "build:dev:watch": "npm run clean && npm run mkDistDir:dev && (./node_modules/.bin/webpack --env=development --bail --colors --display-optimization-bailout --profile --progress --watch | BABEL_ENV=development babel src/server --out-dir dist/dev/server --watch | BABEL_ENV=development babel src/shared/utils/jest.jsx --out-file dist/dev/jest.js --watch | BABEL_ENV=development babel src/client/init.js --out-file dist/dev/client/init.js --watch)",
-    "build:prod": "npm run mkDistDir:prod && ./node_modules/.bin/webpack --env=production --colors --display-optimization-bailout --profile --progress && BABEL_ENV=production babel src/server --out-dir dist/prod/server && BABEL_ENV=production babel src/shared/utils/jest.jsx --out-file dist/prod/jest.js && BABEL_ENV=production babel src/client/init.js --out-file dist/prod/client/init.js",
+    "build:dev": "npm run mkDistDir:dev && ./node_modules/.bin/webpack --env=development --bail --colors --display-optimization-bailout --profile --progress && BABEL_ENV=development babel src/server --out-dir dist/dev/server && BABEL_ENV=development babel src/shared/utils/jest.jsx --out-file dist/dev/shared/utils/jest.js && BABEL_ENV=development babel src/client/init.js --out-file dist/dev/client/init.js",
+    "build:dev:watch": "npm run clean && npm run mkDistDir:dev && (./node_modules/.bin/webpack --env=development --bail --colors --display-optimization-bailout --profile --progress --watch | BABEL_ENV=development babel src/server --out-dir dist/dev/server --watch | BABEL_ENV=development babel src/shared/utils/jest.jsx --out-file dist/dev/shared/utils/jest.js --watch | BABEL_ENV=development babel src/client/init.js --out-file dist/dev/client/init.js --watch)",
+    "build:prod": "npm run mkDistDir:prod && ./node_modules/.bin/webpack --env=production --colors --display-optimization-bailout --profile --progress && BABEL_ENV=production babel src/server --out-dir dist/prod/server && BABEL_ENV=production babel src/shared/utils/jest.jsx --out-file dist/prod/shared/utils/jest.js && BABEL_ENV=production babel src/client/init.js --out-file dist/prod/client/init.js",
     "clean": "./node_modules/.bin/rimraf dist",
     "jest": "NODE_CONFIG_ENV=test jest --no-cache --maxWorkers=4 --config config/jest/default.js",
     "lint": "npm run lint:js && npm run lint:scss",

src/index.js

@@ -18,7 +18,8 @@ import * as utils from 'utils';
 
 import { requireWeak } from 'utils/webpack';
 
-const serverUrl = path.resolve(__dirname, './server');
+const serverUrl = module.webpackPolyfill ? './server'
+  : path.resolve(__dirname, './server');
 const server = utils.isomorphy.isServerSide() ? requireWeak(serverUrl) : null;
 
 export {

src/shared/utils/index.js

@@ -5,7 +5,9 @@ import * as isomorphy from './isomorphy';
 import * as redux from './redux';
 import * as webpack from './webpack';
 
-const juUrl = path.resolve(__dirname, './jest');
+const juUrl = module.webpackPolyfill ? './shared/utils/jest'
+  : path.resolve(__dirname, './jest');
+
 const JU = isomorphy.isServerSide() ? webpack.requireWeak(juUrl) : null;
 
 export {