From c47f755aaa43401c7c778268471257a87c71c135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= Date: Mon, 5 Feb 2018 09:27:04 +0100 Subject: [PATCH] v3.9.0 --- .github_changelog_generator | 2 +- CHANGELOG.md | 7 +++++++ config/release.js | 22 ++++++++++++++++++---- package-lock.json | 10 +++++----- package.json | 2 +- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index c102d69..4418be3 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1 +1 @@ -future-release=v3.8.0 +future-release=v3.9.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e82b09..c259bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [v3.9.0](https://github.com/Exelord/ember-initials/tree/v3.9.0) (2018-02-05) +[Full Changelog](https://github.com/Exelord/ember-initials/compare/v3.8.0...v3.9.0) + +**Implemented enhancements:** + +- Remove object-hash dependency [\#52](https://github.com/Exelord/ember-initials/pull/52) ([Exelord](https://github.com/Exelord)) + ## [v3.8.0](https://github.com/Exelord/ember-initials/tree/v3.8.0) (2018-02-04) [Full Changelog](https://github.com/Exelord/ember-initials/compare/v3.7.0...v3.8.0) diff --git a/config/release.js b/config/release.js index 0971c26..9e6c90a 100644 --- a/config/release.js +++ b/config/release.js @@ -5,21 +5,35 @@ const path = require('path'); const exec = require('child_process').exec; function generateChangelog(project, version) { + console.log('Generating changelog...'); + let content = `future-release=${version}\n`; let generatorPath = path.join(project.root, '.github_changelog_generator'); return new Promise(function(resolve, reject) { fs.writeFile(generatorPath, content, (err) => err ? reject(err) : resolve()); }).then(() => { - return new Promise(function(resolve, reject) { - exec('github_changelog_generator', (err) => err ? reject(err) : resolve()); - }); + return _commandPromise('github_changelog_generator'); }) } function generateWebsite(version) { + console.log('Generating website...'); + let command = `ember github-pages:commit --message "${version}" && git push origin gh-pages:gh-pages`; + return _commandPromise(command); +} + +function regeneratePackageLock() { + console.log('Regenerating package.lock...'); + + let removeCommand = `rm -rf tmp dist node_modules package-lock.json`; + let installCommand = `npm i`; + + return _commandPromise(removeCommand).then(() => _commandPromise(installCommand)); +} +function _commandPromise(command) { return new Promise(function(resolve, reject) { exec(command, (err) => err ? reject(err) : resolve()); }); @@ -38,7 +52,7 @@ module.exports = { // timezone: 'America/Los_Angeles', beforeCommit: function(project, versions) { - return generateChangelog(project, versions.next); + return generateChangelog(project, versions.next).then(() => regeneratePackageLock()); }, afterPush: function(project, versions) { diff --git a/package-lock.json b/package-lock.json index 5e87dc3..e18ad24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ember-initials", - "version": "3.8.0", + "version": "3.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5203,9 +5203,9 @@ } }, "ember-legacy-class-transform": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/ember-legacy-class-transform/-/ember-legacy-class-transform-0.1.4.tgz", - "integrity": "sha512-JDKXc7l94NyN2YO9slhSy/g+FDSUcxUjLoMWabdInVFWnlMYvx5pTdjEWvmq6Vu85mFx2JWPcWcOxKgcpb+QpQ==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/ember-legacy-class-transform/-/ember-legacy-class-transform-0.1.5.tgz", + "integrity": "sha512-6CJJAfzy3un4cvR6P2kMa3Qg5NsOnTZdfkyahBG3l4Gxae2vWb9O7BcT+0SZey3EMxV63OUpTRx+LlSKKqnTFg==", "dev": true, "requires": { "babel-plugin-ember-legacy-class-constructor": "0.1.4", @@ -5317,7 +5317,7 @@ "ember-cli-version-checker": "2.1.0", "ember-compatibility-helpers": "0.1.3", "ember-decorators": "1.3.4", - "ember-legacy-class-transform": "0.1.4", + "ember-legacy-class-transform": "0.1.5", "ember-raf-scheduler": "0.1.0", "fastboot-transform": "0.1.2", "popper.js": "1.12.9" diff --git a/package.json b/package.json index 72c1d37..9a4320b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ember-initials", "author": "Exelord", - "version": "3.8.0", + "version": "3.9.0", "license": "MIT", "homepage": "https://github.com/Exelord/ember-initials#readme", "description": "Simple Initails Avatars for Ember 2 applications",