Merge branch 'master' into core-update

ScriptedAlchemy · ScriptedAlchemy · commit cc106ac21651 · 2024-10-14T15:20:25.000-07:00
# Conflicts:
#	module-federation-vite-react/host/package.json
#	module-federation-vite-react/remote/package.json
#	module-federation-vite-solid/host/package.json
#	module-federation-vite-solid/remote/package.json
#	module-federation-vite-svelte/host/package.json
#	module-federation-vite-svelte/remote/package.json
#	module-federation-vite-vue3/host/package.json
#	module-federation-vite-vue3/remote/package.json
diff --git a/module-federation-vite-angular/README.md b/module-federation-vite-angular/README.md
@@ -1,4 +1,4 @@
-# React host and remote
+# Angular host and remote
 
 ## Getting started
 
diff --git a/module-federation-vite-angular/host/package.json b/module-federation-vite-angular/host/package.json
@@ -17,7 +17,7 @@
 		"@angular/platform-browser": "^18.0.0",
 		"@angular/platform-browser-dynamic": "^18.0.0",
 		"@angular/platform-server": "^18.0.0",
-		"@module-federation/vite": "1.1.2",
+		"@module-federation/vite": "1.1.3",
 		"rxjs": "~7.8.0",
 		"tslib": "^2.3.0",
 		"zone.js": "~0.14.3"
@@ -29,4 +29,4 @@
 		"typescript": "5.4.5",
 		"vite": "^5.4.1"
 	}
-}
+}
diff --git a/module-federation-vite-angular/remote/package.json b/module-federation-vite-angular/remote/package.json
@@ -17,7 +17,7 @@
 		"@angular/platform-browser": "^18.0.0",
 		"@angular/platform-browser-dynamic": "^18.0.0",
 		"@angular/platform-server": "^18.0.0",
-		"@module-federation/vite": "1.1.2",
+		"@module-federation/vite": "1.1.3",
 		"rxjs": "~7.8.0",
 		"tslib": "^2.3.0",
 		"zone.js": "~0.14.3"
@@ -29,4 +29,4 @@
 		"typescript": "5.4.5",
 		"vite": "^5.4.1"
 	}
-}
+}
diff --git a/module-federation-vite-react/host/package.json b/module-federation-vite-react/host/package.json
@@ -13,7 +13,7 @@
 		"rxjs": "^7.8.1"
 	},
 	"devDependencies": {
-		"@module-federation/vite": "1.1.2",
+		"@module-federation/vite": "1.1.3",
 		"@types/react": "18.2.79",
 		"@types/react-dom": "18.2.25",
 		"@vitejs/plugin-react": "4.2.1",
diff --git a/module-federation-vite-react/remote/package.json b/module-federation-vite-react/remote/package.json
@@ -12,7 +12,7 @@
 		"react-dom": "^18.3.1"
 	},
 	"devDependencies": {
-		"@module-federation/vite": "1.1.2",
+		"@module-federation/vite": "1.1.3",
 		"@types/react": "18.2.79",
 		"@types/react-dom": "18.2.25",
 		"@vitejs/plugin-react": "4.2.1",
diff --git a/module-federation-vite-solid/host/package.json b/module-federation-vite-solid/host/package.json
@@ -16,7 +16,7 @@
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {
-    "@module-federation/vite": "^1.1.2",
+    "@module-federation/vite": "1.1.3",
     "solid-js": "^1.8.11"
   }
 }
diff --git a/module-federation-vite-solid/remote/package.json b/module-federation-vite-solid/remote/package.json
@@ -16,7 +16,7 @@
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {
-    "@module-federation/vite": "^1.1.2",
+    "@module-federation/vite": "1.1.3",
     "solid-js": "^1.8.11"
   }
 }
diff --git a/module-federation-vite-svelte/host/package.json b/module-federation-vite-svelte/host/package.json
@@ -10,7 +10,7 @@
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@module-federation/vite": "1.1.2",
+    "@module-federation/vite": "1.1.3",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@tsconfig/svelte": "^5.0.4",
     "svelte": "^4.2.19",
diff --git a/module-federation-vite-svelte/remote/package.json b/module-federation-vite-svelte/remote/package.json
@@ -10,7 +10,7 @@
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@module-federation/vite": "1.1.2",
+    "@module-federation/vite": "1.1.3",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@tsconfig/svelte": "^5.0.4",
     "svelte": "^4.2.19",
diff --git a/module-federation-vite-vue3/README.md b/module-federation-vite-vue3/README.md
@@ -1,4 +1,4 @@
-# Svelte host and remote
+# Vue3 host and remote
 
 ## Getting started
 
diff --git a/module-federation-vite-vue3/host/package.json b/module-federation-vite-vue3/host/package.json
@@ -17,7 +17,7 @@
     "vue": "^3.2.45"
   },
   "devDependencies": {
-    "@module-federation/vite": "1.1.2",
+    "@module-federation/vite": "1.1.3",
     "@rushstack/eslint-patch": "^1.1.4",
     "@types/node": "^18.11.12",
     "@vitejs/plugin-vue": "^4.0.0",
diff --git a/module-federation-vite-vue3/remote/package.json b/module-federation-vite-vue3/remote/package.json
@@ -18,7 +18,7 @@
     "vue": "^3.2.45"
   },
   "devDependencies": {
-    "@module-federation/vite": "1.1.2",
+    "@module-federation/vite": "1.1.3",
     "@rushstack/eslint-patch": "^1.1.4",
     "@types/node": "^18.11.12",
     "@vitejs/plugin-vue": "^4.0.0",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# React host and remote`
	`1`	`+# Angular host and remote`
`2`	`2`
`3`	`3`	`## Getting started`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"vite-plugin-solid": "^2.8.2"`
`17`	`17`	`},`
`18`	`18`	`"dependencies": {`
`19`		`- "@module-federation/vite": "^1.1.2",`
	`19`	`+ "@module-federation/vite": "1.1.3",`
`20`	`20`	`"solid-js": "^1.8.11"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Svelte host and remote`
	`1`	`+# Vue3 host and remote`
`2`	`2`
`3`	`3`	`## Getting started`
`4`	`4`