jsf.js_next_gen 1.0.0-beta-13 → 1.0.0-beta-14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "1.0.0-beta-13",
+  "version": "1.0.0-beta-14",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/jsf.js",
   "scripts": {

package/webpack.config.js

@@ -25,7 +25,8 @@ function build(env, argv) {
             extensions: [".tsx", ".ts", ".json"],
             alias: {
                 /*we load the reduced core, because there are some parts we simply do not need*/
-                "mona-dish": path.resolve(__dirname, "node_modules/mona-dish/dist/js/commonjs/index_core.js")
+                //"mona-dish": path.resolve(__dirname, "node_modules/mona-dish/dist/js/commonjs/index_core.js")
+                "mona-dish": path.resolve(__dirname, "node_modules/mona-dish/src/main/typescript/index_core.ts")
             }
         },
         externals: {
@@ -36,8 +37,11 @@ function build(env, argv) {
                 // all files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'
                 {
                     test: /\.tsx?$/, use: [{
-                            loader: "ts-loader"
-                        }], exclude: /node_modules/
+                            loader: "ts-loader",
+                            options: {
+                                allowTsInNodeModules: true
+                            }
+                        }]
                 }, {
                     test: /jsf\.js$/,
                     loader: 'string-replace-loader',

package/webpack.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["webpack.config.ts"],"names":[],"mappings":";;AACA,2BAA4B;AAE5B,IAAI,iBAAiB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAI9D;;;;;;GAMG;AACH,SAAS,KAAK,CAAC,GAA2B,EAAE,IAA4B;;IAEpE,IAAI,aAAa,GAAG,MAAA,GAAG,CAAC,WAAW,mCAAI,QAAQ,CAAC;IAEhD,IAAM,MAAM,GAA0B;QAClC,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,kCAAkC;QACzC,OAAO,EAAE,YAAY;QAErB,MAAM,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC;YACxD,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,oBAAoB;SAC1E;QACD,OAAO,EAAE;YACL,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,gFAAgF;gBACjF,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,uDAAuD,CAAC;aAC/F;SACJ;QACD,SAAS,EAAE;YACP,MAAM,EAAE,MAAM;SACjB;QAED,MAAM,EAAE;YACJ,KAAK,EAAE;gBACH,4EAA4E;gBAC5E;oBACI,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;4BACnB,MAAM,EAAE,WAAW;yBACtB,CAAC,EAAE,OAAO,EAAE,cAAc;iBAC9B,EAAE;oBACC,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,uBAAuB;oBAC/B,OAAO,EAAE;wBACL,MAAM,EAAE,YAAY;wBACpB,OAAO,EAAE,4DAA4D;qBACxE;iBACJ;aACJ;SACJ;QAOD,OAAO,EAAE;YAEJ,IAAI,iBAAiB,CAAC;gBACnB,QAAQ,EAAE,kBAAkB;gBAC5B,SAAS,EAAE,MAAM;gBACjB,IAAI,EAAE,+DAA+D;gBACrE,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,GAAG;aAEhB,CAAC;YACF,IAAI,iBAAiB,CAAC;gBAClB,QAAQ,EAAE,kBAAkB;gBAC5B,SAAS,EAAE,gBAAgB;gBAC3B,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,GAAG;aAChB,CAAC;SACL;KACJ,CAAA;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,qBAAe,KAAK,CAAC"}
+{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["webpack.config.ts"],"names":[],"mappings":";;AACA,2BAA4B;AAE5B,IAAI,iBAAiB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAI9D;;;;;;GAMG;AACH,SAAS,KAAK,CAAC,GAA2B,EAAE,IAA4B;;IAEpE,IAAI,aAAa,GAAG,MAAA,GAAG,CAAC,WAAW,mCAAI,QAAQ,CAAC;IAEhD,IAAM,MAAM,GAA0B;QAClC,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,kCAAkC;QACzC,OAAO,EAAE,YAAY;QAErB,MAAM,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC;YACxD,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,oBAAoB;SAC1E;QAED,OAAO,EAAE;YACL,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,gFAAgF;gBAChF,+FAA+F;gBAC/F,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0DAA0D,CAAC;aACnG;SACJ;QACD,SAAS,EAAE;YACP,MAAM,EAAE,MAAM;SACjB;QAED,MAAM,EAAE;YACJ,KAAK,EAAE;gBACH,4EAA4E;gBAC5E;oBACI,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;4BACnB,MAAM,EAAE,WAAW;4BACnB,OAAO,EAAE;gCACL,oBAAoB,EAAE,IAAI;6BAC7B;yBACJ,CAAC;iBACL,EAAE;oBACC,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,uBAAuB;oBAC/B,OAAO,EAAE;wBACL,MAAM,EAAE,YAAY;wBACpB,OAAO,EAAE,4DAA4D;qBACxE;iBACJ;aACJ;SACJ;QAGD,OAAO,EAAE;YAEJ,IAAI,iBAAiB,CAAC;gBACnB,QAAQ,EAAE,kBAAkB;gBAC5B,SAAS,EAAE,MAAM;gBACjB,IAAI,EAAE,+DAA+D;gBACrE,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,GAAG;aAEhB,CAAC;YACF,IAAI,iBAAiB,CAAC;gBAClB,QAAQ,EAAE,kBAAkB;gBAC5B,SAAS,EAAE,gBAAgB;gBAC3B,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,GAAG;aAChB,CAAC;SACL;KACJ,CAAA;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,qBAAe,KAAK,CAAC"}

package/webpack.config.ts

@@ -26,11 +26,13 @@ function build(env: {[key:string]: string}, argv: {[key:string]: string}) {
             libraryTarget: libraryTarget,
             filename: (argv.mode == "production") ? "jsf.js" : "jsf-development.js"
         },
+
         resolve: {
             extensions: [".tsx", ".ts", ".json"],
             alias: {
                 /*we load the reduced core, because there are some parts we simply do not need*/
-               "mona-dish": path.resolve(__dirname, "node_modules/mona-dish/dist/js/commonjs/index_core.js")
+                //"mona-dish": path.resolve(__dirname, "node_modules/mona-dish/dist/js/commonjs/index_core.js")
+                "mona-dish": path.resolve(__dirname, "node_modules/mona-dish/src/main/typescript/index_core.ts")
             }
         },
         externals: {
@@ -42,8 +44,11 @@ function build(env: {[key:string]: string}, argv: {[key:string]: string}) {
                 // all files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'
                 {
                     test: /\.tsx?$/, use: [{
-                        loader: "ts-loader"
-                    }], exclude: /node_modules/
+                        loader: "ts-loader",
+                        options: {
+                            allowTsInNodeModules: true
+                        }
+                    }]
                 }, {
                     test: /jsf\.js$/,
                     loader: 'string-replace-loader',
@@ -56,10 +61,6 @@ function build(env: {[key:string]: string}, argv: {[key:string]: string}) {
         },
 
 
-
-
-
-
         plugins: [
 
              new CompressionPlugin({