chore: rename Angular 2 to Angular (#106)

Author: marclaval

CONTRIBUTING.md

@@ -222,4 +222,4 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [js-style-guide]: http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angular
-[seed]: https://github.com/mlaval/angular2-react-native-seed
+[seed]: https://github.com/mlaval/angular-react-native-seed

README.md

@@ -1,9 +1,9 @@
 [![Join the chat at https://gitter.im/angular/react-native-renderer](https://badges.gitter.im/angular/react-native-renderer.svg)](https://gitter.im/angular/react-native-renderer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/angular/react-native-renderer.svg?branch=master)](https://travis-ci.org/angular/react-native-renderer)
 
-# angular2-react-native
+# angular-react-native
 
-Use Angular 2 and React Native to build applications for Android and iOS.
+Use Angular and React Native to build applications for Android and iOS.
 
 ## Documentation
 http://angular.github.io/react-native-renderer/

doc/pages/apis.jade

@@ -8,7 +8,7 @@ block content
         # APIs and polyfills
 
         React Native provides a set of APIs and polyfills which allow applications to access native features from JavaScript.
-        All of them can be directly used within an Angular 2 application.
+        All of them can be directly used within an Angular application.
 
         When needed, they are patched so that callbacks are executed in the Angular [Zone](https://github.com/angular/zone.js).
 

doc/pages/bootstrap.jade

@@ -12,7 +12,7 @@ block content
         To bootstrap an application with JIT compilation, you must use the special methods `bootstrapReactNativeJIT`.
 
         ```
-        import {bootstrapReactNativeJIT} from 'angular2-react-native/jit';
+        import {bootstrapReactNativeJIT} from 'angular-react-native/jit';
         import {MyAppModule} from "./app/module";
 
         bootstrapReactNativeJIT('myApp', MyAppModule);
@@ -23,7 +23,7 @@ block content
         To bootstrap an application with AOT compilation, you must use the special methods `bootstrapReactNativeAOT`.
 
         ```
-        import {bootstrapReactNativeAOT} from 'angular2-react-native/aot';
+        import {bootstrapReactNativeAOT} from 'angular-react-native/aot';
         import {MyAppModuleNgFactory} from "./app/module.ngfactory";
 
         bootstrapReactNativeAOT('myApp', MyAppModule);

doc/pages/getting_started.jade

@@ -7,13 +7,13 @@ block content
     :marked
         # Getting started
 
-        Creating an application with Angular 2 and React Native means creating an actual React Native project, in which an Angular 2 application runs.
+        Creating an application with Angular and React Native means creating an actual React Native project, in which an Angular application runs.
 
-        As a consequence, all the Angular 2 features are available to you: http, router, directives, dependency injection, etc.
+        As a consequence, all the Angular features are available to you: http, router, directives, dependency injection, etc.
         And, at the same time, all the React Native tools and features are also available.
 
         The only exception are the high-level React components (View, Picker, Text, Image, etc),
-        but they all exist as ambient Angular2 components that can be used in applications.
+        but they all exist as ambient Angular components that can be used in applications.
 
         ## Setup
         Please check the React Native documentation for:
@@ -23,12 +23,12 @@ block content
         - [Linux and Windows support](https://facebook.github.io/react-native/docs/linux-windows-support.html#content)
 
         ## First application
-        For a quick start, clone the [seed application](https://github.com/mlaval/angular2-react-native-seed) and follow the instructions in the README.
+        For a quick start, clone the [seed application](https://github.com/mlaval/angular-react-native-seed) and follow the instructions in the README.
 
         The steps are:
         ```
-        git clone https://github.com/mlaval/angular2-react-native-seed.git
-        cd angular2-react-native-seed
+        git clone https://github.com/mlaval/angular-react-native-seed.git
+        cd angular-react-native-seed
         npm install -g gulp react-native-cli typings
         npm install
         gulp init

doc/pages/http.jade

@@ -7,7 +7,7 @@ block content
     :marked
         # Http
 
-        The http module of Angular 2 can be used as is in applications.
+        The http module of Angular can be used as is in applications.
         The only thing to be done is to import `ReactNativeHttpModule` in the main module of the application (see below).
 
         Behind the scene, it uses the [Network polyfill](https://facebook.github.io/react-native/docs/network.html) provided by React Native.
@@ -28,7 +28,7 @@ block content
         import {NgFor} from '@angular/common';
         import {Http} from '@angular/http';
         import 'rxjs/add/operator/map';
-        import {TextInput} from 'angular2-react-native';
+        import {TextInput} from 'angular-react-native';
 
         @Component({
           selector: 'example',

doc/pages/index.jade

@@ -8,6 +8,6 @@ block content
         h1
             | =>
         img(src="./assets/phone.png", style="top:0px")
-    h3(style="margin-bottom:50px;") Angular 2 and React Native to build applications for Android and iOS
+    h3(style="margin-bottom:50px;") Angular and React Native to build applications for Android and iOS
     a(href="./getting_started.html", style="padding: 20px;background-color:#0273D4;color:white;display: block;width: 150px;border-radius: 10px;text-align: center; font-size: 20px;margin: auto;") Get started
 

doc/pages/router.jade

@@ -7,7 +7,7 @@ block content
     :marked
         # Router
 
-        The rooter module of Angular 2 can be used as is in applications.
+        The rooter module of Angular can be used as is in applications.
         The only thing to be done is to import `ReactNativeRouterModule` in the main module of the application (see below),
         and use the static `RouterModule.forRoot` method to configure routes.
 

doc/pages/style.jade

@@ -9,7 +9,7 @@ block content
         React Native provides a styling mechanism which relies on JavaScript.
         Read more about it in the [documentation about Style](https://facebook.github.io/react-native/docs/style.html).
 
-        In all the Angular 2 components, there are 2 properties related to style:
+        In all the Angular components, there are 2 properties related to style:
         - `styleSheet`: it takes one or more `StyleSheet` created with the React Native's API.
         - `style`: it takes a set of styling properties as a JSON object. ***It overrides what has been defined in `styleSheet`***
 

gulpfile.js

@@ -72,7 +72,7 @@ gulp.task('!transpile', ['!assets'], function () {
   return ts2js([PATHS.sources.sample, PATHS.sources.src], PATHS.tmp, false, false);
 });
 gulp.task('!copyToNodeModules', ['!transpile'], function () {
-  return gulp.src(PATHS.tmp + '/src/**/*').pipe(gulp.dest(PATHS.app + '/' + APP_NAME + '/node_modules/angular2-react-native'));
+  return gulp.src(PATHS.tmp + '/src/**/*').pipe(gulp.dest(PATHS.app + '/' + APP_NAME + '/node_modules/angular-react-native'));
 });
 gulp.task('compile.jit', ['!copyToNodeModules'], function () {
   return gulp.src(PATHS.tmp + '/sample/**/*').pipe(gulp.dest(PATHS.app + '/' + APP_NAME));
@@ -242,10 +242,10 @@ systemBuilder.config({
   defaultJSExtensions: true
 });
 gulp.task('!pre-bundle', ['ts2system'], function () {
-  return gulp.src(PATHS.destination + '/src/**/*').pipe(gulp.dest(PATHS.destination + '/angular2-react-native'));
+  return gulp.src(PATHS.destination + '/src/**/*').pipe(gulp.dest(PATHS.destination + '/angular-react-native'));
 });
 gulp.task('bundle', ['!pre-bundle'], function(done) {
-  return systemBuilder.bundle('angular2-react-native/testing', path.join(PATHS.publish, 'bundles/testing.dev.js'),
+  return systemBuilder.bundle('angular-react-native/testing', path.join(PATHS.publish, 'bundles/testing.dev.js'),
     {}).catch(function (e) { console.log(e); });
 });
 
@@ -291,7 +291,7 @@ gulp.task('publish.ngc.src', ['publish.transform'], function (done) {
   });
 });
 gulp.task('publish', ['publish.ngc.src'], function (done) {
-  return gulp.src(PATHS.tmp + '/node_modules/angular2-react-native/**/*').pipe(gulp.dest(PATHS.publish));
+  return gulp.src(PATHS.tmp + '/node_modules/angular-react-native/**/*').pipe(gulp.dest(PATHS.publish));
 });
 
 /**********************************************************************************/
@@ -408,7 +408,7 @@ function executeInAppDir(command, done, inParentFolder) {
 }
 
 function ts2js(path, dest, toSystem, withDeclaration) {
-  var tsResult = gulp.src(path.concat(['typings/index.d.ts', 'src/angular2-react-native.d.ts', 'src/angular2-react-native-android.d.ts', 'src/angular2-react-native-ios.d.ts']), {base: './'})
+  var tsResult = gulp.src(path.concat(['typings/index.d.ts', 'src/angular-react-native.d.ts', 'src/angular-react-native-android.d.ts', 'src/angular-react-native-ios.d.ts']), {base: './'})
     .pipe(typescript({
       noImplicitAny: true,
       module: toSystem ? 'system' : 'commonjs',
@@ -458,12 +458,12 @@ function customReporter() {
   return {
     error: (error) => {
       if (error.relativeFilename && error.message.indexOf(`Module '"react-native"' has no exported member`) == -1 &&
-        error.message.indexOf(`Module ''angular2-react-native'' has no exported member`) == -1 &&
-        error.message.indexOf(`Module ''angular2-react-native/android'' has no exported member`) == -1 &&
-        error.message.indexOf(`Module ''angular2-react-native/ios'' has no exported member`) == -1 &&
-        error.message.indexOf(`src\\angular2-react-native.d.ts`) == -1 &&
-        error.message.indexOf(`src\\angular2-react-native-android.d.ts`) == -1 &&
-        error.message.indexOf(`src\\angular2-react-native-ios.d.ts`) == -1 &&
+        error.message.indexOf(`Module ''angular-react-native'' has no exported member`) == -1 &&
+        error.message.indexOf(`Module ''angular-react-native/android'' has no exported member`) == -1 &&
+        error.message.indexOf(`Module ''angular-react-native/ios'' has no exported member`) == -1 &&
+        error.message.indexOf(`src\\angular-react-native.d.ts`) == -1 &&
+        error.message.indexOf(`src\\angular-react-native-android.d.ts`) == -1 &&
+        error.message.indexOf(`src\\angular-react-native-ios.d.ts`) == -1 &&
         error.message.indexOf(`does not exist on type 'Global'.`) == -1) {
         console.error(error.message);
       }

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "angular2-react-native",
+  "name": "angular-react-native",
   "version": "0.0.1-alpha.20",
-  "description": "A React Native renderer for Angular 2",
+  "description": "A React Native renderer for Angular",
   "scripts": {
     "test": "gulp test.browser/ci"
   },
@@ -10,7 +10,7 @@
     "url": "git+https://github.com/angular/react-native-renderer.git"
   },
   "keywords": [
-    "Angular2",
+    "Angular",
     "renderer",
     "react-native"
   ],

sample/index.android.aot.js

@@ -1,4 +1,4 @@
-import {bootstrapReactNativeAOT} from 'angular2-react-native/aot';
+import {bootstrapReactNativeAOT} from 'angular-react-native/aot';
 import {KitchenSinkModuleNgFactory} from "./samples/android/module.ngfactory";
 
 bootstrapReactNativeAOT('ngReactNative', KitchenSinkModuleNgFactory);

sample/index.android.ts

@@ -1,4 +1,4 @@
-import {bootstrapReactNativeJIT} from 'angular2-react-native/jit';
+import {bootstrapReactNativeJIT} from 'angular-react-native/jit';
 import {KitchenSinkModule} from "./samples/android/module";
 
 bootstrapReactNativeJIT('ngReactNative', KitchenSinkModule);

sample/index.ios.aot.js

@@ -1,4 +1,4 @@
-import {bootstrapReactNativeAOT} from 'angular2-react-native/aot';
+import {bootstrapReactNativeAOT} from 'angular-react-native/aot';
 import {KitchenSinkModuleNgFactory} from "./samples/ios/module.ngfactory";
 
 bootstrapReactNativeAOT('ngReactNative', KitchenSinkModuleNgFactory);

sample/index.ios.ts

@@ -1,4 +1,4 @@
-import {bootstrapReactNativeJIT} from 'angular2-react-native/jit';
+import {bootstrapReactNativeJIT} from 'angular-react-native/jit';
 import {KitchenSinkModule} from "./samples/ios/module";
 
 bootstrapReactNativeJIT('ngReactNative', KitchenSinkModule);

sample/samples/android/http.ts

@@ -2,7 +2,7 @@ import {Component, ViewChild} from '@angular/core';
 import {Http} from '@angular/http';
 import 'rxjs/add/operator/map';
 
-import {TextInput} from 'angular2-react-native/android';
+import {TextInput} from 'angular-react-native/android';
 
 @Component({
   selector: 'http-app',

sample/samples/android/kitchensink.ts

@@ -2,7 +2,7 @@ import {Component, ElementRef, ViewChild} from '@angular/core';
 import {Router, NavigationEnd} from '@angular/router';
 import {LocationStrategy} from '@angular/common';
 import {StyleSheet, BackAndroid, Alert, NativeModules, processColor} from 'react-native';
-import {DrawerLayout, Toolbar} from 'angular2-react-native/android';
+import {DrawerLayout, Toolbar} from 'angular-react-native/android';
 
 import {TodoMVC} from "./todomvc";
 

sample/samples/android/module.ts

@@ -1,7 +1,7 @@
 import {NgModule, Provider} from '@angular/core';
 import {CommonModule, LocationStrategy} from '@angular/common';
 import {RouterModule, Routes} from '@angular/router';
-import {ReactNativeAndroidModule, ReactNativeRouterModule, ReactNativeHttpModule, ReactNativeLocationStrategy} from 'angular2-react-native';
+import {ReactNativeAndroidModule, ReactNativeRouterModule, ReactNativeHttpModule, ReactNativeLocationStrategy} from 'angular-react-native';
 import {KitchenSinkApp}   from './kitchensink';
 
 import {HelloApp} from "./hello";

sample/samples/android/todomvc.ts

@@ -1,6 +1,6 @@
 import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
 import {StyleSheet, AsyncStorage} from 'react-native';
-import {TextInput} from 'angular2-react-native/android';
+import {TextInput} from 'angular-react-native/android';
 
 class Palette {
   static background: string = '#005eb8';
@@ -218,7 +218,7 @@ export class TodoMVC {
 
   reset() {
     this.todos = this.filteredTodos = [
-      new Todo("Angular 2", false, false),
+      new Todo("Angular", false, false),
       new Todo("React Native", false, false),
       new Todo("Android", false, false),
       new Todo("iOS", true, false)

sample/samples/android/webview.ts

@@ -1,6 +1,6 @@
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {StyleSheet} from 'react-native';
-import {WebView} from 'angular2-react-native/android';
+import {WebView} from 'angular-react-native/android';
 
 @Component({
   selector: 'webview-app',

sample/samples/ios/http.ts

@@ -2,7 +2,7 @@ import {Component, ViewChild} from '@angular/core';
 import {Http} from '@angular/http';
 import 'rxjs/add/operator/map';
 
-import {TextInput} from 'angular2-react-native/ios';
+import {TextInput} from 'angular-react-native/ios';
 
 @Component({
   selector: 'http-app',

sample/samples/ios/kitchensink.ts

@@ -1,6 +1,6 @@
 import {Component, ViewChild} from '@angular/core';
 import {ActionSheetIOS} from 'react-native';
-import {Navigator} from 'angular2-react-native/ios';
+import {Navigator} from 'angular-react-native/ios';
 import {TodoMVC} from "./todomvc";
 
 @Component({

sample/samples/ios/module.ts

@@ -1,7 +1,7 @@
 import {NgModule, Provider} from '@angular/core';
 import {CommonModule, LocationStrategy} from '@angular/common';
 import {RouterModule, Routes} from '@angular/router';
-import {ReactNativeiOSModule, ReactNativeRouterModule, ReactNativeHttpModule, ReactNativeLocationStrategy} from 'angular2-react-native';
+import {ReactNativeiOSModule, ReactNativeRouterModule, ReactNativeHttpModule, ReactNativeLocationStrategy} from 'angular-react-native';
 import {KitchenSinkApp}   from './kitchensink';
 
 import {HelloApp} from "./hello";

sample/samples/ios/todomvc.ts

@@ -1,6 +1,6 @@
 import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
 import {StyleSheet, AsyncStorage} from 'react-native';
-import {TextInput} from 'angular2-react-native/ios';
+import {TextInput} from 'angular-react-native/ios';
 
 class Palette {
   static background: string = '#005eb8';
@@ -218,7 +218,7 @@ export class TodoMVC {
 
   reset() {
     this.todos = this.filteredTodos = [
-      new Todo("Angular 2", false, false),
+      new Todo("Angular", false, false),
       new Todo("React Native", false, false),
       new Todo("Android", false, false),
       new Todo("iOS", true, false)

sample/samples/ios/webview.ts

@@ -1,6 +1,6 @@
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {StyleSheet} from 'react-native';
-import {WebView} from 'angular2-react-native/ios';
+import {WebView} from 'angular-react-native/ios';
 
 @Component({
   selector: 'webview-app',

src/angular-react-native-android.d.ts

@@ -0,0 +1,5 @@
+declare module 'angular-react-native/android' {
+
+  export * from './android';
+}
+

src/angular-react-native-ios.d.ts

@@ -0,0 +1,5 @@
+declare module 'angular-react-native/ios' {
+
+  export * from './ios';
+}
+

src/angular-react-native.d.ts

@@ -0,0 +1,5 @@
+declare module 'angular-react-native' {
+
+  export * from './index';
+}
+

src/angular2-react-native-android.d.ts

@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
-    "outDir": "../node_modules/angular2-react-native",
+    "outDir": "../node_modules/angular-react-native",
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,