From 60bf2aae3a9c88abb782c1c5d940cfa1ee588111 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 18 Dec 2015 08:44:42 +0100 Subject: [PATCH] Adjusted generator for updated yeoman-generator to 0.22.x --- CHANGELOG.md | 4 ++++ generators/component/index.js | 6 +++--- package.json | 6 ++++-- test/generators/app/indexTest.js | 4 ++-- test/generators/component/indexTest.js | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee4c35..964d65b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # generator-react-webpack - Changelog +## 3.1.2 + +1. Updated yeoman-generator package to new version 0.22.1 (some methods like generator.NamedBase are now deprecated!) + ## 3.1.1 1. Added bugfix for https://github.com/newtriks/generator-react-webpack/issues/170 diff --git a/generators/component/index.js b/generators/component/index.js index 743c9d7..05bb33d 100644 --- a/generators/component/index.js +++ b/generators/component/index.js @@ -2,11 +2,11 @@ let generator = require('yeoman-generator'); let utils = require('../../utils/all'); -module.exports = generator.NamedBase.extend({ +module.exports = generator.Base.extend({ constructor: function() { - generator.NamedBase.apply(this, arguments); - + generator.Base.apply(this, arguments); + this.argument('name', { type: String, required: true }); this.option('stateless', { desc: 'Create a stateless component instead of a full one', defaults: false diff --git a/package.json b/package.json index 1d4867c..c114d29 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "dependencies": { "react-webpack-template": "^1.0.0", "underscore.string": "^3.2.2", - "yeoman-generator": "^0.21.0", + "yeoman-generator": "^0.22.0", "yeoman-welcome": "^1.0.1", "esprima": "^2.7.0", "esprima-walk": "^0.1.0", @@ -50,7 +50,9 @@ }, "devDependencies": { "chai": "^3.2.0", - "mocha": "^2.3.2" + "mocha": "^2.3.2", + "yeoman-assert": "^2.1.1", + "yeoman-test": "^1.0.0" }, "engines": { "node": ">=4.0.0", diff --git a/test/generators/app/indexTest.js b/test/generators/app/indexTest.js index 81b89d7..f14ac30 100644 --- a/test/generators/app/indexTest.js +++ b/test/generators/app/indexTest.js @@ -1,8 +1,8 @@ 'use strict'; let path = require('path'); let expect = require('chai').expect; -let assert = require('yeoman-generator').assert; -let helpers = require('yeoman-generator').test +let assert = require('yeoman-assert'); +let helpers = require('yeoman-test'); describe('react-webpack:app', () => { diff --git a/test/generators/component/indexTest.js b/test/generators/component/indexTest.js index 2cc0980..ef99f63 100644 --- a/test/generators/component/indexTest.js +++ b/test/generators/component/indexTest.js @@ -1,7 +1,7 @@ 'use strict'; let path = require('path'); -let assert = require('yeoman-generator').assert; -let helpers = require('yeoman-generator').test +let assert = require('yeoman-assert'); +let helpers = require('yeoman-test'); describe('react-webpack:component', () => {