Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Updated versions of Stache, Builder (#821)
Browse files Browse the repository at this point in the history
* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump

* Update package.json

* Update package.json

* Update package.json

* Updated releases

* Updated version of stache

* Updated version of stache

* Added resolve for visual tests

* Updated version of stache
  • Loading branch information
Blackbaud-SteveBrush authored and Blackbaud-PatrickOFriel committed Jun 23, 2017
1 parent 95dba71 commit 963c999
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion config/webpack/webpack.releases.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = webpackMerge(commonConfig, {
},
output: {
filename: '[name].js',
path: 'releases'
path: path.resolve(__dirname, '..', '..', 'releases')
},
plugins: [
PrepareFallback,
Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@
"prebuild": "npm run clean",
"pretest": "npm run lint",
"preversion": "npm test",
"releases": "npm run clean:releases && ./node_modules/.bin/webpack --progress --config config/webpack/webpack.releases.js",
"releases": "npm run clean:releases && ./node_modules/.bin/webpack --progress --config ./config/webpack/webpack.releases.js",
"start": "webpack-dev-server --config config/webpack/webpack.dev.js --inline --progress --profile --watch --content-base src/",
"start:visual": "node ./config/utils/visual-server.js start",
"version": "npm run build",
"watch": "npm run test:unit -- --auto-watch --no-single-run"
},
"peerDependencies": {
"@blackbaud/stache": "2.0.0-beta.7"
},
"dependencies": {
"@angular/animations": "4.1.3",
"@angular/common": "4.1.3",
Expand All @@ -45,21 +48,21 @@
"@angular/platform-browser": "4.1.3",
"@angular/platform-browser-dynamic": "4.1.3",
"@angular/router": "4.1.3",
"@blackbaud/stache": "2.0.0-beta.3",
"core-js": "2.4.1",
"core-js": "~2.4.1",
"dragula": "3.7.2",
"font-awesome": "4.7.0",
"intl": "1.2.5",
"microedge-rxstate": "1.0.3",
"moment": "2.18.1",
"ng2-dragula": "1.3.1",
"ng2-toastr": "4.0.1",
"rxjs": "5.4.0",
"zone.js": "0.8.10"
"rxjs": "~5.4.0",
"zone.js": "~0.8.10"
},
"devDependencies": {
"@angular/compiler-cli": "4.1.3",
"@blackbaud/skyux-builder": "1.0.0-rc.1",
"@blackbaud/skyux-builder": "1.0.0-rc.2",
"@blackbaud/stache": "2.0.0-beta.7",
"@types/core-js": "0.9.41",
"@types/jasmine": "2.5.47",
"@types/node": "7.0.18",
Expand Down
1 change: 1 addition & 0 deletions scripts/travis-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
# Remove this line after stache and builder update to ng4:
rimraf ./node_modules/@blackbaud/skyux/node_modules/@angular
rimraf ./node_modules/@blackbaud/skyux-builder/node_modules/@angular
rimraf ./node_modules/@blackbaud/stache/node_modules/@angular

skyux build && ./scripts/visual-baseline.sh
else
Expand Down
4 changes: 2 additions & 2 deletions skyux-spa-visual-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"author": "Blackbaud",
"license": "ISC",
"devDependencies": {
"@blackbaud/skyux-builder": "1.0.0-rc.1",
"@angular/animations": "4.1.3",
"@blackbaud/skyux": "2.0.0-rc.0",
"@blackbaud/skyux-builder": "1.0.0-rc.2",
"codelyzer": "3.0.1",
"moment": "2.18.1",
"dragula": "3.7.2",
"ng2-dragula": "1.3.1",
"@angular/animations": "4.1.3",
"microedge-rxstate": "1.0.3",
"normalize-scss": "5.0.3",
"protractor": "5.1.2",
Expand Down
3 changes: 2 additions & 1 deletion skyux-spa-visual-tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"baseUrl": ".",
"paths": {
"sky-pages-spa/src/*": ["./src/*"],
"sky-pages-internal/*": ["./node_modules/@blackbaud/skyux-builder/*"]
"sky-pages-internal/*": ["./node_modules/@blackbaud/skyux-builder/*"],
"@blackbaud/skyux/dist/core": ["./node_modules/@blackbaud/skyux/dist/core"]
}
},
"exclude": [
Expand Down
12 changes: 3 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,10 @@
],
"baseUrl": ".",
"paths": {
"@angular/*": ["./node_modules/@angular/*"],
"@blackbaud/skyux/dist/core": ["./src/core.ts"],
"sky-pages-spa/src/*": ["./src/*"],
"sky-pages-internal/*": ["./node_modules/@blackbaud/skyux-builder/*"],
"@angular/common": ["node_modules/@angular/common"],
"@angular/compiler": ["node_modules/@angular/compiler"],
"@angular/core": ["node_modules/@angular/core"],
"@angular/forms": ["node_modules/@angular/forms"],
"@angular/platform-browser": ["node_modules/@angular/platform-browser"],
"@angular/platform-browser-dynamic": ["node_modules/@angular/platform-browser-dynamic"],
"@angular/router": ["node_modules/@angular/router"],
"@angular/http": ["node_modules/@angular/http"]
"sky-pages-internal/*": ["./node_modules/@blackbaud/skyux-builder/*"]
}
},
"exclude": [
Expand Down

0 comments on commit 963c999

Please sign in to comment.