Commit 107d97d2 authored by dmacfarlane's avatar dmacfarlane
Browse files

Updated to angular 2.0.0-rc.4

parent e5a1ad94

.editorconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Editor configuration, see http://editorconfig.org

root = true



[*]

charset = utf-8

indent_style = space

indent_size = 2

end_of_line = lf

insert_final_newline = true

trim_trailing_whitespace = true



[*.md]

max_line_length = 0

trim_trailing_whitespace = false

.gitignore

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 


# IDEs and editors

/.idea

.project

.classpath

*.launch

.settings/



# misc

/.sass-cache
@@ -26,3 +30,4 @@ testem.log 


#System Files

.DS_Store

Thumbs.db

angular-cli-build.js

+8 −4
Original line number Diff line number Diff line 
// Angular-CLI build configuration

// This file lists all the node_modules files that will be used in a build

// Also see https://github.com/angular/angular-cli/wiki/3rd-party-libs



/* global require, module */



var Angular2App = require('angular-cli/lib/broccoli/angular2-app');
@@ -7,11 +11,11 @@ module.exports = function(defaults) { 
    vendorNpmFiles: [

      'systemjs/dist/system-polyfills.js',

      'systemjs/dist/system.src.js',

      'zone.js/dist/*.js',

      'zone.js/dist/**/*.+(js|js.map)',

      'es6-shim/es6-shim.js',

      'reflect-metadata/*.js',

      'rxjs/**/*.js',

      '@angular/**/*.js'

      'reflect-metadata/**/*.+(ts|js|js.map)',

      'rxjs/**/*.+(js|js.map)',

      '@angular/**/*.+(js|js.map)'

    ]

  });

};

angular-cli.json

+10 −3
Original line number Diff line number Diff line 
{

  "project": {

    "version": "1.0.0-beta.0",

    "version": "1.0.0-beta.9",

    "name": "ng2-mentions"

  },

  "apps": [

    {"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}

    {

      "main": "src/main.ts",

      "tsconfig": "src/tsconfig.json",

      "mobile": false

    }

  ],

  "addons": [],

  "packages": [],
@@ -20,6 +24,9 @@ 
  },

  "defaults": {

    "prefix": "app",

    "sourceDir": "src"

    "sourceDir": "src",

    "styleExt": "css",

    "prefixInterfaces": false,

    "lazyRoutePrefix": "+"

  }

}

config/environment.js

+3 −0
Original line number Diff line number Diff line 
// Angular-CLI server configuration

// Unrelated to environment.dev|prod.ts



/* jshint node: true */



module.exports = function(environment) {