WIP

apps/advanced/README.md

@@ -75,6 +75,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install the application using the following command:
 
 ~~~
+php composer.phar global require "fxp/composer-asset-plugin:~1.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced
 ~~~
 

apps/basic/README.md

@@ -55,6 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
+php composer.phar global require "fxp/composer-asset-plugin:~1.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

apps/basic/composer.json

@@ -17,12 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
-        /* bower packages, added temporarily to test "composer-asset-plugin" */
-        "bower-asset/bootstrap": "3.2.* | 3.1.* | 3.0.*",
-        "bower-asset/jquery": "2.1.1",
-        "bower-asset/jquery-ui": "1.11.*",
-        "bower-asset/typeahead.js": "0.10.*"
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

composer.json

 {
     "name": "yiisoft/yii2-dev",
     "description": "Yii PHP Framework Version 2 - Development Package",
-	"keywords": ["yii2", "framework"],
+    "keywords": [
+        "yii2",
+        "framework"
+    ],
     "homepage": "http://www.yiiframework.com/",
     "type": "yii2-extension",
     "license": "BSD-3-Clause",
@@ -76,7 +79,13 @@
         "yiisoft/jquery": "~2.0 | ~1.10",
         "yiisoft/jquery-pjax": "*",
         "ezyang/htmlpurifier": "4.6.*",
-		"cebe/markdown": "0.9.*"
+        "cebe/markdown": "0.9.*",
+        "bower-asset/jquery": ">=1.8",
+        "bower-asset/jquery.inputmask": ">=3.0.0",
+        "bower-asset/punycode": ">=1.3.0",
+        "bower-asset/yii2-pjax": ">=2.0.0",
+        "bower-asset/bootstrap": ">=3.0.0",
+        "bower-asset/jquery.ui": ">=1.10.0"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
@@ -88,7 +97,6 @@
     },
     "suggest": {
         "phpdocumentor/reflection": "required by yii2-apidoc extension",
-		"twbs/bootstrap": "required by yii2-bootstrap, yii2-debug, yii2-gii extension",
         "ext-curl": "required by yii2-elasticsearch extension",
         "ext-mongo": "required by yii2-mongo extension",
         "ext-pdo": "required by yii2-sphinx extension",
@@ -112,7 +120,7 @@
             "yii\\elasticsearch\\": "extensions/elasticsearch/",
             "yii\\faker\\": "extensions/faker/",
             "yii\\gii\\": "extensions/gii/",
-			"yii\\imagine\\" : "extensions/imagine/",
+            "yii\\imagine\\": "extensions/imagine/",
             "yii\\jui\\": "extensions/jui/",
             "yii\\mongodb\\": "extensions/mongodb/",
             "yii\\redis\\": "extensions/redis/",

docs/guide/start-installation.md

@@ -21,11 +21,14 @@ On Windows, you'll download and run [Composer-Setup.exe](https://getcomposer.org
 Please refer to the [Composer Documentation](https://getcomposer.org/doc/) if you encounter any
 problems or want to learn more about Composer usage.
 
-With Composer installed, you can install Yii by running the following command under a Web-accessible folder:
+With Composer installed, you can install Yii by running the following commands under a Web-accessible folder:
 
+    composer global require "fxp/composer-asset-plugin:~1.0"
     composer create-project --prefer-dist yiisoft/yii2-app-basic basic
 
-The above command installs Yii in a directory named `basic`.
+The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)
+which allows managing bower and npm package dependencies through composer. You only need to run this command
+once for all. The second command installs Yii in a directory named `basic`.
 
 > Tip: If you want to install the latest development version of Yii, you may use the following command,
 > which adds a [stability option](https://getcomposer.org/doc/04-schema.md#minimum-stability):

docs/guide/tutorial-advanced-app.md

@@ -22,6 +22,7 @@ curl -sS http://getcomposer.org/installer | php
 You can then install the application using the following command:
 
 ~~~
+php composer.phar global require "fxp/composer-asset-plugin:~1.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced /path/to/yii-application
 ~~~
 

docs/guide/tutorial-start-from-scratch.md

@@ -48,5 +48,6 @@ Use the Template
 That's all that's required to create a new Yii application template. Now you can create projects using your template:
 
 ```
+php composer.phar global require "fxp/composer-asset-plugin:~1.0"
 php composer.phar create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project
 ```

extensions/bootstrap/composer.json

@@ -18,7 +18,8 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": "*"
+        "yiisoft/yii2": "*",
+        "bower-asset/bootstrap": ">=3.0.0"
     },
     "autoload": {
         "psr-4": {

extensions/gii/composer.json

@@ -20,7 +20,8 @@
     "require": {
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "phpspec/php-diff": ">=1.0.2"
+        "phpspec/php-diff": ">=1.0.2",
+        "bower-asset/typeahead.js": ">=0.10.0"
     },
     "autoload": {
         "psr-4": {

extensions/jui/composer.json

@@ -18,7 +18,8 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": "*"
+        "yiisoft/yii2": "*",
+        "bower-asset/jquery.ui": ">=1.10.0"
     },
     "autoload": {
         "psr-4": {

framework/composer.json

 {
     "name": "yiisoft/yii2",
     "description": "Yii PHP Framework Version 2",
-	"keywords": ["yii2", "framework"],
+    "keywords": [
+        "yii2",
+        "framework"
+    ],
     "homepage": "http://www.yiiframework.com/",
     "type": "library",
     "license": "BSD-3-Clause",
@@ -54,10 +57,14 @@
         "lib-pcre": "*",
         "yiisoft/yii2-composer": "*",
         "ezyang/htmlpurifier": "4.6.*",
-		"cebe/markdown": "0.9.*"
+        "cebe/markdown": "0.9.*",
+        "bower-asset/jquery": ">=1.8",
+        "bower-asset/jquery.inputmask": ">=3.0.0",
+        "bower-asset/punycode": ">=1.3.0",
+        "bower-asset/yii2-pjax": ">=2.0.0"
     },
     "autoload": {
-		"psr-4": { "yii\\": "" }
+        "psr-4": {"yii\\": ""}
     },
     "bin": [
         "yii"