WIP Fix.

Author: Martynas Žilinskas

packages/simplr-validation/package.json

@@ -1,11 +1,10 @@
 {
   "name": "simplr-validation",
-  "version": "4.0.0-pre-alpha.8",
+  "version": "4.0.1-alpha",
   "description": "Validation library for simplr-forms.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
-  "main": "dist/simplr-validation.js",
-  "types": "@types/index.d.ts",
+  "main": "index.js",
   "author": "simplrjs <[email protected]> (https://github.com/simplrjs)",
   "scripts": {
     "test": "jest",
@@ -56,7 +55,7 @@
     "action-emitter": "^0.2.1",
     "immutable": "^3.8.1",
     "react": "^15.5.4",
-    "simplr-forms": "4.0.0-pre-alpha.20",
+    "simplr-forms": "4.0.1-alpha",
     "validator": "^7.0.0"
   },
   "jest": {

packages/simplr-validation/src/abstractions.ts

@@ -1 +1 @@
-export * from "./abstractions";
+export * from "./abstractions/index";

packages/simplr-validation/tools/webpack.config.ts

@@ -14,6 +14,16 @@ for (const key in packageJson.dependencies) {
 }
 
 const externalsResolver = [
+    function (context, request, callback) {
+        // console.log(request);
+        if (request.indexOf("simplr-forms") !== -1) {
+            const resolveTo = "simplr-forms";
+            console.log(`Resolving:\n${request}\nTo:\n${resolveTo}\n`);
+            callback(resolveTo);
+            return;
+        }
+        callback();
+    },
     externals,
     function (context: string, request: string, callback: Function) {
         const directoriesToTest = [
@@ -36,7 +46,15 @@ const externalsResolver = [
 
         if (passingTest != null) {
             const resolvedPath = path.resolve(context, request);
+            let notIndexFile = true;
+            for (const directory of directoriesToTest) {
+                if (request === `./${directory}/index`) {
+                    notIndexFile = false;
+                }
+            }
+
             const shouldReplaceWithCustomResolve =
+                notIndexFile &&
                 request.indexOf("src") === -1 &&
                 resolvedPath.indexOf(path.join(__dirname, `src/${passingTest.directory}`)) !== -1;
 
@@ -53,9 +71,9 @@ const externalsResolver = [
 module.exports = {
     entry: {
         index: "./src/index.ts",
-        abstractions: "./src/abstractions.ts",
-        subscribers: "./src/subscribers.ts",
-        utils: "./src/utils.ts"
+        abstractions: "./src/abstractions/index.ts",
+        subscribers: "./src/subscribers/index.ts",
+        utils: "./src/utils/index.ts"
     },
     output: {
         filename: "./dist/[name].js",

packages/simplr-validation/webpack.config.js

@@ -9,6 +9,16 @@ for (var key in packageJson.dependencies) {
     }
 }
 var externalsResolver = [
+    function (context, request, callback) {
+        // console.log(request);
+        if (request.indexOf("simplr-forms") !== -1) {
+            var resolveTo = "simplr-forms";
+            console.log("Resolving:\n" + request + "\nTo:\n" + resolveTo + "\n");
+            callback(resolveTo);
+            return;
+        }
+        callback();
+    },
     externals,
     function (context, request, callback) {
         var directoriesToTest = [
@@ -29,7 +39,15 @@ var externalsResolver = [
         }
         if (passingTest != null) {
             var resolvedPath = path.resolve(context, request);
-            var shouldReplaceWithCustomResolve = request.indexOf("src") === -1 &&
+            var notIndexFile = true;
+            for (var _a = 0, directoriesToTest_1 = directoriesToTest; _a < directoriesToTest_1.length; _a++) {
+                var directory = directoriesToTest_1[_a];
+                if (request === "./" + directory + "/index") {
+                    notIndexFile = false;
+                }
+            }
+            var shouldReplaceWithCustomResolve = notIndexFile &&
+                request.indexOf("src") === -1 &&
                 resolvedPath.indexOf(path.join(__dirname, "src/" + passingTest.directory)) !== -1;
             if (shouldReplaceWithCustomResolve) {
                 var customResolve = "./" + passingTest.directory;
@@ -43,9 +61,9 @@ var externalsResolver = [
 module.exports = {
     entry: {
         index: "./src/index.ts",
-        abstractions: "./src/abstractions.ts",
-        subscribers: "./src/subscribers.ts",
-        utils: "./src/utils.ts"
+        abstractions: "./src/abstractions/index.ts",
+        subscribers: "./src/subscribers/index.ts",
+        utils: "./src/utils/index.ts"
     },
     output: {
         filename: "./dist/[name].js",