Skip to content

Commit

Permalink
Work around missing grpc dependency in fabric-ca-client (hyperledger-…
Browse files Browse the repository at this point in the history
…archives#2284)

See https://jira.hyperledger.org/browse/FAB-6425

Also fixes various other build defects:

- removes travis_wait from install script, which
  should hopefully reduce the number of timeouts
- add fs hack to webpack config (required as a result
  of removing BrowserFS in hyperledger-archives#2138?)
- remove unused bootstrap related dependencies
- set exacy version of rxjs dependency
- add webpack-sources dependency which the
  v8-lazy-parse-webpack-plugin module doesn't seem
  to be pulling in itself

Closes #2282

Signed-off-by: James Taylor <[email protected]>
  • Loading branch information
jt-nti authored Oct 4, 2017
1 parent 61611e3 commit 3bda94f
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ before_install: |
install: |
set -ev
date
travis_wait 30 ./.travis/install.sh
./.travis/install.sh
date
script: ./.travis/script.sh
after_failure: |
Expand Down
1 change: 1 addition & 0 deletions packages/composer-connector-hlfv1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"fabric-ca-client": "^1.0.1",
"fabric-client": "^1.0.1",
"fs-extra": "^1.0.0",
"grpc": "1.6.0",
"semver": "^5.3.0",
"temp": "^0.8.3",
"thenify-all": "^1.6.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/composer-playground/config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ module.exports = function (options) {
$ : 'jquery',
jquery : 'jquery'
}),
]
],

node: {
fs: 'empty'
}
};
};
6 changes: 5 additions & 1 deletion packages/composer-playground/config/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ module.exports = function (options) {
$ : 'jquery',
jquery : 'jquery'
}),
]
],

node: {
fs: 'empty'
}
};
};
4 changes: 2 additions & 2 deletions packages/composer-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
"babel-loader": "^6.2.10",
"babel-polyfill": "^6.23.0",
"babel-preset-latest": "^6.24.1",
"bootstrap": "4.0.0-alpha.5",
"buffer-loader": "0.0.1",
"chai": "^3.5.0",
"codelyzer": "^2.0.1",
Expand Down Expand Up @@ -183,7 +182,7 @@
"protractor": "5.1.2",
"raw-loader": "^0.5.1",
"rimraf": "^2.5.4",
"rxjs": "^5.0.2",
"rxjs": "5.4.2",
"sass-loader": "^6.0.1",
"script-ext-html-webpack-plugin": "^1.3.5",
"semver": "^5.3.0",
Expand All @@ -208,6 +207,7 @@
"typescript": "2.4.0",
"url-loader": "^0.5.7",
"v8-lazy-parse-webpack-plugin": "^0.3.0",
"webpack-sources": "1.0.1",
"webpack": "~2.4.1",
"webpack-dev-middleware": "^1.10.1",
"webpack-dev-server": "~2.4.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import * as sinon from 'sinon';

import { expect } from 'chai';

const fs = require('fs');

class MockAdminService {
ensureConnection(): Promise<any> {
return new Promise((resolve, reject) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { ConfigService } from '../config.service';
import { ConnectionProfileStore } from 'composer-common';
import { PlaygroundConnectionProfileStore } from './playgroundconnectionprofilestore';
import { BrowserConnectionProfileStore } from './browserconnectionprofilestore';
/* tslint:disable:no-var-requires */
const fs = require('fs');

@Injectable()
export class ConnectionProfileStoreService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { BrowserConnectionProfileStore } from './browserconnectionprofilestore';
/* tslint:disable:no-var-requires */
const ProxyConnectionProfileStore = require('composer-connector-proxy').ProxyConnectionProfileStore;

const fs = require('fs');

/**
* The playground connection profile store provides a combined view over a connection
* profile store persisted in the web browser (for web connection profiles) and a
Expand Down
4 changes: 0 additions & 4 deletions packages/composer-playground/src/vendor.browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ import 'rxjs/add/operator/map';
import 'rxjs/add/operator/mergeMap';

import 'jquery';
// Bootstrap v4 currently requires window.Tether to exist.
import * as Tether from 'tether';
(<any> window).Tether = Tether;
import 'bootstrap';

if ('production' === ENV) {
// Production
Expand Down

0 comments on commit 3bda94f

Please sign in to comment.