Merge branch 'master' into subapp-redux-bundler

electrode-io · Jan 7, 2020 · 042025f · 042025f
2 parents d578b7f + 9c2c009
commit 042025f
Show file tree

Hide file tree

Showing 14 changed files with 298 additions and 171 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/lerna.json b/lerna.json
@@ -8,7 +8,7 @@
     "publishConfig": {
       "tags": {
         "beta7": {
-          "enabled": true,
+          "enabled": false,
           "packages": {
             "electrode-archetype-react-app": true,
             "electrode-archetype-react-app-dev": true,

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,15 +1,14 @@
 {
   "name": "@xarc/create-app",
-  "version": "2.0.0-beta7.0",
+  "version": "2.0.2",
   "description": "Create react.js/node.js webapp using the Electrode Platform",
   "main": "dist/index.js",
   "scripts": {
     "prepublishOnly": "webpack"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "tag": "beta7"
+    "access": "public"
   },
   "bin": {
     "create-app": "bin/create-app.js"

diff --git a/packages/electrode-archetype-opt-jest/package.json b/packages/electrode-archetype-opt-jest/package.json
@@ -1,13 +1,17 @@
 {
   "name": "electrode-archetype-opt-jest",
-  "version": "1.0.4",
+  "version": "24.0.1",
   "description": "Electrode NodeJS/React Optional Archetype JEST",
   "main": "optional-check.js",
   "homepage": "http://www.electrode.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/electrode-io/electrode.git"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "tag": "jest24"
+  },
   "bugs": {
     "url": "https://github.com/electrode-io/electrode/issues"
   },
@@ -24,12 +28,10 @@
     "Joel Chen <[email protected]>"
   ],
   "dependencies": {
-    "@types/jest": "^23.3.14",
-    "babel-jest": "^23.6.0",
-    "enzyme": "^3.0.0",
-    "enzyme-adapter-react-16": "^1.1.0",
-    "eslint-plugin-jest": "^21.27.2",
-    "jest": "^23.6.0"
+    "@types/jest": "^24.0.18",
+    "babel-jest": "^24.9.0",
+    "eslint-plugin-jest": "^22.15.2",
+    "jest": "^24.9.0"
   },
   "devDependencies": {
     "opt-archetype-check": "../opt-archetype-check",
@@ -40,5 +42,10 @@
     "expectTag": true,
     "devOnly": true,
     "defaultInstall": true
+  },
+  "fyn": {
+    "devDependencies": {
+      "opt-archetype-check": "../opt-archetype-check"
+    }
   }
 }
diff --git a/packages/electrode-archetype-react-app-dev/package.json b/packages/electrode-archetype-react-app-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-archetype-react-app-dev",
-  "version": "7.0.0-beta7.0",
+  "version": "7.0.2",
   "description": "Electrode NodeJS/React Application Archetype (Development)",
   "main": "index.js",
   "homepage": "http://www.electrode.io",
@@ -195,6 +195,7 @@
     "cache": true
   },
   "publishConfig": {
-    "tag": "beta7"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   }
 }
diff --git a/packages/electrode-archetype-react-app/package.json b/packages/electrode-archetype-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-archetype-react-app",
-  "version": "7.0.0-beta7.0",
+  "version": "7.0.2",
   "description": "Electrode NodeJS/React Universal Application Archetype",
   "main": "arch-clap.js",
   "homepage": "http://www.electrode.io",
@@ -78,6 +78,7 @@
     }
   },
   "publishConfig": {
-    "tag": "beta7"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   }
 }
diff --git a/packages/electrode-archetype-react-component-dev/package.json b/packages/electrode-archetype-react-component-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-archetype-react-component-dev",
-  "version": "7.0.0-beta7.0",
+  "version": "7.0.2",
   "description": "Electrode Component (Development)",
   "homepage": "http://www.electrode.io",
   "repository": {
@@ -127,6 +127,7 @@
     }
   },
   "publishConfig": {
-    "tag": "beta7"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   }
 }
diff --git a/packages/electrode-archetype-react-component/package.json b/packages/electrode-archetype-react-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-archetype-react-component",
-  "version": "7.0.0-beta7.0",
+  "version": "7.0.2",
   "description": "Archetype - Electrode Component",
   "homepage": "http://www.electrode.io",
   "repository": {
@@ -44,6 +44,7 @@
     }
   },
   "publishConfig": {
-    "tag": "beta7"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   }
 }
diff --git a/packages/electrode-ignite/package.json b/packages/electrode-ignite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-ignite",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "The CLI tool for development with OSS Electrode React/NodeJS Platform.",
   "main": "bin/ignite.js",
   "scripts": {
@@ -49,7 +49,7 @@
   "dependencies": {
     "bluebird": "^3.5.1",
     "chalk": "^2.0.1",
-    "generator-electrode": "^6.0.0-beta7.0",
+    "generator-electrode": "^6.0.2",
     "ignite-core": "^1.1.9",
     "opn": "^5.1.0",
     "xclap-cli": "^0.1.3",

diff --git a/packages/generator-electrode/package.json b/packages/generator-electrode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-electrode",
-  "version": "6.0.0-beta7.0",
+  "version": "6.0.2",
   "description": "Generate Electrode React App",
   "homepage": "http://www.electrode.io",
   "repository": {
@@ -76,6 +76,7 @@
     ]
   },
   "publishConfig": {
-    "tag": "beta7"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   }
 }
diff --git a/packages/subapp-pbundle/package.json b/packages/subapp-pbundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-pbundle",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Electrode subapp support for Preact and redux-bundler",
   "browser": "browser/index.js",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
   ],
   "dependencies": {
     "subapp-util": "^1.0.2",
-    "subapp-web": "^1.0.0"
+    "subapp-web": "^1.0.11"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",

diff --git a/packages/subapp-react/package.json b/packages/subapp-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-react",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Electrode subapp support for React/Redux/React Router",
   "browser": "browser/index.js",
   "main": "lib/index.js",
@@ -30,7 +30,7 @@
   "dependencies": {
     "optional-require": "^1.0.0",
     "subapp-util": "^1.0.2",
-    "subapp-web": "^1.0.0"
+    "subapp-web": "^1.0.11"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",

diff --git a/packages/subapp-redux/package.json b/packages/subapp-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-redux",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Electrode subapp redux support",
   "browser": "browser/index.js",
   "main": "lib/index.js",
@@ -28,7 +28,7 @@
   "dependencies": {
     "optional-require": "^1.0.0",
     "subapp-util": "^1.0.2",
-    "subapp-web": "^1.0.9"
+    "subapp-web": "^1.0.11"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",

diff --git a/packages/subapp-web/package.json b/packages/subapp-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-web",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Electrode subapp web support",
   "browser": "browser/index.js",
   "main": "lib/index.js",