Merge branch 'travis'

christopherthielen · christopherthielen · commit 8673934c658d · 2017-12-30T12:40:26.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 # common
 node_modules
 bower_components
-downstream_projects
 
 .DS_Store
 *~
@@ -15,8 +14,6 @@ idea-out
 
 # generated files
 _doc
-.testlib
 lib
 lib-esm
 release
-stats.html
diff --git a/.npmignore b/.npmignore
@@ -2,7 +2,6 @@
 **/.*
 
 node_modules
-downstream_projects
 scripts
 src
 test
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,10 @@
 language: node_js
 node_js: '8.9.1'
 
-cache:
-  yarn: true
-  directories:
-  - downstream_projects
-  - node_modules
-  - ui-router-core
-
-before_install:
-- curl -o- -L https://yarnpkg.com/install.sh | bash
-- export PATH="$HOME/.yarn/bin:$PATH"
-- yarn global add greenkeeper-lockfile@1 yalc
-
+before_install: yarn global add greenkeeper-lockfile@1 yalc
 install: yarn --check-files
 
 before_script: greenkeeper-lockfile-update && greenkeeper-lockfile-upload
-
 script:
 # If CORE_BRANCH is set, fetch and build the @uirouter/core branch from github, then install it
 - if [ "x${CORE_BRANCH}x" != "xx" ] ; then ./node_modules/.bin/publish_yalc_package ui-router-core https://github.com/ui-router/core.git && yalc add @uirouter/core ; fi
@@ -26,13 +14,11 @@ env:
   global:
     secure: TanWbkSRljYf0ENPiF3LDM+6RDYyUZoVIIQjUk9UDZ1MBvzEiqISB/zKSXSoYY1JNZpNcXgje2Sl08yGhAugRVodH+FJa/khSkXwRsZAlJuG8qPFAevW4gffvJvPAE7O0uy4jLyyu+Fi9dptdi1zDGsOps/Q+WURH9jWPGmQpj8=
   matrix:
-    # When CORE_BRANCH env variable is set, it will fetch, build, and test using that branch of @uirouter/core
   - CORE_BRANCH=
   - CORE_BRANCH=master
+  - CORE_BRANCH=master UPSTREAM_PKGS=@uirouter/core DOWNSTREAM_PKGS=sample-app-angularjs
   - DOWNSTREAM_PKGS=sample-app-angularjs
-  - DOWNSTREAM_PKGS=sample-app-angularjs CORE_BRANCH=master
-
-sudo: false
+  - DOWNSTREAM_PKGS=typescript2.2,typescript2.3,typescript2.4,typescript2.5,typescript2.6
 
 matrix:
   fast_finish: true
@@ -43,3 +29,12 @@ matrix:
 notifications:
   slack:
     secure: LqlW9u5Lyh7eHffLqfrIEyIdpqJmPg29NQHqjM6ij2BUFOs9se+NgpRagfICukCEMimOdzEiIE6S4DXNhCcy6hoA24cpswb84vHRuZ4pFz8USq13rX72AgygR1tPKB9sbXLp+XIjRaLPO5z8asECCr7jxSCpMvHRylPAGL4DduI=
+
+sudo: false
+
+cache:
+  yarn: true
+  directories:
+  - .downstream_cache
+  - node_modules
+  - ui-router-core
diff --git a/downstream_projects.json b/downstream_projects.json
@@ -1,3 +1,8 @@
 {
-  "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git"
+  "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git",
+  "typescript2.2": "./test/typescript2.2",
+  "typescript2.3": "./test/typescript2.3",
+  "typescript2.4": "./test/typescript2.4",
+  "typescript2.5": "./test/typescript2.5",
+  "typescript2.6": "./test/typescript2.6"
 }
diff --git a/package.json b/package.json
@@ -83,15 +83,15 @@
     "@types/angular-mocks": "1.5.11",
     "@types/jasmine": "2.8.3",
     "@types/jquery": "^3.2.17",
-    "@uirouter/publish-scripts": "2.2.2",
+    "@uirouter/publish-scripts": "2.2.4",
     "conventional-changelog": "1.1.7",
     "conventional-changelog-cli": "1.3.5",
     "dts-downlevel": "^0.3.0",
     "fork-ts-checker-webpack-plugin": "^0.2.8",
     "jasmine-core": "2.8.0",
     "karma": "2.0.0",
     "karma-chrome-launcher": "2.2.0",
-    "karma-jasmine": "^1.0.2",
+    "karma-jasmine": "1.1.1",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "2.0.9",
diff --git a/test/typescript2.2/.gitignore b/test/typescript2.2/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/typescript2.2/index.ts b/test/typescript2.2/index.ts
@@ -0,0 +1,2 @@
+import { UIRouter } from '@uirouter/angularjs';
+console.log(UIRouter);
diff --git a/test/typescript2.2/package.json b/test/typescript2.2/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@uirouter/angularjs-test-typescript2.2",
+  "version": "1.0.0",
+  "description": "Test against Typescript 2.2",
+  "scripts": {
+    "test": "tsc"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@types/angular": "1.5.14",
+    "@types/jquery": "2",
+    "@uirouter/angularjs": "latest",
+    "typescript": "2.2"
+  },
+  "devDependencies": {}
+}
diff --git a/test/typescript2.2/tsconfig.json b/test/typescript2.2/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [ "es6", "dom" ],
+    "noImplicitAny": true,
+    "noEmit": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"]
+  },
+  "files": [ "index.ts" ]
+}
diff --git a/test/typescript2.3/.gitignore b/test/typescript2.3/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/typescript2.3/index.ts b/test/typescript2.3/index.ts
@@ -0,0 +1,2 @@
+import { UIRouter } from '@uirouter/angularjs';
+console.log(UIRouter);
diff --git a/test/typescript2.3/package.json b/test/typescript2.3/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@uirouter/angularjs-test-typescript2.3",
+  "version": "1.0.0",
+  "description": "Test against Typescript 2.3",
+  "scripts": {
+    "test": "tsc"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@uirouter/angularjs": "latest",
+    "typescript": "2.3"
+  },
+  "devDependencies": {}
+}
diff --git a/test/typescript2.3/tsconfig.json b/test/typescript2.3/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [ "es6", "dom" ],
+    "noImplicitAny": true,
+    "noEmit": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"]
+  },
+  "files": [ "index.ts" ]
+}
diff --git a/test/typescript2.4/.gitignore b/test/typescript2.4/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/typescript2.4/index.ts b/test/typescript2.4/index.ts
@@ -0,0 +1,2 @@
+import { UIRouter } from '@uirouter/angularjs';
+console.log(UIRouter);
diff --git a/test/typescript2.4/package.json b/test/typescript2.4/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@uirouter/angularjs-test-typescript2.4",
+  "version": "1.0.0",
+  "description": "Test against Typescript 2.4",
+  "scripts": {
+    "test": "tsc"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@uirouter/angularjs": "latest",
+    "typescript": "2.4"
+  },
+  "devDependencies": {}
+}
diff --git a/test/typescript2.4/tsconfig.json b/test/typescript2.4/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [ "es6", "dom" ],
+    "noImplicitAny": true,
+    "noEmit": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"]
+  },
+  "files": [ "index.ts" ]
+}
diff --git a/test/typescript2.5/.gitignore b/test/typescript2.5/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/typescript2.5/index.ts b/test/typescript2.5/index.ts
@@ -0,0 +1,2 @@
+import { UIRouter } from '@uirouter/angularjs';
+console.log(UIRouter);
diff --git a/test/typescript2.5/package.json b/test/typescript2.5/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@uirouter/angularjs-test-typescript2.5",
+  "version": "1.0.0",
+  "description": "Test against Typescript 2.5",
+  "scripts": {
+    "test": "tsc"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@uirouter/angularjs": "latest",
+    "typescript": "2.5"
+  },
+  "devDependencies": {}
+}
diff --git a/test/typescript2.5/tsconfig.json b/test/typescript2.5/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [ "es6", "dom" ],
+    "noImplicitAny": true,
+    "noEmit": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"]
+  },
+  "files": [ "index.ts" ]
+}
diff --git a/test/typescript2.6/.gitignore b/test/typescript2.6/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/typescript2.6/index.ts b/test/typescript2.6/index.ts
@@ -0,0 +1,2 @@
+import { UIRouter } from '@uirouter/angularjs';
+console.log(UIRouter);
diff --git a/test/typescript2.6/package.json b/test/typescript2.6/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@uirouter/angularjs-test-typescript2.6",
+  "version": "1.0.0",
+  "description": "Test against Typescript 2.6",
+  "scripts": {
+    "test": "tsc"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@uirouter/angularjs": "latest",
+    "typescript": "2.6"
+  },
+  "devDependencies": {}
+}
diff --git a/test/typescript2.6/tsconfig.json b/test/typescript2.6/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [ "es6", "dom" ],
+    "noImplicitAny": true,
+    "noEmit": true,
+    "target": "es5",
+    "typeRoots": ["node_modules/@types"]
+  },
+  "files": [ "index.ts" ]
+}
diff --git a/yarn.lock b/yarn.lock
@@ -66,9 +66,9 @@
   version "5.0.13"
   resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.13.tgz#e1b31626c393cbdd82651755ff1ce3fc55163fd0"
 
-"@uirouter/publish-scripts@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@uirouter/publish-scripts/-/publish-scripts-2.2.2.tgz#2d1d44ea5b844dc63faa68a332de7ff05b5bcf85"
+"@uirouter/publish-scripts@2.2.4":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@uirouter/publish-scripts/-/publish-scripts-2.2.4.tgz#1ac8d74786fc31883a51b01be5f996c33f989ec9"
   dependencies:
     conventional-changelog "^1.1.4"
     conventional-changelog-ui-router-core "^1.4.2"
@@ -2693,9 +2693,9 @@ karma-chrome-launcher@2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-jasmine@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
+karma-jasmine@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
 
 karma-phantomjs-launcher@^1.0.2:
   version "1.0.4"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
`1`	`1`	`{`
`2`		`- "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git"`
	`2`	`+ "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git",`
	`3`	`+ "typescript2.2": "./test/typescript2.2",`
	`4`	`+ "typescript2.3": "./test/typescript2.3",`
	`5`	`+ "typescript2.4": "./test/typescript2.4",`
	`6`	`+ "typescript2.5": "./test/typescript2.5",`
	`7`	`+ "typescript2.6": "./test/typescript2.6"`
`3`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import { UIRouter } from '@uirouter/angularjs';`
	`2`	`+console.log(UIRouter);`