Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,38 @@
language: node_js
node_js:
- 6.9.2
- 8.9.1

before_install:
- time npm i -g yarn
- yarn global add greenkeeper-lockfile@1

install:
- time yarn > /dev/null

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- "./nodeserver.sh > /dev/null &"
- greenkeeper-lockfile-update

script:
- echo "CORE_BRANCH = x${CORE_BRANCH}x";
# Fetch and build the @uirouter/core branch from github, then install it
- >
if [ "x${CORE_BRANCH}x" != "xx" ] ; then
echo "Installing @uirouter/core from ${CORE_BRANCH}" && \
git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git @uirouter/core && \
pushd @uirouter/core && \
yarn > /dev/null && \
git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && \
pushd ui-router-core && \
yarn && \
yarn build && \
CORE_PACK_FILENAME=`npm pack` && \
popd && \
npm install ./@uirouter/core ;
yarn add ./ui-router-core/${CORE_PACK_FILENAME} ;
fi
- tsc && npm test

after_script: greenkeeper-lockfile-upload

matrix:
allow_failures:
- env: CORE_BRANCH=
Expand All @@ -37,7 +46,8 @@ env:
# If CORE_BRANCH is empty, it will use the @uirouter/core from npm dependencies
# (as specified in package.json)
- CORE_BRANCH=

global:
secure: TanWbkSRljYf0ENPiF3LDM+6RDYyUZoVIIQjUk9UDZ1MBvzEiqISB/zKSXSoYY1JNZpNcXgje2Sl08yGhAugRVodH+FJa/khSkXwRsZAlJuG8qPFAevW4gffvJvPAE7O0uy4jLyyu+Fi9dptdi1zDGsOps/Q+WURH9jWPGmQpj8=
sudo: false

git:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# AngularUI Router  [![Build Status](https://travis-ci.org/angular-ui/ui-router.svg?branch=master)](https://travis-ci.org/angular-ui/ui-router)

[![Greenkeeper badge](https://badges.greenkeeper.io/angular-ui/ui-router.svg)](https://greenkeeper.io/)

**Note: this is the Angular 1.x source for UI-Router version 1.0. If you are looking for the source for UI-Router
version 0.2.x, it can be found [here](https://github.com/angular-ui/ui-router/tree/legacy)**

Expand Down
26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,37 @@
"@types/angular": "^1.5.14",
"@types/angular-animate": "^1.5.5",
"@types/angular-mocks": "1.5.11",
"@types/jasmine": "2.6.0",
"@types/jquery": "^1.10.31",
"@types/jasmine": "2.8.2",
"@types/jquery": "^3.2.17",
"@uirouter/publish-scripts": "2.0.8",
"conventional-changelog": "1.1.6",
"conventional-changelog-cli": "1.3.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": "1.7.1",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "2.0.5",
"karma-webpack": "2.0.9",
"lodash": "^4.5.1",
"replace-in-file": "2.6.4",
"rollup": "0.50.0",
"replace-in-file": "3.1.0",
"rollup": "0.52.3",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-progress": "0.4.0",
"rollup-plugin-sourcemaps": "^0.4.1",
"rollup-plugin-uglify": "2.0.1",
"rollup-plugin-visualizer": "0.3.1",
"shelljs": "^0.7.0",
"shx": "0.2.2",
"ts-loader": "3.0.5",
"ts-loader": "3.2.0",
"tslint": "5.8.0",
"typedoc": "^0.8.0",
"typedoc": "^0.9.0",
"typedoc-plugin-external-module-name": "1.0.10",
"typedoc-plugin-internal-external": "1.0.10",
"typedoc-plugin-single-line-tags": "1.0.0",
"typedoc-plugin-ui-router": "^1.0.0",
"typescript": "2.5.3",
"typescript": "2.6.2",
"ui-router-typedoc-themes": "^1.0.1",
"webpack": "3.8.1"
"webpack": "3.10.0"
}
}
4 changes: 0 additions & 4 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import nodeResolve from 'rollup-plugin-node-resolve';
import uglify from 'rollup-plugin-uglify';
import progress from 'rollup-plugin-progress';
import sourcemaps from 'rollup-plugin-sourcemaps';
import visualizer from 'rollup-plugin-visualizer';

const MINIFY = process.env.MINIFY;
const MONOLITHIC = process.env.MONOLITHIC;
Expand Down Expand Up @@ -45,12 +43,10 @@ const onwarn = (warning) => {

const plugins = [
nodeResolve({jsnext: true}),
progress({ clearLine: false }),
sourcemaps(),
];

if (MINIFY) plugins.push(uglify(uglifyOpts));
if (ROUTER && MINIFY) plugins.push(visualizer({ sourcemap: true }));

const extension = MINIFY ? ".min.js" : ".js";

Expand Down
4 changes: 2 additions & 2 deletions src/directives/viewDirective.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ function $ViewDirectiveFill($compile: angular.ICompileService,
let data: UIViewData = $element.data('$uiView');
if (!data) {
$element.html(initial);
$compile($element.contents())(scope);
$compile($element.contents() as any)(scope);
return;
}

Expand All @@ -363,7 +363,7 @@ function $ViewDirectiveFill($compile: angular.ICompileService,
$element.html(cfg.getTemplate($element, resolveCtx) || initial);
trace.traceUIViewFill(data.$uiView, $element.html());

let link = $compile($element.contents());
let link = $compile($element.contents() as any);
let controller = cfg.controller;
let controllerAs: string = getControllerAs(cfg);
let resolveAs: string = getResolveAs(cfg);
Expand Down
Loading