Merge branch 'master' of github.com:electrode-io/electrode

shubham2811 · Nov 16, 2023 · 4fe5bd8 · 4fe5bd8
2 parents 103ca74 + 38c02ea
commit 4fe5bd8
Show file tree

Hide file tree

Showing 24 changed files with 105 additions and 56 deletions.
diff --git a/common/changes/@xarc/app-dev/CEECORE-4463_2023-08-09-18-38.json b/common/changes/@xarc/app-dev/CEECORE-4463_2023-08-09-18-38.json
diff --git a/common/changes/@xarc/app-dev/release-08-29-2023_2023-08-29-22-10.json b/common/changes/@xarc/app-dev/release-08-29-2023_2023-08-29-22-10.json
diff --git a/common/changes/@xarc/app/release-08-29-2023_2023-08-29-22-10.json b/common/changes/@xarc/app/release-08-29-2023_2023-08-29-22-10.json
diff --git a/common/changes/@xarc/webpack/master_2023-10-31-04-39.json b/common/changes/@xarc/webpack/master_2023-10-31-04-39.json
@@ -0,0 +1,16 @@
+{
+  "changes": [
+    {
+      "changeType": 1,
+      "comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
+      "packageName": "@xarc/webpack"
+    },
+    {
+      "changeType": 1,
+      "comment": "Dependency @xarc/app-dev version bump from ^11.0.5 to ^11.0.6.",
+      "packageName": "@xarc/webpack"
+    }
+  ],
+  "packageName": "@xarc/webpack",
+  "email": "[email protected]"
+}
diff --git a/common/changes/subapp-pbundle/master_2023-10-31-04-39.json b/common/changes/subapp-pbundle/master_2023-10-31-04-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "changeType": 1,
+      "comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
+      "packageName": "subapp-pbundle"
+    }
+  ],
+  "packageName": "subapp-pbundle",
+  "email": "[email protected]"
+}
diff --git a/common/changes/subapp-react/master_2023-10-31-04-39.json b/common/changes/subapp-react/master_2023-10-31-04-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "changeType": 1,
+      "comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
+      "packageName": "subapp-react"
+    }
+  ],
+  "packageName": "subapp-react",
+  "email": "[email protected]"
+}
diff --git a/common/changes/subapp-web/master_2023-10-31-04-39.json b/common/changes/subapp-web/master_2023-10-31-04-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "changeType": 1,
+      "comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
+      "packageName": "subapp-web"
+    }
+  ],
+  "packageName": "subapp-web",
+  "email": "[email protected]"
+}
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -102,7 +102,7 @@
   {
     "definitionName": "lockStepVersion",
     "policyName": "xarcAppVersion",
-    "version": "11.0.5",
+    "version": "11.0.6",
     /**
      * (Required) The type of bump that will be performed when publishing the next release.
      * When creating a release branch in Git, this field should be updated according to the

diff --git a/packages/subapp-pbundle/package.json b/packages/subapp-pbundle/package.json
@@ -40,7 +40,7 @@
     "@babel/preset-env": "^7.3.1",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.7.7",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/run": "^1.1.1",
     "babel-preset-minify": "^0.5.1",
     "electrode-archetype-njs-module-dev": "^3.0.3",

diff --git a/packages/subapp-react/package.json b/packages/subapp-react/package.json
@@ -40,7 +40,7 @@
     "@babel/preset-env": "^7.17.10",
     "@babel/preset-react": "^7.16.7",
     "@babel/register": "^7.17.7",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/run": "^1.1.1",
     "babel-preset-minify": "^0.5.1",
     "electrode-archetype-njs-module-dev": "^3.0.3",

diff --git a/packages/subapp-web/package.json b/packages/subapp-web/package.json
@@ -39,7 +39,7 @@
     "xaa": "^1.7.3"
   },
   "peerDependencies": {
-    "@xarc/app": "^11.0.5"
+    "@xarc/app": "^11.0.6"
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
@@ -48,7 +48,7 @@
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",
     "@babel/register": "^7.22.5",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/module-dev": "^4.1.0",
     "@xarc/run": "^1.1.1",
     "babel-preset-minify": "^0.5.1",

diff --git a/packages/xarc-app-dev/CHANGELOG.json b/packages/xarc-app-dev/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@xarc/app-dev",
   "entries": [
+    {
+      "version": "11.0.6",
+      "tag": "@xarc/app-dev_v11.0.6",
+      "date": "Tue, 31 Oct 2023 04:39:40 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "update jest config testUrl to testEnvironmentOptions.url"
+          }
+        ]
+      }
+    },
     {
       "version": "11.0.5",
       "tag": "@xarc/app-dev_v11.0.5",

diff --git a/packages/xarc-app-dev/CHANGELOG.md b/packages/xarc-app-dev/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @xarc/app-dev
 
-This log was last generated on Tue, 29 Aug 2023 14:57:37 GMT and should not be manually modified.
+This log was last generated on Tue, 31 Oct 2023 04:39:40 GMT and should not be manually modified.
+
+## 11.0.6
+Tue, 31 Oct 2023 04:39:40 GMT
+
+### Updates
+
+- update jest config testUrl to testEnvironmentOptions.url
 
 ## 11.0.5
 Tue, 29 Aug 2023 14:57:37 GMT

diff --git a/packages/xarc-app-dev/package.json b/packages/xarc-app-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xarc/app-dev",
-  "version": "11.0.5",
+  "version": "11.0.6",
   "description": "Electrode X application development support",
   "main": "lib/index.js",
   "homepage": "http://www.electrode.io",
@@ -38,7 +38,7 @@
     "Joel Chen <[email protected]>"
   ],
   "peerDependencies": {
-    "@xarc/app": "^11.0.5"
+    "@xarc/app": "^11.0.6"
   },
   "dependencies": {
     "@babel/cli": "^7.17.10",
@@ -113,7 +113,7 @@
     "@types/webpack": "5.28.0",
     "@typescript-eslint/eslint-plugin": "^4.11.0",
     "@typescript-eslint/parser": "^4.11.0",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/module-dev": "^4.1.0",
     "@xarc/run": "^1.1.1",
     "babel-eslint": "^10.1.0",

diff --git a/packages/xarc-app/CHANGELOG.json b/packages/xarc-app/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@xarc/app",
   "entries": [
+    {
+      "version": "11.0.6",
+      "tag": "@xarc/app_v11.0.6",
+      "date": "Tue, 31 Oct 2023 04:39:40 GMT",
+      "comments": {}
+    },
     {
       "version": "11.0.5",
       "tag": "@xarc/app_v11.0.5",

diff --git a/packages/xarc-app/CHANGELOG.md b/packages/xarc-app/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @xarc/app
 
-This log was last generated on Tue, 29 Aug 2023 14:57:37 GMT and should not be manually modified.
+This log was last generated on Tue, 31 Oct 2023 04:39:40 GMT and should not be manually modified.
+
+## 11.0.6
+Tue, 31 Oct 2023 04:39:40 GMT
+
+_Version update only_
 
 ## 11.0.5
 Tue, 29 Aug 2023 14:57:37 GMT

diff --git a/packages/xarc-app/package.json b/packages/xarc-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xarc/app",
-  "version": "11.0.5",
+  "version": "11.0.6",
   "description": "Electrode X application runtime support",
   "main": "dist/index.js",
   "homepage": "http://www.electrode.io",

diff --git a/packages/xarc-create-app/package.json b/packages/xarc-create-app/package.json
@@ -35,8 +35,8 @@
     "@babel/preset-env": "^7.22.10",
     "@types/chai": "^4.2.11",
     "@types/mocha": "^10.0.1",
-    "@xarc/app": "^11.0.5",
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app": "^11.0.6",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/module-dev": "^2.2.4",
     "@xarc/react": "^1.0.3",
     "@xarc/react-query": "^1.0.3",

diff --git a/packages/xarc-webpack/package.json b/packages/xarc-webpack/package.json
@@ -58,8 +58,8 @@
     "xsh": "^0.4.5"
   },
   "peerDependencies": {
-    "@xarc/app": "^11.0.5",
-    "@xarc/app-dev": "^11.0.5"
+    "@xarc/app": "^11.0.6",
+    "@xarc/app-dev": "^11.0.6"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
@@ -70,7 +70,7 @@
     "@types/sinon-chai": "^3.2.4",
     "@typescript-eslint/eslint-plugin": "^2.21.0",
     "@typescript-eslint/parser": "^2.21.0",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/module-dev": "^4.1.0",
     "babel-eslint": "^10.1.0",
     "chai": "^4.2.0",

diff --git a/samples/poc-subapp-redux/package.json b/samples/poc-subapp-redux/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@babel/runtime": "^7.21.0",
     "@module-federation/concat-runtime": "^0.0.1",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/fastify-server": "^3.3.0",
     "electrode-confippet": "^1.7.1",
     "history": "^5.3.0",
@@ -56,7 +56,7 @@
     "subapp-web": "^2.1.4"
   },
   "devDependencies": {
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/opt-eslint": "^3.0.1",
     "@xarc/run": "^1.1.1",
     "webpack-hot-middleware": "^2.25.3"

diff --git a/samples/poc-subapp/package.json b/samples/poc-subapp/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@babel/runtime": "^7.22.10",
     "@module-federation/concat-runtime": "^0.0.1",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/fastify-server": "^4.0.7",
     "electrode-confippet": "^1.7.1",
     "history": "^5.3.0",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@xarc/opt-eslint": "^3.0.1",
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/run": "^1.1.1",
     "webpack-hot-middleware": "^2.25.4"
   },

diff --git a/samples/poc-subappv1-csp/package.json b/samples/poc-subappv1-csp/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@babel/runtime": "^7.21.0",
     "@module-federation/concat-runtime": "^0.0.1",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/fastify-server": "^3.3.0",
     "@xarc/index-page": "^1.2.2",
     "electrode-confippet": "^1.7.1",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@xarc/opt-eslint": "^3.0.1",
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/run": "^1.1.1",
     "webpack-hot-middleware": "^2.25.3"
   },

diff --git a/samples/subapp2-basic/package.json b/samples/subapp2-basic/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "@babel/runtime": "^7.21.5",   
     "@xarc/fastify-server": "^3.3.0",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/react": "^1.0.3",
     "@xarc/react-query": "^1.0.3",
     "@xarc/react-redux": "^1.1.2",
@@ -47,7 +47,7 @@
     "prettier": "^3.0.1",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4",
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/opt-jest": "^3.0.0",
     "@xarc/opt-postcss": "^2.0.1",
     "@xarc/opt-sass": "^4.1.1",

diff --git a/samples/subapp2-poc/package.json b/samples/subapp2-poc/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.3",
-    "@xarc/app": "^11.0.5",
+    "@xarc/app": "^11.0.6",
     "@xarc/fastify-server": "^3.3.0",
     "@xarc/react": "^1.0.3",
     "@xarc/react-query": "^1.0.3",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@types/node": "^20.2.5",
     "@xarc/run": "^1.1.1",
-    "@xarc/app-dev": "^11.0.5",
+    "@xarc/app-dev": "^11.0.6",
     "@xarc/opt-eslint": "^3.0.1",
     "@xarc/opt-postcss": "^2.0.1",
     "@xarc/opt-stylus": "^2.0.1",