refactor(*): Move ng1 source files from /src/ng1/* to /src/*

chore(typescript): Update to typescript 2.1.1

Author: christopherthielen

package.json

@@ -94,7 +94,7 @@
     "typedoc-plugin-external-module-name": "^1.0.2",
     "typedoc-plugin-internal-external": "^1.0.0",
     "typedoc-plugin-ui-router": "^1.0.0",
-    "typescript": "~2.0.2",
+    "typescript": "^2.1.1",
     "ui-router-typedoc-themes": "^1.0.0",
     "watch": "^0.18.0",
     "webpack": "1.x",

src/ng1/directives/stateDirectives.ts renamed to src/directives/stateDirectives.ts

@@ -5,7 +5,7 @@
  *
  * @preferred @module ng1_directives
  */ /** for typedoc */
-import { ng as angular } from "../../angular";
+import { ng as angular } from "../angular";
 import { IAugmentedJQuery, ITimeoutService, IScope, IInterpolateService } from "angular";
 
 import {

src/ng1/directives/viewDirective.ts renamed to src/directives/viewDirective.ts

@@ -1,5 +1,5 @@
 /** @module ng1_directives */ /** for typedoc */
-import { ng as angular } from "../../angular";
+import { ng as angular } from "../angular";
 import {
     IInterpolateService, IScope, ITranscludeFunction, IAugmentedJQuery,
     ICompileService, IControllerService, ITimeoutService

src/index.ts

@@ -0,0 +1,19 @@
+/**
+ * Main entry point for angular 1.x build
+ * @module ng1
+ */
+/** for typedoc */
+
+export * from "ui-router-core";
+
+export * from "./interface";
+export * from "./services";
+export * from "./statebuilders/views";
+export * from "./stateProvider";
+
+import "./directives/stateDirectives";
+import "./stateFilters";
+import "./directives/viewDirective";
+import "./viewScroll";
+
+export default "ui.router";

src/ng1/interface.ts renamed to src/interface.ts

@@ -16,7 +16,7 @@
  *
  * @module ng1_state_events
  */ /** */
-import { ng as angular } from "../../angular";
+import { ng as angular } from "../angular";
 import { IScope, IAngularEvent, IServiceProviderFactory } from "angular";
 import {
     Obj, TargetState, StateService, Transition, TransitionService, UrlRouter, HookResult, UIInjector

src/ng1/legacy/resolveService.ts renamed to src/legacy/resolveService.ts

@@ -10,7 +10,7 @@
  */
 
 /** for typedoc */
-import { ng as angular } from "../angular";
+import { ng as angular } from "./angular";
 import {
     IRootScopeService, IQService, ILocationService, ILocationProvider, IHttpService, ITemplateCacheService
 } from "angular";

src/ng1/legacy/stateEvents.ts renamed to src/legacy/stateEvents.ts

@@ -1,6 +1,6 @@
 /** @module state */ /** for typedoc */
 
-import { ng as angular } from "../angular";
+import { ng as angular } from "./angular";
 import { Obj, StateService, StateOrName } from "ui-router-core";
 
 /**

src/ng1.ts

@@ -1,5 +1,5 @@
 /** @module ng1 */ /** */
-import { ng as angular } from "../../angular";
+import { ng as angular } from "../angular";
 import {
     State, pick, forEach, anyTrueR, tail, extend,
     isArray, isInjectable, isDefined, isString, services, trace,

src/ng1/services.ts renamed to src/services.ts

@@ -1,4 +1,4 @@
-import { ng as angular } from "../angular";
+import { ng as angular } from "./angular";
 /** @module view */ /** for typedoc */
 import {
     isArray, isDefined, isFunction, isObject, services, Obj, IInjectable, tail, kebobString, unnestR, ResolveContext, Resolvable, RawParams

src/ng1/stateFilters.ts renamed to src/stateFilters.ts

@@ -1,5 +1,5 @@
 /** @module ng1 */ /** */
-import { ng as angular } from "../angular";
+import { ng as angular } from "./angular";
 import { IServiceProviderFactory } from "angular";
 import IAnchorScrollService = angular.IAnchorScrollService;
 import ITimeoutService = angular.ITimeoutService;

src/ng1/stateProvider.ts renamed to src/stateProvider.ts

@@ -3,7 +3,7 @@
 
 require('./util');
 
-require('../src/ng1');
+require('../src/index');
 
 var testsContext = require.context(".", true, /Spec$/);
 testsContext.keys().forEach(testsContext);

src/ng1/statebuilders/onEnterExitRetain.ts renamed to src/statebuilders/onEnterExitRetain.ts

@@ -2,7 +2,7 @@
 /// <reference path='../node_modules/@types/angular-mocks/index.d.ts' />
 /// <reference path='../node_modules/@types/jasmine/index.d.ts' />
 
-import {StateBuilder, StateMatcher, ng1ViewsBuilder, extend} from "../src/ng1";
+import {StateBuilder, StateMatcher, ng1ViewsBuilder, extend} from "../src/index.ts";
 import {Resolvable} from "ui-router-core";
 declare var inject;
 

src/ng1/statebuilders/views.ts renamed to src/statebuilders/views.ts

@@ -11,8 +11,8 @@ declare var inject;
 import Spy = jasmine.Spy;
 import "./util/matchers.ts";
 import { resolvedValue, resolvedError, caught } from './util/testUtilsNg1';
-import { ResolveContext, State, PathNode, omit, pick, extend, forEach } from "../src/ng1";
-import {Resolvable, services, StateDeclaration} from "ui-router-core";
+import { ResolveContext, State, PathNode, omit, pick, extend, forEach } from "../src/index.ts";
+import { Resolvable, services, StateDeclaration } from "ui-router-core";
 
 let module = angular['mock'].module;
 ///////////////////////////////////////////////

src/ng1/templateFactory.ts renamed to src/templateFactory.ts

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 var obj = require('./util/testUtilsNg1').obj;
 
 describe('uiStateRef', function() {

src/ng1/viewScroll.ts renamed to src/viewScroll.ts

@@ -1,6 +1,6 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
-var stateEvents = require("../src/ng1/legacy/stateEvents.ts");
+var uiRouter = require("../src/index");
+var stateEvents = require("../src/legacy/stateEvents.ts");
 var decorateExceptionHandler = require("./util/testUtilsNg1").decorateExceptionHandler;
 var obj = require('./util/testUtilsNg1').obj;
 

test/index.js

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 
 describe('isState filter', function() {
   beforeEach(module('ui.router'));

test/ng1StateBuilderSpec.ts

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 var extend = uiRouter.extend;
 var forEach = uiRouter.forEach;
 var services = uiRouter.services;

test/resolveSpec.ts

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 
 describe('templateFactory', function () {
 

test/stateDirectivesSpec.js

@@ -1,5 +1,5 @@
 var module      = angular.mock.module;
-var uiRouter    = require("../src/ng1");
+var uiRouter    = require("../src/index");
 var Param       = uiRouter.Param;
 var ParamTypes  = uiRouter.ParamTypes;
 var UrlMatcher  = uiRouter.UrlMatcher;

test/stateEventsSpec.js

@@ -8,7 +8,7 @@ import "./util/matchers";
 import { html5Compat } from './util/testUtilsNg1';
 declare var inject;
 
-import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../src/ng1";
+import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../src/index.ts";
 
 var module = angular['mock'].module;
 

test/stateFiltersSpec.js

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 
 function animateFlush($animate) {
   $animate && $animate.triggerCallbacks && $animate.triggerCallbacks(); // 1.2-1.3

test/stateSpec.js

@@ -1,5 +1,5 @@
 var module = angular.mock.module;
-var uiRouter = require("../src/ng1");
+var uiRouter = require("../src/index");
 
 describe('uiView', function () {
   'use strict';

test/templateFactorySpec.js

@@ -11,11 +11,11 @@ import {curry} from "ui-router-core";
 import {PathNode} from "ui-router-core";
 import {ResolveContext} from "ui-router-core";
 import {PathFactory} from "ui-router-core";
-import {ng1ViewsBuilder, ng1ViewConfigFactory} from "../src/ng1/statebuilders/views";
+import {ng1ViewsBuilder, ng1ViewConfigFactory} from "../src/statebuilders/views";
 import {ViewService} from "ui-router-core";
 import {StateMatcher, StateBuilder} from "ui-router-core";
 import {State} from "ui-router-core";
-import {Ng1StateDeclaration} from "../src/ng1/interface";
+import {Ng1StateDeclaration} from "../src/interface";
 
 describe('view', function() {
   var scope, $compile, $injector, elem, $controllerProvider, $urlMatcherFactoryProvider;

test/urlMatcherFactorySpec.js

@@ -12,6 +12,7 @@
     "sourceMap": true
   },
   "files": [
-    "src/ng1.ts", "src/ng1/legacy/stateEvents.ts"
+    "src/index.ts",
+    "src/legacy/stateEvents.ts"
   ]
 }

test/urlRouterSpec.ts

@@ -10,8 +10,8 @@ var banner = pkg.description + '\n' +
 var webpack = require('webpack');
 module.exports = {
   entry: {
-    "angular-ui-router": "./src/ng1.ts",
-    "angular-ui-router.min": "./src/ng1.ts",
+    "angular-ui-router": "./src/index.ts",
+    "angular-ui-router.min": "./src/index.ts",
     "stateEvents": "./src/ng1/legacy/stateEvents.ts",
     "stateEvents.min": "./src/ng1/legacy/stateEvents.ts",
   },