Restore Vue 2 component from archive and rename it

archive/vue2-demo/package.json

@@ -1,37 +0,0 @@
-{
-	"name": "@iconify/vue-demo",
-	"version": "1.0.2",
-	"private": true,
-	"scripts": {
-		"serve": "vue-cli-service serve",
-		"build": "vue-cli-service build",
-		"lint": "vue-cli-service lint"
-	},
-	"dependencies": {
-		"vue": "^2.6.12",
-		"vue-class-component": "^7.2.6",
-		"vue-property-decorator": "^8.5.1"
-	},
-	"devDependencies": {
-		"@iconify-icons/bx": "^1.0.2",
-		"@iconify-icons/dashicons": "^1.0.0",
-		"@iconify/vue": "^1.0.6",
-		"@typescript-eslint/eslint-plugin": "^2.34.0",
-		"@typescript-eslint/parser": "^2.34.0",
-		"@vue/cli-plugin-babel": "~4.2.3",
-		"@vue/cli-plugin-eslint": "~4.2.3",
-		"@vue/cli-plugin-typescript": "~4.2.3",
-		"@vue/cli-service": "~4.2.3",
-		"@vue/eslint-config-prettier": "^6.0.0",
-		"@vue/eslint-config-typescript": "^5.1.0",
-		"babel-eslint": "^10.1.0",
-		"core-js": "^3.6.5",
-		"eslint": "^7.12.1",
-		"eslint-loader": "^4.0.2",
-		"eslint-plugin-prettier": "^3.1.4",
-		"eslint-plugin-vue": "^6.2.2",
-		"prettier": "^2.1.2",
-		"typescript": "^4.0.5",
-		"vue-template-compiler": "^2.6.12"
-	}
-}

packages/vue2-demo/package.json

@@ -0,0 +1,37 @@
+{
+	"name": "@iconify/vue2-demo",
+	"version": "1.0.2",
+	"private": true,
+	"scripts": {
+		"serve": "vue-cli-service serve",
+		"build": "vue-cli-service build",
+		"lint": "vue-cli-service lint"
+	},
+	"dependencies": {
+		"vue": "^2.6.12",
+		"vue-class-component": "^7.2.6",
+		"vue-property-decorator": "^9.1.2"
+	},
+	"devDependencies": {
+		"@iconify-icons/bx": "^1.1.0",
+		"@iconify-icons/dashicons": "^1.1.0",
+		"@iconify/vue2": "^1.0.0",
+		"@typescript-eslint/eslint-plugin": "^4.22.1",
+		"@typescript-eslint/parser": "^4.22.1",
+		"@vue/cli-plugin-babel": "^4.5.12",
+		"@vue/cli-plugin-eslint": "^4.5.12",
+		"@vue/cli-plugin-typescript": "^4.5.12",
+		"@vue/cli-service": "^4.5.12",
+		"@vue/eslint-config-prettier": "^6.0.0",
+		"@vue/eslint-config-typescript": "^7.0.0",
+		"babel-eslint": "^10.1.0",
+		"core-js": "^3.12.0",
+		"eslint": "^6.8.0",
+		"eslint-loader": "^4.0.2",
+		"eslint-plugin-prettier": "^3.4.0",
+		"eslint-plugin-vue": "^7.9.0",
+		"prettier": "^2.2.1",
+		"typescript": "^4.2.4",
+		"vue-template-compiler": "^2.6.12"
+	}
+}

packages/vue2/package.json

@@ -1,15 +1,15 @@
 {
-	"name": "@iconify/vue",
+	"name": "@iconify/vue2",
 	"description": "Iconify icon component for Vue 2.",
 	"author": "Vjacheslav Trushkin",
-	"version": "1.0.6",
+	"version": "1.0.0-dev",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/iconify/issues",
 	"homepage": "https://iconify.design/",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/iconify/iconify.git",
-		"directory": "archive/vue2"
+		"directory": "packages/vue2"
 	},
 	"scripts": {
 		"build": "node build",
@@ -22,24 +22,21 @@
 	"main": "dist/IconifyIcon.umd.js",
 	"module": "dist/IconifyIcon.esm.js",
 	"types": "dist/IconifyIcon.d.ts",
-	"peerDependencies": {
-		"vue": "^2.0.0"
-	},
 	"devDependencies": {
 		"@iconify/core": "^1.0.0-rc.3",
-		"@microsoft/api-extractor": "^7.11.2",
+		"@microsoft/api-extractor": "^7.15.1",
 		"@rollup/plugin-buble": "^0.21.3",
-		"@rollup/plugin-commonjs": "^11.1.0",
-		"@rollup/plugin-node-resolve": "^7.1.3",
-		"@types/jest": "^26.0.15",
-		"@vue/test-utils": "^1.1.1",
+		"@rollup/plugin-commonjs": "^18.1.0",
+		"@rollup/plugin-node-resolve": "^13.0.0",
+		"@types/jest": "^26.0.23",
+		"@vue/test-utils": "^1.2.0",
 		"babel-eslint": "^10.1.0",
-		"babel-jest": "^25.5.1",
+		"babel-jest": "^26.6.3",
 		"babel-preset-env": "^1.7.0",
 		"jest": "^26.6.3",
-		"rollup": "^2.33.1",
+		"rollup": "^2.47.0",
 		"rollup-plugin-terser": "^7.0.2",
-		"typescript": "^4.0.5",
+		"typescript": "^4.2.4",
 		"vue": "^2.6.12",
 		"vue-jest": "^3.0.7",
 		"vue-template-compiler": "^2.6.12"

update-deps.js

@@ -23,7 +23,7 @@ const ignorePeers = {
 };
 
 // Ignore bugged modules
-function canInstall(name) {
+function canInstall(name, currentPackage) {
 	/*
 	// Due to a bug in rollup 2.x, rollup and its modules could not be updated. Fixed in 2.26.8!
 	if (name.split('-').shift() === 'rollup') {
@@ -36,12 +36,57 @@ function canInstall(name) {
 	return true;
 }
 
-// Special tags instead of @latest
-const specialTags = {
-	'vue': 'next',
-	'vue-jest': 'next',
-	'@vue/test-utils': 'next',
-};
+// Tag to use for installing package
+function getTag(name, currentPackage, currentVersion) {
+	const parts = currentPackage.split('-');
+	const currentPackage1 = parts.shift();
+
+	switch (name) {
+		case 'vue':
+			switch (currentPackage1) {
+				case '@iconify/vue':
+					return '@next';
+
+				case '@iconify/vue2':
+					return '@2';
+
+				default:
+					return null;
+			}
+
+		case 'vue-jest':
+			switch (currentPackage1) {
+				case '@iconify/vue':
+					return '@next';
+
+				case '@iconify/vue2':
+					return '@3';
+
+				default:
+					return null;
+			}
+
+		case '@vue/test-utils':
+			switch (currentPackage1) {
+				case '@iconify/vue':
+					return '@next';
+
+				case '@iconify/vue2':
+					return '@1';
+
+				default:
+					return null;
+			}
+	}
+
+	// Do not change major version for Vue 2 packages
+	if (currentPackage1 === '@iconify/vue2') {
+		const parts = currentVersion.split('.');
+		return '@' + parts.shift();
+	}
+
+	return '@latest';
+}
 
 // Update modes
 const modes = {
@@ -147,6 +192,7 @@ function next() {
 		const packageJSON = JSON.parse(
 			fs.readFileSync(packagesDir + '/' + dir + '/package.json', 'utf8')
 		);
+		const packageName = packageJSON.name;
 
 		// Get list of packages to ignore
 		let ignoreList = localPackages.slice(0);
@@ -169,7 +215,9 @@ function next() {
 			}
 
 			const packages = Object.keys(packageJSON[prop]).filter(
-				(item) => canInstall(item) && ignoreList.indexOf(item) === -1
+				(item) =>
+					canInstall(item, packageName) &&
+					ignoreList.indexOf(item) === -1
 			);
 			if (!packages.length) {
 				return;
@@ -181,12 +229,14 @@ function next() {
 				'npm',
 				['install', item.cmd].concat(
 					packages.map((item) => {
-						return (
-							item +
-							(specialTags[item] === void 0
-								? '@latest'
-								: '@' + specialTags[item])
-						);
+						const currentVersion = packageJSON[prop][item];
+						const tag = getTag(item, packageName, currentVersion);
+						if (typeof tag !== 'string') {
+							throw new Error(
+								`Cannot get tag for package "${item}" used in "${packageName}"`
+							);
+						}
+						return item + tag;
 					})
 				)
 			);