Merge branch 'master' into patch-2

yarigo · Oct 1, 2019 · eee8d80 · eee8d80
2 parents a585702 + 8e0d742
commit eee8d80
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 59 deletions.
diff --git a/packages/redux-dynamic-modules-observable/package.json b/packages/redux-dynamic-modules-observable/package.json
@@ -27,7 +27,7 @@
         "@types/jest": "^23.3.1",
         "@types/redux": "3.6.0",
         "jest": "^23.5.0",
-        "redux-dynamic-modules": "^5.0.2",
+        "redux-dynamic-modules-core": "^5.0.2",
         "rimraf": "^2.6.2",
         "ts-jest": "^23.1.4",
         "tslib": "^1.9.3",
@@ -56,10 +56,10 @@
         ]
     },
     "peerDependencies": {
-        "redux-dynamic-modules": ">=0.0.7"
+        "redux-dynamic-modules-core": ">=0.0.7"
     },
     "dependencies": {
         "redux-observable": "^1.0.0",
         "rxjs": "^6.3.3"
     }
-}
+}
diff --git a/packages/redux-dynamic-modules-observable/src/Contracts.ts b/packages/redux-dynamic-modules-observable/src/Contracts.ts
@@ -1,4 +1,4 @@
-import { IModule } from "redux-dynamic-modules";
+import { IModule } from "redux-dynamic-modules-core";
 import { Epic } from "redux-observable";
 
 export interface IEpicModule<T> extends IModule<T> {

diff --git a/packages/redux-dynamic-modules-observable/src/EpicManager.ts b/packages/redux-dynamic-modules-observable/src/EpicManager.ts
@@ -1,4 +1,4 @@
-import { getStringRefCounter, IItemManager } from "redux-dynamic-modules";
+import { getStringRefCounter, IItemManager } from "redux-dynamic-modules-core";
 import { Epic } from "redux-observable";
 import { merge } from "rxjs";
 

diff --git a/packages/redux-dynamic-modules-observable/src/index.ts b/packages/redux-dynamic-modules-observable/src/index.ts
@@ -1,5 +1,5 @@
 import { createEpicMiddleware } from "redux-observable";
-import { IExtension } from "redux-dynamic-modules";
+import { IExtension } from "redux-dynamic-modules-core";
 import { getEpicManager } from "./EpicManager";
 import { IEpicModule } from "./Contracts";
 

diff --git a/packages/redux-dynamic-modules-observable/webpack.config.js b/packages/redux-dynamic-modules-observable/webpack.config.js
@@ -27,7 +27,7 @@ module.exports = (env, argv) => {
             redux: "redux",
             "react-redux": "react-redux",
             "redux-saga": "redux-saga",
-            "redux-dynamic-modules": "redux-dynamic-modules",
+            "redux-dynamic-modules-core": "redux-dynamic-modules-core",
             rxjs: "rxjs",
             "rxjs/operators": "rxjs/operators",
             "rxjs/observable": "rxjs/observable",

diff --git a/packages/redux-dynamic-modules-react/webpack.config.js b/packages/redux-dynamic-modules-react/webpack.config.js
@@ -1,39 +1,39 @@
-let webpack = require("webpack");
-let BundleAnalyzerPlugin = require("webpack-bundle-analyzer")
-    .BundleAnalyzerPlugin;
-
-module.exports = (env, argv) => {
-    let mode_env = argv.mode || "development";
-
-    return {
-        devtool: "source-map",
-        entry: {
-            main: "./lib/index",
-        },
-
-        output: {
-            library: "redux-dynamic-modules",
-            libraryTarget: "umd",
-            filename:
-                mode_env === "production"
-                    ? "redux-dynamic-modules-react.min.js"
-                    : "redux-dynamic-modules-react.js",
-            path: __dirname + "/dist/",
-        },
-
-        externals: {
-            "prop-types": "prop-types",
-            react: "react",
-            redux: "redux",
-            "react-redux": "react-redux",
-            "redux-saga": "redux-saga",
-        },
-        plugins: [
-            new BundleAnalyzerPlugin({
-                analyzerMode: "static",
-                reportFilename: `react-redux-module.stats.html`,
-                openAnalyzer: false,
-            }),
-        ],
-    };
-};
+let webpack = require("webpack");
+let BundleAnalyzerPlugin = require("webpack-bundle-analyzer")
+    .BundleAnalyzerPlugin;
+
+module.exports = (env, argv) => {
+    let mode_env = argv.mode || "development";
+
+    return {
+        devtool: "source-map",
+        entry: {
+            main: "./lib/index",
+        },
+
+        output: {
+            library: "redux-dynamic-modules-react",
+            libraryTarget: "umd",
+            filename:
+                mode_env === "production"
+                    ? "redux-dynamic-modules-react.min.js"
+                    : "redux-dynamic-modules-react.js",
+            path: __dirname + "/dist/",
+        },
+
+        externals: {
+            "prop-types": "prop-types",
+            react: "react",
+            redux: "redux",
+            "react-redux": "react-redux",
+            "redux-saga": "redux-saga",
+        },
+        plugins: [
+            new BundleAnalyzerPlugin({
+                analyzerMode: "static",
+                reportFilename: `react-redux-module.stats.html`,
+                openAnalyzer: false,
+            }),
+        ],
+    };
+};
diff --git a/packages/redux-dynamic-modules-saga/package.json b/packages/redux-dynamic-modules-saga/package.json
@@ -29,7 +29,7 @@
         "@types/redux": "3.6.0",
         "@types/redux-saga": "0.10.5",
         "jest": "^23.5.0",
-        "redux-dynamic-modules": "^5.0.2",
+        "redux-dynamic-modules-core": "^5.0.2",
         "redux-saga": "0.16.2",
         "rimraf": "^2.6.2",
         "ts-jest": "^23.1.4",
@@ -59,8 +59,8 @@
         ]
     },
     "peerDependencies": {
-        "redux-dynamic-modules": ">=0.0.7",
+        "redux-dynamic-modules-core": ">=0.0.7",
         "redux-saga": ">=0.0.16"
     },
     "gitHead": "8f1ed8a7be500e3e8d388703bab88dbb69eeb54e"
-}
+}
diff --git a/packages/redux-dynamic-modules-saga/src/Contracts.ts b/packages/redux-dynamic-modules-saga/src/Contracts.ts
@@ -1,4 +1,4 @@
-import { IModule } from "redux-dynamic-modules";
+import { IModule } from "redux-dynamic-modules-core";
 
 export interface ISagaWithArguments<T> {
     saga: (argument?: T) => Iterator<any>;

diff --git a/packages/redux-dynamic-modules-saga/src/SagaExtension.ts b/packages/redux-dynamic-modules-saga/src/SagaExtension.ts
@@ -4,7 +4,7 @@ import {
     IItemManager,
     getRefCountedManager,
     IModuleManager,
-} from "redux-dynamic-modules";
+} from "redux-dynamic-modules-core";
 import { ISagaRegistration, ISagaModule } from "./Contracts";
 import { getSagaManager } from "./SagaManager";
 import { sagaEquals } from "./SagaComparer";

diff --git a/packages/redux-dynamic-modules-saga/src/SagaManager.ts b/packages/redux-dynamic-modules-saga/src/SagaManager.ts
@@ -1,7 +1,7 @@
 import { ISagaRegistration, ISagaWithArguments } from "./Contracts";
 import { SagaMiddleware, Task } from "redux-saga";
 import { sagaEquals } from "./SagaComparer";
-import { IItemManager, getMap } from "redux-dynamic-modules";
+import { IItemManager, getMap } from "redux-dynamic-modules-core";
 
 /**
  * Creates saga items which can be used to start and stop sagas dynamically

diff --git a/packages/redux-dynamic-modules-saga/src/__tests__/SagaExtension.test.ts b/packages/redux-dynamic-modules-saga/src/__tests__/SagaExtension.test.ts
@@ -1,4 +1,4 @@
-import { createStore } from "redux-dynamic-modules";
+import { createStore } from "redux-dynamic-modules-core";
 import { getSagaExtension } from "../SagaExtension";
 import { ISagaModule } from "../Contracts";
 import { SagaIterator } from "redux-saga";

diff --git a/packages/redux-dynamic-modules-saga/webpack.config.js b/packages/redux-dynamic-modules-saga/webpack.config.js
@@ -27,7 +27,7 @@ module.exports = (env, argv) => {
             redux: "redux",
             "react-redux": "react-redux",
             "redux-saga": "redux-saga",
-            "redux-dynamic-modules": "redux-dynamic-modules",
+            "redux-dynamic-modules-core": "redux-dynamic-modules-core",
         },
         plugins: [
             new BundleAnalyzerPlugin({

diff --git a/packages/redux-dynamic-modules-thunk/package.json b/packages/redux-dynamic-modules-thunk/package.json
@@ -26,7 +26,7 @@
         "@types/jest": "^23.3.1",
         "@types/redux": "3.6.0",
         "jest": "^23.5.0",
-        "redux-dynamic-modules": "^5.0.2",
+        "redux-dynamic-modules-core": "^5.0.2",
         "redux-thunk": "^2.3.0",
         "rimraf": "^2.6.2",
         "ts-jest": "^23.1.4",
@@ -54,8 +54,8 @@
         ]
     },
     "peerDependencies": {
-        "redux-dynamic-modules": ">=0.0.7",
+        "redux-dynamic-modules-core": ">=0.0.7",
         "redux-thunk": ">= 2.0.0"
     },
     "gitHead": "8f1ed8a7be500e3e8d388703bab88dbb69eeb54e"
-}
+}
diff --git a/packages/redux-dynamic-modules-thunk/src/index.ts b/packages/redux-dynamic-modules-thunk/src/index.ts
@@ -1,5 +1,5 @@
 import thunk from "redux-thunk";
-import { IExtension } from "redux-dynamic-modules";
+import { IExtension } from "redux-dynamic-modules-core";
 
 export function getThunkExtension(): IExtension {
     return {

diff --git a/packages/redux-dynamic-modules-thunk/webpack.config.js b/packages/redux-dynamic-modules-thunk/webpack.config.js
@@ -27,7 +27,7 @@ module.exports = (env, argv) => {
             redux: "redux",
             "react-redux": "react-redux",
             "redux-thunk": "redux-thunk",
-            "redux-dynamic-modules": "redux-dynamic-modules",
+            "redux-dynamic-modules-core": "redux-dynamic-modules-core",
         },
         plugins: [
             new BundleAnalyzerPlugin({