From a81969950d1c1860eca84b77db53b62875f802d1 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 18 Sep 2014 23:09:45 -0400
Subject: [PATCH] Adjusted dependency versions to stable ones.

---
 composer.json                      | 14 +++++++-------
 extensions/README.md               | 11 +++++++----
 extensions/bootstrap/composer.json |  2 +-
 extensions/gii/composer.json       |  2 +-
 extensions/jui/composer.json       |  2 +-
 framework/composer.json            |  9 ++++-----
 framework/web/JqueryAsset.php      |  2 +-
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/composer.json b/composer.json
index 7854a68715..c04943b7f8 100644
--- a/composer.json
+++ b/composer.json
@@ -76,15 +76,15 @@
         "ext-mbstring": "*",
         "lib-pcre": "*",
         "yiisoft/yii2-composer": "*",
-        "yiisoft/jquery": "~2.0 | ~1.10",
         "ezyang/htmlpurifier": "4.6.*",
         "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"
+        "bower-asset/jquery": "1.11.* | 2.1.*",
+        "bower-asset/jquery.inputmask": "3.1.*",
+        "bower-asset/punycode": "1.3.*",
+        "bower-asset/yii2-pjax": "2.0.*",
+        "bower-asset/bootstrap": "3.2.*",
+        "bower-asset/jquery-ui": "1.11.*",
+        "bower-asset/typeahead.js": "0.10.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
diff --git a/extensions/README.md b/extensions/README.md
index 34ad967afd..07f0a9764e 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -9,7 +9,10 @@ To add a new extension named `xyz` (must be in lower case), take the following s
    * `CHANGELOG.md`
    * `LICENSE.md`
 3. ask Qiang to create a subsplit for `xyz` and a composer package named `yii2-xyz`;
-4. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section;
-5. If an extension contains js/css files or depends on external bower packages:
-   * create `bower.json`
-   * ask Qiang to register a bower package with the name `yii2-xyz`
+4. If an extension depends on external bower/npm packages:
+   * in the `composer.json` file of the extension, list the dependencies in the format of `'bower-asset/PackageName': '1.1'`;
+   * create an asset bundle class to list the needed js/css files from the package. The `sourcePath`
+     property of the bundle should point to the distribution path of the package, such as
+     `@bower/PackageName`, or `@bower/PackageName/dist`.
+5. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section. Also add any bower/npm
+   dependencies to the `require` section.
diff --git a/extensions/bootstrap/composer.json b/extensions/bootstrap/composer.json
index 075f4447ed..a76745e52e 100644
--- a/extensions/bootstrap/composer.json
+++ b/extensions/bootstrap/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "bower-asset/bootstrap": ">=3.0.0"
+        "bower-asset/bootstrap": "3.2.*"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/gii/composer.json b/extensions/gii/composer.json
index 29e4c61148..3692b65ef1 100644
--- a/extensions/gii/composer.json
+++ b/extensions/gii/composer.json
@@ -21,7 +21,7 @@
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
         "phpspec/php-diff": ">=1.0.2",
-        "bower-asset/typeahead.js": ">=0.10.0"
+        "bower-asset/typeahead.js": "0.10.*"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/jui/composer.json b/extensions/jui/composer.json
index 45505fc9ea..f3ca691f53 100644
--- a/extensions/jui/composer.json
+++ b/extensions/jui/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "bower-asset/jquery-ui": ">=1.10.0"
+        "bower-asset/jquery-ui": "1.11.*"
     },
     "autoload": {
         "psr-4": {
diff --git a/framework/composer.json b/framework/composer.json
index 6571074d0e..be89285aa8 100644
--- a/framework/composer.json
+++ b/framework/composer.json
@@ -56,13 +56,12 @@
         "ext-mbstring": "*",
         "lib-pcre": "*",
         "yiisoft/yii2-composer": "*",
-        "yiisoft/jquery": "~2.0 | ~1.10",
         "ezyang/htmlpurifier": "4.6.*",
         "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/jquery": "1.11.* | 2.1.*",
+        "bower-asset/jquery.inputmask": "3.1.*",
+        "bower-asset/punycode": "1.3.*",
+        "bower-asset/yii2-pjax": "2.0.*"
     },
     "autoload": {
         "psr-4": {"yii\\": ""}
diff --git a/framework/web/JqueryAsset.php b/framework/web/JqueryAsset.php
index 96cbf032b4..75e5107998 100644
--- a/framework/web/JqueryAsset.php
+++ b/framework/web/JqueryAsset.php
@@ -15,7 +15,7 @@ namespace yii\web;
  */
 class JqueryAsset extends AssetBundle
 {
-    public $sourcePath = '@vendor/yiisoft/jquery';
+    public $sourcePath = '@bower/jquery/dist';
     public $js = [
         'jquery.js',
     ];