Skip to content

Commit

Permalink
fix(build): Switch tsconfig back to module: commonjs
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Mar 24, 2017
1 parent f8003d8 commit 1b20157
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 50 deletions.
19 changes: 9 additions & 10 deletions ng1-to-ng2.ts
@@ -1,16 +1,15 @@
import * as angular from "angular";
import {Ng1ViewConfig, $InjectorLike, StateProvider, StateObject} from "angular-ui-router";
import * as angular from 'angular';

import {ElementRef, Component, Input, Inject, NgModule, Injector} from "@angular/core";
import {UpgradeAdapter} from "@angular/upgrade";
import { $InjectorLike, Ng1ViewConfig, StateObject, StateProvider } from 'angular-ui-router';

import {
UIRouter, ViewService, StateRegistry,
UIView, Ng2ViewDeclaration, Ng2ViewConfig, PathNode, Resolvable,
ParentUIViewInject, ViewConfig, forEach,
NATIVE_INJECTOR_TOKEN, _UIROUTER_SERVICE_PROVIDERS, UIRouterModule, UIROUTER_ROOT_MODULE, UIROUTER_MODULE_TOKEN,
applyModuleConfig, StatesModule
} from "ui-router-ng2";
_UIROUTER_SERVICE_PROVIDERS, applyModuleConfig, forEach, NATIVE_INJECTOR_TOKEN, Ng2ViewConfig, Ng2ViewDeclaration,
ParentUIViewInject, PathNode, Resolvable, StateRegistry, StatesModule, UIRouter, UIROUTER_MODULE_TOKEN,
UIROUTER_ROOT_MODULE, UIRouterModule, UIView, ViewConfig, ViewService
} from 'ui-router-ng2';

import { Component, ElementRef, Inject, Injector, Input, NgModule } from '@angular/core';
import { UpgradeAdapter } from '@angular/upgrade';

/**
* Create a ng1 module for the ng1 half of the hybrid application to depend on.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -29,7 +29,7 @@
"@types/jquery": "^1.10.31",
"angular": "~1.6.1",
"angular-ui-router": "angular-ui/ui-router#1.0.0-rc.1-artifacts",
"awesome-typescript-loader": "^2.2.4",
"awesome-typescript-loader": "^3.0.0",
"rxjs": "^5.0.0",
"systemjs": "0.19.25",
"typescript": "^2.1.5",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"module": "es6",
"module": "commonjs",
"moduleResolution": "node",
"lib": ["es6", "dom"],
"sourceMap": true,
Expand Down
88 changes: 50 additions & 38 deletions yarn.lock
Expand Up @@ -56,11 +56,11 @@ amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"

angular-ui-router@^1.0.0-rc.1:
angular-ui-router@angular-ui/ui-router#1.0.0-rc.1-artifacts:
version "1.0.0-rc.1"
resolved "https://registry.yarnpkg.com/angular-ui-router/-/angular-ui-router-1.0.0-rc.1.tgz#2d168230e8204fc8d2a93d1007ad49b9f33d09c6"
resolved "https://codeload.github.com/angular-ui/ui-router/tar.gz/754be8d7ebdae9e265c3174cc4fc599e1a49248b"
dependencies:
ui-router-core "3.1.0"
ui-router-core "^5.0.0-pre.1"

angular@~1.6.1:
version "1.6.2"
Expand Down Expand Up @@ -148,16 +148,17 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"

awesome-typescript-loader@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-2.2.4.tgz#4185d60c035c25515f9c2a747fa5f69b2a001e9e"
awesome-typescript-loader@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.1.2.tgz#3df192b91a6285f795ca65e63aad114fbb44f710"
dependencies:
colors "^1.1.2"
enhanced-resolve "^2.2.2"
loader-utils "^0.2.6"
lodash "^4.13.1"
object-assign "^4.1.0"
source-map-support "^0.4.0"
enhanced-resolve "^3.1.0"
loader-utils "^1.0.2"
lodash "^4.17.4"
mkdirp "^0.5.1"
object-assign "^4.1.1"
source-map-support "^0.4.11"

aws-sign2@~0.6.0:
version "0.6.0"
Expand Down Expand Up @@ -399,14 +400,14 @@ emojis-list@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"

enhanced-resolve@^2.2.2:
version "2.3.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
enhanced-resolve@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.3.0"
memory-fs "^0.4.0"
object-assign "^4.0.1"
tapable "^0.2.3"
tapable "^0.2.5"

enhanced-resolve@~0.9.0:
version "0.9.1"
Expand Down Expand Up @@ -789,7 +790,7 @@ lazy-cache@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"

loader-utils@^0.2.11, loader-utils@^0.2.6:
loader-utils@^0.2.11:
version "0.2.16"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
dependencies:
Expand All @@ -798,7 +799,15 @@ loader-utils@^0.2.11, loader-utils@^0.2.6:
json5 "^0.5.0"
object-assign "^4.0.1"

lodash@^4.13.1:
loader-utils@^1.0.2:
version "1.1.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"

lodash@^4.17.4:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

Expand All @@ -810,7 +819,14 @@ memory-fs@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"

memory-fs@^0.3.0, memory-fs@~0.3.0:
memory-fs@^0.4.0:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
dependencies:
errno "^0.1.3"
readable-stream "^2.0.1"

memory-fs@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
dependencies:
Expand Down Expand Up @@ -859,7 +875,7 @@ minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

"mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1:
"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
Expand Down Expand Up @@ -942,7 +958,7 @@ oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

object-assign@^4.0.1, object-assign@^4.1.0:
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

Expand Down Expand Up @@ -1186,13 +1202,13 @@ source-list-map@~0.1.7:
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

source-map-support@^0.4.0:
version "0.4.11"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
source-map-support@^0.4.11:
version "0.4.14"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
dependencies:
source-map "^0.5.3"
source-map "^0.5.6"

source-map@^0.5.3, source-map@~0.5.1:
source-map@^0.5.6, source-map@~0.5.1:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"

Expand Down Expand Up @@ -1284,7 +1300,7 @@ tapable@^0.1.8, tapable@~0.1.8:
version "0.1.10"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"

tapable@^0.2.3:
tapable@^0.2.5:
version "0.2.6"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"

Expand Down Expand Up @@ -1354,19 +1370,15 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"

ui-router-core@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ui-router-core/-/ui-router-core-3.1.0.tgz#c297e8198631ab2e36892a95d0f9a92c18efbc17"

ui-router-core@=4.0.0, ui-router-core@=4.0.1:
version "4.0.0"
resolved "https://registry.yarnpkg.com/ui-router-core/-/ui-router-core-4.0.0.tgz#83777791a452d3b585e75fc772d79c2e115b3b50"
ui-router-core@=5.0.0-pre.1, ui-router-core@^5.0.0-pre.1:
version "5.0.0-pre.1"
resolved "https://registry.yarnpkg.com/ui-router-core/-/ui-router-core-5.0.0-pre.1.tgz#0c0738ae478ddc98b63df5cc348a982d363ddb08"

ui-router-ng2@^1.0.0-beta.4:
version "1.0.0-beta.4"
resolved "https://registry.yarnpkg.com/ui-router-ng2/-/ui-router-ng2-1.0.0-beta.4.tgz#cdb84dd478a69e78cc6fdb269c5b2cb33942db0d"
ui-router-ng2@ui-router/ng2#1.0.0-beta.5-artifacts:
version "1.0.0-beta.5"
resolved "https://codeload.github.com/ui-router/ng2/tar.gz/a6cd7424d0aea6619d8b98f3c98a7a8dd6eed192"
dependencies:
ui-router-core "=4.0.0"
ui-router-core "=5.0.0-pre.1"
ui-router-rx "=0.2.1"

ui-router-rx@=0.2.1:
Expand Down

0 comments on commit 1b20157

Please sign in to comment.