diff --git a/config/webpack.test.js b/config/webpack.test.js index 4412e08..e60d106 100644 --- a/config/webpack.test.js +++ b/config/webpack.test.js @@ -29,7 +29,7 @@ module.exports = { rules: [{ enforce: 'pre', test: /\.ts$/, - loader: 'tslint', + loader: 'tslint-loader', exclude: [helpers.root('node_modules')] }, { enforce: 'pre', @@ -77,7 +77,7 @@ module.exports = { * * See: https://github.com/wbuchwalter/tslint-loader */ - tslint: { + 'tslint-loader': { emitErrors: false, failOnHint: false, resourcePath: 'src' diff --git a/package.json b/package.json index 4ca21b2..dbf84be 100644 --- a/package.json +++ b/package.json @@ -32,16 +32,16 @@ "typings": "index.d.ts", "homepage": "https://github.com/akserg/ng2-dnd#readme", "peerDependencies": { - "@angular/core": "^2.0.0" + "@angular/core": "^2.4.4" }, "devDependencies": { - "@angular/common": "^2.4.3", - "@angular/compiler": "^2.4.3", - "@angular/compiler-cli": "^2.4.3", - "@angular/core": "^2.4.3", - "@angular/platform-browser": "^2.4.3", - "@angular/platform-browser-dynamic": "^2.4.3", - "@angular/platform-server": "^2.4.3", + "@angular/common": "^2.4.4", + "@angular/compiler": "^2.4.4", + "@angular/compiler-cli": "^2.4.4", + "@angular/core": "^2.4.4", + "@angular/platform-browser": "^2.4.4", + "@angular/platform-browser-dynamic": "^2.4.4", + "@angular/platform-server": "^2.4.4", "@types/hammerjs": "2.0.33", "@types/jasmine": "2.5.37", "@types/node": "6.0.46", @@ -60,7 +60,7 @@ "karma-mocha-reporter": "^2.1.0", "karma-remap-coverage": "~0.1.2", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^1.8.0", + "karma-webpack": "^2.0.1", "loader-utils": "~0.2.16", "reflect-metadata": "0.1.8", "rxjs": "^5.0.3", @@ -68,9 +68,9 @@ "source-map-loader": "0.1.5", "ts-helpers": "1.1.2", "tslint": "~4.0.0", - "tslint-loader": "3.2.1", + "tslint-loader": "3.3.0", "typescript": "2.0.10", - "webpack": "2.1.0-beta.25", + "webpack": "2.2.0", "zone.js": "^0.7.6" }, "config": { diff --git a/tests/dnd.component.factory.ts b/tests/dnd.component.factory.ts index a08e536..e14aa68 100644 --- a/tests/dnd.component.factory.ts +++ b/tests/dnd.component.factory.ts @@ -7,7 +7,7 @@ export function triggerEvent(elem:HTMLElement, eventName:string, eventType:strin } @Component({ - selector: 'container', + selector: 'test-container', template: `
@@ -59,7 +59,7 @@ export class Container { } @Component({ - selector: 'container2', + selector: 'test-container-two', template: `
@@ -84,7 +84,7 @@ export class Container2 { } @Component({ - selector: 'container3', + selector: 'test-container-three', template: `