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

Commit

Permalink
CHANGE: Fix the OSS build of the Frontend/Chrome App.
Browse files Browse the repository at this point in the history
Also adds a necessary SVG loader for the Web App and adjusts the minimum version in the deploy.sh file for Bazel.

PiperOrigin-RevId: 281536512
  • Loading branch information
helfrichmichael authored and Joe Parente committed Nov 22, 2019
1 parent b468c52 commit 5f898ff
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions loaner/deployments/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ found here: https://docs.bazel.build/versions/master/install.html"
| cut -d ' ' -f3 \
| sed -E 's/(^0*|\.)//g');;
esac
[[ "${BAZEL_VERSION}" -ge "280" ]] || error_message "The bazel version \
installed is lower than the minimum required version (0.28.0), please update \
[[ "${BAZEL_VERSION}" -ge "260" ]] || error_message "The bazel version \
installed is lower than the minimum required version (0.26.0), please update \
bazel."
success_message "bazel was found on PATH and is at or above the minimum \
version."
Expand Down
1 change: 1 addition & 0 deletions loaner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"raw-loader": "3.1.0",
"rimraf": "3.0.0",
"sass-loader": "8.0.0",
"svg-inline-loader": "0.8.0",
"to-string-loader": "1.1.5",
"tslint": "5.20.0",
"typescript": "3.5.3",
Expand Down
3 changes: 2 additions & 1 deletion loaner/testing/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ module.exports = {
loaders: ['awesome-typescript-loader', 'angular2-template-loader']
},
{test: /\.html$/, loader: 'html-loader'},
{test: /\.scss$/, use: ['to-string-loader', 'raw-loader', 'sass-loader']}
{test: /\.scss$/, use: ['to-string-loader', 'raw-loader', 'sass-loader']},
{test: /\.svg$/, loader: 'svg-inline-loader'}
],
},
plugins: [
Expand Down
1 change: 1 addition & 0 deletions loaner/web_app/frontend/config/webpack.aot.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module.exports = webpackMerge(commonConfig, {
test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
loader: '@ngtools/webpack',
},
{test: /\.svg$/, loader: 'svg-inline-loader'}
]
},
plugins: [
Expand Down

0 comments on commit 5f898ff

Please sign in to comment.