Skip to content

Commit

Permalink
Merge pull request #1025 from brave/brave-ui-direct-to-github
Browse files Browse the repository at this point in the history
Use git commit ref for brave-ui dependency instead of npm-published version
  • Loading branch information
cezaraugusto authored and petemill committed Dec 10, 2018
1 parent 1fb0de5 commit 9e43e62
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
1 change: 1 addition & 0 deletions components/webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = (env, argv) => ({
extensions: ['.js', '.tsx', '.ts', '.json'],
alias: {
'bittorrent-tracker': path.resolve(__dirname, '../../node_modules/bittorrent-tracker'),
'brave-ui': path.resolve(__dirname, '../../node_modules/brave-ui/src'),
'dgram': 'chrome-dgram',
'dns': path.resolve(__dirname, '../common/dns.ts'),
'net': 'chrome-net',
Expand Down
9 changes: 4 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@
],
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|svg|ttf|woff|woff2)$": "<rootDir>/components/test/fileMock.ts",
"\\.(css|less)$": "identity-obj-proxy"
"\\.(css|less)$": "identity-obj-proxy",
"^brave-ui$": "<rootDir>/node_modules/brave-ui/src",
"^brave-ui\\/(.*)": "<rootDir>/node_modules/brave-ui/src/$1"
}
},
"devDependencies": {
Expand All @@ -272,7 +274,7 @@
"babel-preset-react": "^6.24.1",
"babel-preset-react-optimize": "^1.0.1",
"babel-preset-stage-0": "^6.24.1",
"brave-ui": "^0.34.6",
"brave-ui": "brave/brave-ui#5c2d8a0f669af2e9a68ce0fe38d49a116bc52315",
"css-loader": "^0.28.9",
"csstype": "^2.5.5",
"emptykit.css": "^1.0.1",
Expand Down
5 changes: 5 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
"allowJs": true,
"jsx": "react",
"moduleResolution": "node",
"baseUrl": ".",
"paths": {
"brave-ui": ["node_modules/brave-ui/src"],
"brave-ui/*": ["node_modules/brave-ui/src/*"]
},
"typeRoots": [
"./node_modules/@types",
"./components/definitions"
Expand Down

0 comments on commit 9e43e62

Please sign in to comment.