Fix @blinkforms/core reference

styczynski · styczynski · commit 41a61a425bc2 · 2019-06-25T18:58:10.000+02:00
diff --git a/blinkforms/react-json-blinkforms b/blinkforms/react-json-blinkforms
@@ -1 +1 @@
-Subproject commit caf2878f3cbd4d67233bf86694df110986a25c81
+Subproject commit e4cf857a9e30cf304020f2ac122ca3f2deca77bb
diff --git a/blinkforms/typescript-core b/blinkforms/typescript-core
@@ -1 +1 @@
-Subproject commit b963ca6fd50fadb0a73dd6299f1add54b1a604c3
+Subproject commit 5ceb5ca18af795382803fec4a1b270b914540637
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,7 +11,7 @@
         "lib": ["es5", "es6", "dom"],
         "baseUrl": "./",
         "paths": {
-            "@blinkforms/core/*": ["./blinkforms/typescript-core/src/*"],
+            "@blinkforms/core": ["./blinkforms/typescript-core"],
             "@blinkforms/react": ["./blinkforms/react-json-blinkforms/bin/index.js"]
         }
     },
diff --git a/webpack.config.js b/webpack.config.js
@@ -83,10 +83,10 @@ module.exports = Object.assign({}, baseConfig, {
             { from: "src/index.html", to: "." },
             { from: "src/assets/favicon.png", to: "assets" },
         ]),
-        new webpack.NormalModuleReplacementPlugin(/@blinkforms\/core\/.*/, function(resource) {
-            resource.request = resource.request.replace(/@blinkforms\/core/, path.resolve(__dirname, path.join('.', 'blinkforms', 'typescript-core', 'src')));
+        new webpack.NormalModuleReplacementPlugin(/@blinkforms\/core/, function(resource) {
+            resource.request = resource.request.replace(/@blinkforms\/core/, path.resolve(__dirname, path.join('.', 'blinkforms', 'typescript-core')));
         }),
-        new webpack.NormalModuleReplacementPlugin(/@blinkforms\/react.*/, function(resource) {
+        new webpack.NormalModuleReplacementPlugin(/@blinkforms\/react/, function(resource) {
             resource.request = resource.request.replace(/@blinkforms\/react/, path.resolve(__dirname, path.join('.', 'blinkforms', 'react-json-blinkforms', 'bin', 'index.js')));
         }),
     ]),

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"lib": ["es5", "es6", "dom"],`
`12`	`12`	`"baseUrl": "./",`
`13`	`13`	`"paths": {`
`14`		`- "@blinkforms/core/": ["./blinkforms/typescript-core/src/"],`
	`14`	`+ "@blinkforms/core": ["./blinkforms/typescript-core"],`
`15`	`15`	`"@blinkforms/react": ["./blinkforms/react-json-blinkforms/bin/index.js"]`
`16`	`16`	`}`
`17`	`17`	`},`