Skip to content

Commit c9166dd

Browse files
khuongduybuiEisenbergEffect
authored andcommitted
Fix #30 (#42)
1 parent 2ff3a91 commit c9166dd

File tree

4 files changed

+38
-35
lines changed

4 files changed

+38
-35
lines changed

package.json

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,35 @@
2121
"url": "https://github.com/aurelia/ux"
2222
},
2323
"scripts": {
24+
"postinstall": "npm uninstall @types/fs-extra @types/handlebars @types/highlight.js @types/lodash @types/marked @types/minimatch @types/shelljs",
2425
"lint": "cross-env tslint --project tsconfig.json",
25-
2626
"pretest": "cross-env npm run lint",
27-
"test": "cross-env tsc && karma start --single-run",
28-
"test-watch": "concurrently \"./node_modules/.bin/tsc --watch\" \"./node_modules/.bin/karma start\"",
29-
27+
"test": "cross-env rimraf dist && tsc && karma start --single-run",
28+
"develop": "concurrently \"./node_modules/.bin/tsc --watch\" \"./node_modules/.bin/karma start\"",
3029
"prebuild:amd": "cross-env rimraf dist/amd",
3130
"build:amd": "cross-env tsc --project tsconfig.build.json --outDir dist/amd --module amd",
3231
"postbuild:amd": "cross-env copyfiles --up 1 src/**/*.html src/**/*.css dist/amd",
33-
3432
"prebuild:commonjs": "cross-env rimraf dist/commonjs",
3533
"build:commonjs": "cross-env tsc --project tsconfig.build.json --outDir dist/commonjs --module commonjs",
3634
"postbuild:commonjs": "cross-env copyfiles --up 1 src/**/*.html src/**/*.css dist/commonjs",
37-
3835
"prebuild:es2015": "cross-env rimraf dist/es2015",
39-
"build:es2015": "cross-env tsc --project tsconfig.build.json --outDir dist/es2015 --module es2015",
36+
"build:es2015": "cross-env tsc --project tsconfig.build.json --outDir dist/es2015 --module es2015 --target es2015",
4037
"postbuild:es2015": "cross-env copyfiles --up 1 src/**/*.html src/**/*.css dist/es2015",
41-
38+
"prebuild:native-modules": "cross-env rimraf dist/native-modules",
39+
"build:native-modules": "cross-env tsc --project tsconfig.build.json --outDir dist/native-modules --module es2015",
40+
"postbuild:native-modules": "cross-env copyfiles --up 1 src/**/*.html src/**/*.css dist/native-modules",
4241
"prebuild:system": "cross-env rimraf dist/system",
4342
"build:system": "cross-env tsc --project tsconfig.build.json --outDir dist/system --module system",
4443
"postbuild:system": "cross-env copyfiles --up 1 src/**/*.html src/**/*.css dist/system",
45-
4644
"prebuild": "cross-env rimraf dist",
47-
"build": "concurrently \"npm run build:amd\" \"npm run build:commonjs\" \"npm run build:es2015\" \"npm run build:system\"",
48-
"postbuild": "npm run build:doc",
49-
50-
"prebuild:doc": "cross-env rimraf doc/api.json && rimraf dist/doc-temp && tsc --project tsconfig.build.json --outFile dist/doc-temp/index.js && node doc/shape-defs",
51-
"build:doc": "cross-env typedoc --json doc/api.json --excludeExternals --includeDeclarations --mode modules --target ES6 --name aurelia-ux-docs --ignoreCompilerErrors --tsconfig doc/tsconfig.json dist/doc-temp/",
52-
"postbuild:doc": "cross-env node doc/shape-doc && rimraf dist/doc-temp"
45+
"build": "concurrently \"npm run build:amd\" \"npm run build:commonjs\" \"npm run build:es2015\" \"npm run build:native-modules\" \"npm run build:system\"",
46+
"predoc": "cross-env rimraf doc/api.json && rimraf dist/doc-temp && tsc --project tsconfig.build.json --outFile dist/doc-temp/aurelia-ux.js && node doc/shape-defs && copyfiles tsconfig.json dist/doc-temp",
47+
"doc": "cross-env typedoc --json doc/api.json --excludeExternals --includeDeclarations --mode modules --target ES6 --name aurelia-ux-docs dist/doc-temp/",
48+
"postdoc": "cross-env node doc/shape-doc && rimraf dist/doc-temp",
49+
"changelog": "cross-env conventional-changelog -p ux -i doc/CHANGELOG.md -s",
50+
"bump-version": "npm --no-git-tag-version version",
51+
"preprepare-release": "cross-env npm run test",
52+
"prepare-release": "cross-env npm run changelog && npm run build && npm run doc"
5353
},
5454
"jspm": {
5555
"registry": "npm",
@@ -91,25 +91,28 @@
9191
"aurelia-framework": "^1.0.0"
9292
},
9393
"devDependencies": {
94-
"aurelia-bootstrapper": "^1.0.0",
95-
"aurelia-pal-browser": "^1.0.0",
96-
"aurelia-polyfills": "^1.1.0",
97-
"aurelia-testing": "^1.0.0-beta.2.0.0",
98-
"concurrently": "^2.2.0",
99-
"copyfiles": "^1.0.0",
100-
"cross-env": "^2.0.1",
101-
"jasmine-core": "^2.4.1",
102-
"karma": "^1.2.0",
94+
"@types/node": "^7.0.11",
95+
"aurelia-bootstrapper": "^2.1.1",
96+
"aurelia-pal-browser": "^1.2.0",
97+
"aurelia-pal-nodejs": "^1.0.0-beta.1.0.0",
98+
"aurelia-polyfills": "^1.2.1",
99+
"aurelia-testing": "^1.0.0-beta.3.0.1",
100+
"concurrently": "^3.4.0",
101+
"conventional-changelog-cli": "^1.3.1",
102+
"copyfiles": "^1.2.0",
103+
"cross-env": "^3.2.4",
104+
"jasmine-core": "^2.5.2",
105+
"karma": "^1.5.0",
103106
"karma-chrome-launcher": "^2.0.0",
104107
"karma-ie-launcher": "^1.0.0",
105-
"karma-jasmine": "^1.0.2",
106-
"karma-requirejs": "^1.0.0",
107-
"requirejs": "^2.2.0",
108-
"requirejs-text": "^2.0.12",
109-
"rimraf": "^2.5.4",
110-
"tslint": "^3.15.1",
111-
"typedoc": "^0.5.0",
112-
"typescript": "^2.0.0"
108+
"karma-jasmine": "^1.1.0",
109+
"karma-requirejs": "^1.1.0",
110+
"requirejs": "^2.3.3",
111+
"requirejs-text": "^2.0.15",
112+
"rimraf": "^2.6.1",
113+
"tslint": "^4.4.2",
114+
"typedoc": "^0.5.9",
115+
"typescript": "^2.2.1"
113116
},
114117
"aurelia": {
115118
"build": {

src/effects/paper-wave.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export class PaperWave {
339339
* @returns Current instance for method chaining.
340340
*/
341341
public remove() {
342-
this.$.parentNode.removeChild(this.$);
342+
(this.$.parentNode as Node).removeChild(this.$);
343343
return this;
344344
}
345345
}

src/styles/style-controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class StyleController {
5757
}
5858

5959
private removeStyleElement() {
60-
this.styleElementParent = this.styleElement.parentNode;
60+
this.styleElementParent = this.styleElement.parentNode as Node;
6161
DOM.removeNode(this.styleElement);
6262
this.onRemove();
6363
}

src/styles/style-resource.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class StyleResource {
3434
return styleStrategy.loadStyleFactory(container, this.styleObjectType).then(styleFactory => {
3535
this.factory = styleFactory;
3636
this.hooks.factory = this.factory;
37-
return styleFactory;
37+
return this;
3838
});
3939
}
4040
}

0 commit comments

Comments
 (0)