diff --git a/.scripts/common.js b/.scripts/common.js index 7e2851d670..d8a0a5cc6c 100644 --- a/.scripts/common.js +++ b/.scripts/common.js @@ -4,7 +4,7 @@ const execa = require('execa'); const inquirer = require('inquirer'); const Listr = require('listr'); const semver = require('semver'); -const tc = require('turbocolor'); +const { bold, cyan, dim } = require('colorette'); const rootDir = path.join(__dirname, '../'); @@ -55,7 +55,7 @@ async function askNpmTag(version) { type: 'confirm', name: 'confirm', message: answers => { - return `Will publish ${tc.cyan(version)} to ${tc.cyan(answers.npmTag)}. Continue?`; + return `Will publish ${cyan(version)} to ${cyan(answers.npmTag)}. Continue?`; } } ]; @@ -192,7 +192,7 @@ function preparePackage(tasks, package, version, install) { // Add project tasks tasks.push({ - title: `Prepare ${tc.bold(pkg.name)}`, + title: `Prepare ${bold(pkg.name)}`, task: () => new Listr(projectTasks) }); } @@ -234,7 +234,7 @@ function prepareDevPackage(tasks, package, version) { // Add project tasks tasks.push({ - title: `Prepare dev build: ${tc.bold(pkg.name)}`, + title: `Prepare dev build: ${bold(pkg.name)}`, task: () => new Listr(projectTasks) }); } @@ -244,7 +244,7 @@ function updatePackageVersions(tasks, packages, version) { updatePackageVersion(tasks, package, version); tasks.push({ - title: `${package} update @ionic/core dependency, if present ${tc.dim(`(${version})`)}`, + title: `${package} update @ionic/core dependency, if present ${dim(`(${version})`)}`, task: async () => { if (package !== 'core') { const pkg = readPkg(package); @@ -261,7 +261,7 @@ function updatePackageVersions(tasks, packages, version) { updatePackageVersion(tasks, distPackage, version); tasks.push({ - title: `${package} update @ionic/core dependency, if present ${tc.dim(`(${version})`)}`, + title: `${package} update @ionic/core dependency, if present ${dim(`(${version})`)}`, task: async () => { const pkg = readPkg(distPackage); updateDependency(pkg, '@ionic/core', version); @@ -272,7 +272,7 @@ function updatePackageVersions(tasks, packages, version) { if (package === 'packages/react-router') { tasks.push({ - title: `${package} update @ionic/react dependency, if present ${tc.dim(`(${version})`)}`, + title: `${package} update @ionic/react dependency, if present ${dim(`(${version})`)}`, task: async () => { const pkg = readPkg(package); updateDependency(pkg, '@ionic/react', version); @@ -287,7 +287,7 @@ function updatePackageVersion(tasks, package, version) { const projectRoot = projectPath(package); tasks.push({ - title: `${package}: update package.json ${tc.dim(`(${version})`)}`, + title: `${package}: update package.json ${dim(`(${version})`)}`, task: async () => { await execa('npm', ['version', version], { cwd: projectRoot }); } diff --git a/.scripts/prepare.js b/.scripts/prepare.js index 0d37e4bbce..74c63cfb32 100644 --- a/.scripts/prepare.js +++ b/.scripts/prepare.js @@ -2,7 +2,7 @@ * Deploy script adopted from https://github.com/sindresorhus/np * MIT License (c) Sindre Sorhus (sindresorhus.com) */ -const tc = require('turbocolor'); +const { cyan, dim, red, reset } = require('colorette'); const execa = require('execa'); const inquirer = require('inquirer'); const Listr = require('listr'); @@ -34,7 +34,7 @@ async function main() { console.log(` npm run release\n`); } catch(err) { - console.log('\n', tc.red(err), '\n'); + console.log('\n', red(err), '\n'); process.exit(1); } } @@ -84,7 +84,7 @@ async function askVersion() { type: 'confirm', name: 'confirm', message: answers => { - return `Will bump from ${tc.cyan(oldVersion)} to ${tc.cyan(answers.version)}. Continue?`; + return `Will bump from ${cyan(oldVersion)} to ${cyan(answers.version)}. Continue?`; } } ]; @@ -131,7 +131,7 @@ async function preparePackages(packages, version, install) { function validateGit(tasks, version) { tasks.push( { - title: `Validate git tag ${tc.dim(`(v${version})`)}`, + title: `Validate git tag ${dim(`(v${version})`)}`, task: () => execa('git', ['fetch']) .then(() => { return execa.stdout('npm', ['config', 'get', 'tag-version-prefix']); @@ -198,17 +198,17 @@ function prettyVersionDiff(oldVersion, inc) { for (let i = 0; i < newVersion.length; i++) { if ((newVersion[i] !== oldVersion[i] && !firstVersionChange)) { - output.push(`${tc.dim.cyan(newVersion[i])}`); + output.push(`${dim(cyan(newVersion[i]))}`); firstVersionChange = true; } else if (newVersion[i].indexOf('-') >= 1) { let preVersion = []; preVersion = newVersion[i].split('-'); - output.push(`${tc.dim.cyan(`${preVersion[0]}-${preVersion[1]}`)}`); + output.push(`${dim(cyan(`${preVersion[0]}-${preVersion[1]}`))}`); } else { - output.push(tc.reset.dim(newVersion[i])); + output.push(reset(dim(newVersion[i]))); } } - return output.join(tc.reset.dim('.')); + return output.join(reset(dim('.'))); } main(); diff --git a/.scripts/release-dev.js b/.scripts/release-dev.js index 0d99a9f053..3ac8fbfbeb 100644 --- a/.scripts/release-dev.js +++ b/.scripts/release-dev.js @@ -1,4 +1,4 @@ -const tc = require('turbocolor'); +const { cyan, red } = require('colorette'); const semver = require('semver'); const execa = require('execa'); const inquirer = require('inquirer'); @@ -47,7 +47,7 @@ async function main() { console.log(`\nionic ${devVersion} published!! 🎉\n`); } catch (err) { - console.log('\n', tc.red(err), '\n'); + console.log('\n', red(err), '\n'); process.exit(1); } @@ -64,7 +64,7 @@ async function askDevVersion(devVersion) { name: 'confirm', value: true, message: () => { - return `Publish the dev build ${tc.cyan(devVersion)}?`; + return `Publish the dev build ${cyan(devVersion)}?`; } } ]; diff --git a/.scripts/release.js b/.scripts/release.js index 603ff7c21b..e6e6d17e56 100644 --- a/.scripts/release.js +++ b/.scripts/release.js @@ -2,7 +2,7 @@ * Deploy script adopted from https://github.com/sindresorhus/np * MIT License (c) Sindre Sorhus (sindresorhus.com) */ -const tc = require('turbocolor'); +const { cyan, dim, green, red, yellow } = require('colorette'); const execa = require('execa'); const Listr = require('listr'); const path = require('path'); @@ -48,14 +48,14 @@ async function main() { // Dry run doesn't publish to npm or git if (dryRun) { console.log(` - \n${tc.yellow('Did not publish. Remove the "--dry-run" flag to publish:')}\n${tc.green(version)} to ${tc.cyan(npmTag)}\n + \n${yellow('Did not publish. Remove the "--dry-run" flag to publish:')}\n${green(version)} to ${cyan(npmTag)}\n `); } else { console.log(`\nionic ${version} published to ${npmTag}!! 🎉\n`); } } catch (err) { - console.log('\n', tc.red(err), '\n'); + console.log('\n', red(err), '\n'); process.exit(1); } } @@ -75,7 +75,7 @@ function publishGit(tasks, version, changelog, npmTag) { tasks.push( { - title: `Tag latest commit ${tc.dim(`(${gitTag})`)}`, + title: `Tag latest commit ${dim(`(${gitTag})`)}`, task: () => execa('git', ['tag', `${gitTag}`], { cwd: common.rootDir }) }, { diff --git a/package.json b/package.json index 53c0c19cec..c4c50a3099 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "devDependencies": { "@octokit/rest": "^17.0.0", + "colorette": "^1.2.0", "conventional-changelog-cli": "^2.0.1", "execa": "^0.10.0", "fs-extra": "^7.0.0", @@ -17,8 +18,7 @@ "lerna": "^3.16.2", "listr": "^0.14.0", "rimraf": "^2.6.3", - "semver": "^5.5.0", - "turbocolor": "^2.4.1" + "semver": "^5.5.0" }, "engines": { "node": ">= 10"