chore(package.json): kill version.yaml in favor of package.json

all versioning info is now in package.json and that's where the build scripts read it from

5 files changed, 13 insertions, 17 deletions

diff --git a/docs/src/templates/docs-scenario.html b/docs/src/templates/docs-scenario.html
index b2e07115..2eca5f87 100644
--- a/docs/src/templates/docs-scenario.html
+++ b/docs/src/templates/docs-scenario.html
@@ -7,7 +7,7 @@
         headEl = document.head,
         angularVersion = {
           current: '"NG_VERSION_FULL"', // rewrite during build
-          stable: '"NG_VERSION_STABLE"'
+          cdn: '"NG_VERSION_CDN"'
         };
 
     addTag('script', {src: path('angular-scenario.js')}, function() {
@@ -34,7 +34,7 @@
 
     function path(name) {
       return production
-          ? 'http://code.angularjs.org/' + angularVersion.stable + '/' + name
+          ? 'http://code.angularjs.org/' + angularVersion.cdn + '/' + name
           : '../' + name;
     }
   </script>
diff --git a/docs/src/templates/index.html b/docs/src/templates/index.html
index 5252605e..6054f813 100644
--- a/docs/src/templates/index.html
+++ b/docs/src/templates/index.html
@@ -27,7 +27,7 @@
           sync = true,
           angularVersion = {
             current: '"NG_VERSION_FULL"', // rewrite during build
-            stable: '"NG_VERSION_STABLE"'
+            cdn: '"NG_VERSION_CDN"'
           };
 
       addTag('base', {href: baseUrl});
@@ -51,12 +51,12 @@
         if (production) {
           if (name.match(/^angular(-\w+)?\.js/) && !name.match(/bootstrap/)) {
             name =  '//ajax.googleapis.com/ajax/libs/angularjs/' +
-                angularVersion.stable +
+                angularVersion.cdn +
                 '/' +
                 name.replace(/\.js$/, '.min.js');
           } else {
             name =  'http://code.angularjs.org/' +
-                angularVersion.stable +
+                angularVersion.cdn +
                 '/' +
                 name.replace(/\.js$/, '.min.js');
           }
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 0c1fd8ca..0ba03da2 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -1,6 +1,5 @@
 var fs = require('fs');
 var shell = require('shelljs');
-var yaml = require('yaml-js');
 var grunt = require('grunt');
 var spawn = require('child_process').spawn;
 
@@ -12,8 +11,8 @@ module.exports = {
 
 
   getVersion: function(){
-    var versionYaml = yaml.load(fs.readFileSync('version.yaml', 'UTF-8'));
-    var match = versionYaml.version.match(/^([^\-]*)(-snapshot)?$/);
+    var package = JSON.parse(fs.readFileSync('package.json', 'UTF-8'));
+    var match = package.version.match(/^([^\-]*)(-snapshot)?$/);
     var semver = match[1].split('.');
     var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
 
@@ -22,8 +21,8 @@ module.exports = {
       major: semver[0],
       minor: semver[1],
       dot: semver[2],
-      codename: versionYaml.codename,
-      stable: versionYaml.stable
+      codename: package.codename,
+      cdn: package.cdnVersion
     };
 
     return version;
@@ -89,7 +88,7 @@ module.exports = {
       .replace(/"NG_VERSION_MAJOR"/, NG_VERSION.major)
       .replace(/"NG_VERSION_MINOR"/, NG_VERSION.minor)
       .replace(/"NG_VERSION_DOT"/, NG_VERSION.dot)
-      .replace(/"NG_VERSION_STABLE"/, NG_VERSION.stable)
+      .replace(/"NG_VERSION_CDN"/, NG_VERSION.cdn)
       .replace(/"NG_VERSION_CODENAME"/, NG_VERSION.codename);
     if (strict !== false) processed = this.singleStrict(processed, '\n\n', true);
     return processed;
diff --git a/package.json b/package.json
index 59986a6a..945a9ee1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,8 @@
 {
   "name": "AngularJS",
-  "version": "0.0.0",
+  "version": "1.1.5-snapshot",
+  "cdnVersion": "1.1.4",
+  "codename": "triangle-squarification",
   "devDependencies": {
     "grunt": "0.4.0",
     "grunt-contrib-clean": "0.4.0",
diff --git a/version.yaml b/version.yaml
deleted file mode 100644
index 9e211188..00000000
--- a/version.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# AngularJS build config file
----
-version: 1.1.5-snapshot
-codename: triangle-squarification
-stable: 1.1.4