Merge branch 'dev/workspaces'

.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-.vscode
 node_modules
 debug_packages
 lerna-debug.log

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+	"recommendations": ["esbenp.prettier-vscode"]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.formatOnSave": true
+}

README.md

@@ -56,38 +56,59 @@ Other packages:
 -   [Iconify core](./packages/core/) - common files used by various components.
 -   [API redundancy](./packages/api-redundancy/) - library for managing redundancies for loading data from API: handling timeouts, rotating hosts.
 -   [Library builder](./packages/library-builder/) - build scripts for packages that do not require bundling, similar to `tsup`, but without bundler. Used by Utils, Core and API Redundancy packages. Builds ES and CommonJS modules, type definition files and updates exports in `package.json`.
--   [React demo](./packages/react-demo/) - demo for React component. Run `npm start` to start demo.
+-   [React demo](./demo/react-demo/) - demo for React component. Run `npm start` to start demo.
--   [Next.js demo](./packages/nextjs-demo/) - demo for React component with Next.js. Run `npm run build` to build it and `npm start` to start demo.
+-   [Next.js demo](./demo/nextjs-demo/) - demo for React component with Next.js. Run `npm run build` to build it and `npm start` to start demo.
--   [Vue 3 demo](./packages/vue-demo/) - demo for Vue component. Run `npm run dev` to start demo.
+-   [Vue 3 demo](./demo/vue-demo/) - demo for Vue component. Run `npm run dev` to start demo.
--   [Vue 2 demo](./packages/vue2-demo/) - demo for Vue component. Run `npm run dev` to start demo.
+-   [Vue 2 demo](./demo/vue2-demo/) - demo for Vue component. Run `npm run dev` to start demo.
--   [Svelte demo](./packages/svelte-demo/) - demo for Svelte component. Run `npm run dev` to start demo.
+-   [Svelte demo](./demo/svelte-demo/) - demo for Svelte component. Run `npm run dev` to start demo.
--   [Svelte demo with Vite](./packages/svelte-demo-vite/) - demo for Svelte component using Vite. Run `npm run dev` to start demo.
+-   [Svelte demo with Vite](./demo/svelte-demo-vite/) - demo for Svelte component using Vite. Run `npm run dev` to start demo.
--   [Sapper demo](./packages/sapper-demo/) - demo for Sapper, using Svelte component on the server and in the browser. Run `npm run dev` to start the demo (deprecated, use SvelteKit instead of Sapper).
+-   [Sapper demo](./demo/sapper-demo/) - demo for Sapper, using Svelte component on the server and in the browser. Run `npm run dev` to start the demo (deprecated, use SvelteKit instead of Sapper).
--   [SvelteKit demo](./packages/sveltekit-demo/) - demo for SvelteKit, using Svelte component on the server and in the browser. Run `npm run dev` to start the demo.
+-   [SvelteKit demo](./demo/sveltekit-demo/) - demo for SvelteKit, using Svelte component on the server and in the browser. Run `npm run dev` to start the demo.
--   [Ember demo](./packages/ember-demo/) - demo for Ember component. Run `npm run start` to start demo.
+-   [Ember demo](./demo/ember-demo/) - demo for Ember component. Run `npm run start` to start demo.
--   [Browser tests](./packages/browser-tests/) - unit tests for SVG framework. Run `npm run build` to build it. Open test.html in browser (requires HTTP server).
+-   [Browser tests](./demo/browser-tests/) - unit tests for SVG framework. Run `npm run build` to build it. Open test.html in browser (requires HTTP server).
 
 ## Installation
 
-This monorepo uses Lerna to manage packages.
+This monorepo used Lerna to manage packages, but due to several bugs in Lerna and Lerna development being abandoned, it was replaced with custom manager.
-
-First you need to install Lerna:
-
-```bash
-npm run install
-```
 
 To install dependencies in all packages, run
 
 ```bash
-npm run bootstrap
+npm install
 ```
 
 This will install all dependencies and create symbolic links to packages.
 
 If links stop working for some reason, run `npm run link` to fix links.
 
-If you want to re-install dependencies, run `npm run clean` to clear all repositories (press "Y" to continue), then `npm run bootstrap` to install everything again.
+If you want to remove `node_modules` for all packages, run `npm run clean`.
+
+If you want to re-install dependencies, run `npm run reinstall`.
+
+To build everything, run `npm run build` (this excludes demo packages).
+
+To run tests, run `npm run test` (this excludes demo packages).
+
+### Other commands
+
+You can run any commands on any package from that package's directory.
+
+Commands that modify `node_modules` might break symlinks. To fix it, run `npm run link` from monorepo directory.
+
+### Commands for all packages
+
+If you want to run a command on all packages, run `node monorepo run your_command --if-present`.
+
+There are several options to filter packages, see [monorepo/README.md](monorepo/README.md).
+
+### Monorepo on Windows
+
+This monorepo uses symbolic links to create links between packages. This allows development of multiple packages at the same time.
+
+When using Windows, symbolic links require setting up extra permissions. If you are using Windows and cannot set permissions for symbolic links, there are several options:
+
+-   Use Windows Subsystem for Linux (WSL).
+-   Treat each package as a separate package, without links to other packages. All packages do have correct dependencies, so you will be able to use most packages (except for `browser-tests` that requires links to access directory `lib` from `iconify` package), but you will not be able to work on multiple packages at the same time.
 
 ## Documentation
 

demo/browser-tests/package-lock.json

@@ -1,11 +1,11 @@
 {
-	"name": "@iconify/iconify-browser-tests",
+	"name": "@iconify-demo/browser-tests",
 	"version": "2.1.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "@iconify/iconify-browser-tests",
+			"name": "@iconify-demo/browser-tests",
 			"version": "2.1.2",
 			"license": "(Apache-2.0 OR GPL-2.0)",
 			"devDependencies": {

demo/browser-tests/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "@iconify/iconify-browser-tests",
+	"name": "@iconify-demo/browser-tests",
 	"private": true,
 	"description": "Browser tests for @iconify/iconify package",
 	"author": "Vjacheslav Trushkin <cyberalien@gmail.com> (https://iconify.design)",

demo/ember-demo/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "ember-demo",
+  "name": "@iconify-demo/ember",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "ember-demo",
+      "name": "@iconify-demo/ember",
       "version": "0.0.0",
       "license": "MIT",
       "devDependencies": {

demo/ember-demo/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ember-demo",
+  "name": "@iconify-demo/ember",
   "version": "0.0.0",
   "private": true,
   "description": "Small description for ember-demo goes here",

demo/nextjs-demo/package-lock.json

@@ -1,11 +1,11 @@
 {
-	"name": "nextjs-demo",
+	"name": "@iconify-demo/nextjs",
 	"version": "0.1.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "nextjs-demo",
+			"name": "@iconify-demo/nextjs",
 			"version": "0.1.0",
 			"dependencies": {
 				"@iconify/react": "^3.1.3",
@@ -850,25 +850,6 @@
 				}
 			}
 		},
-		"node_modules/cross-fetch/node_modules/tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-		},
-		"node_modules/cross-fetch/node_modules/webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-		},
-		"node_modules/cross-fetch/node_modules/whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-			"dependencies": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
-			}
-		},
 		"node_modules/debug": {
 			"version": "4.3.3",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
@@ -900,16 +881,6 @@
 				"node": ">= 0.10"
 			}
 		},
-		"node_modules/encoding": {
-			"version": "0.1.13",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"iconv-lite": "^0.6.2"
-			}
-		},
 		"node_modules/escalade": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -955,19 +926,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -1283,13 +1241,6 @@
 				}
 			]
 		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/scheduler": {
 			"version": "0.20.2",
 			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
@@ -1405,10 +1356,29 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"node_modules/webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+		},
+		"node_modules/whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+			"dependencies": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
 		}
 	},
 	"dependencies": {
@@ -2001,25 +1971,6 @@
 					"requires": {
 						"whatwg-url": "^5.0.0"
 					}
-				},
-				"tr46": {
-					"version": "0.0.3",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-					"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-				},
-				"webidl-conversions": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-					"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-				},
-				"whatwg-url": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-					"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-					"requires": {
-						"tr46": "~0.0.3",
-						"webidl-conversions": "^3.0.0"
-					}
 				}
 			}
 		},
@@ -2043,16 +1994,6 @@
 			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
 			"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
 		},
-		"encoding": {
-			"version": "0.1.13",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-			"optional": true,
-			"peer": true,
-			"requires": {
-				"iconv-lite": "^0.6.2"
-			}
-		},
 		"escalade": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -2083,16 +2024,6 @@
 			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 			"peer": true
 		},
-		"iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"optional": true,
-			"peer": true,
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
-			}
-		},
 		"inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -2307,13 +2238,6 @@
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
 		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"optional": true,
-			"peer": true
-		},
 		"scheduler": {
 			"version": "0.20.2",
 			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
@@ -2403,10 +2327,29 @@
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
 			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
 		},
+		"tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+		},
 		"util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+		},
+		"whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+			"requires": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
 		}
 	}
 }

demo/nextjs-demo/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "nextjs-demo",
+	"name": "@iconify-demo/nextjs",
 	"version": "0.1.0",
 	"private": true,
 	"scripts": {

demo/react-demo/package-lock.json

@@ -1,11 +1,11 @@
 {
-	"name": "@iconify/react-demo",
+	"name": "@iconify-demo/react",
 	"version": "0.0.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "@iconify/react-demo",
+			"name": "@iconify-demo/react",
 			"version": "0.0.0",
 			"dependencies": {
 				"react": "^17.0.2",
@@ -461,15 +461,15 @@
 			"dev": true
 		},
 		"node_modules/@iconify/core": {
-			"version": "1.2.3",
+			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@iconify/core/-/core-1.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/@iconify/core/-/core-1.2.4.tgz",
-			"integrity": "sha512-Q9hR/lOuo9USKilpl+wCYOEfyogx0ilBLIBLsYK5QV3LEPQOf2jgFwYAcQC/H0jDlKLvTFNrz3CHUVN0UUaVvg==",
+			"integrity": "sha512-2dO0HwahUPlrsOSoBZAdOClOz7VhIqjyWU5BqewGhQbhFkoA8TDVZhU2ug9ipruOUTHCRV2bM+j9lUJTdVNIGA==",
 			"dev": true,
 			"dependencies": {
 				"@iconify/api-redundancy": "^1.0.2",
 				"@iconify/types": "^1.0.12",
 				"@iconify/utils": "^1.0.21",
-				"cross-fetch": "^3.1.4"
+				"cross-fetch": "^3.1.5"
 			}
 		},
 		"node_modules/@iconify/react": {
@@ -1983,15 +1983,15 @@
 			"dev": true
 		},
 		"@iconify/core": {
-			"version": "1.2.3",
+			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@iconify/core/-/core-1.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/@iconify/core/-/core-1.2.4.tgz",
-			"integrity": "sha512-Q9hR/lOuo9USKilpl+wCYOEfyogx0ilBLIBLsYK5QV3LEPQOf2jgFwYAcQC/H0jDlKLvTFNrz3CHUVN0UUaVvg==",
+			"integrity": "sha512-2dO0HwahUPlrsOSoBZAdOClOz7VhIqjyWU5BqewGhQbhFkoA8TDVZhU2ug9ipruOUTHCRV2bM+j9lUJTdVNIGA==",
 			"dev": true,
 			"requires": {
 				"@iconify/api-redundancy": "^1.0.2",
 				"@iconify/types": "^1.0.12",
 				"@iconify/utils": "^1.0.21",
-				"cross-fetch": "^3.1.4"
+				"cross-fetch": "^3.1.5"
 			}
 		},
 		"@iconify/react": {

demo/react-demo/package.json

@@ -1,6 +1,7 @@
 {
-	"name": "@iconify/react-demo",
+	"name": "@iconify-demo/react",
 	"version": "0.0.0",
+	"private": true,
 	"scripts": {
 		"dev": "vite",
 		"build": "tsc && vite build",