Skip to content

Commit

Permalink
successfully upgraded webpack (#306)
Browse files Browse the repository at this point in the history
* successfully upgraded webpack

* tweaking node6 job

* add node_modules to $PATH
  • Loading branch information
wheresrhys authored May 13, 2018
1 parent 76fce15 commit 9f6d2f2
Show file tree
Hide file tree
Showing 6 changed files with 7,657 additions and 4,509 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
- restore_cache:
key: npm-cache-{{ checksum "package-lock.json" }}
- run: npm rebuild
- run: npm install babel-polyfill
- run: make test-node6

chrome:
Expand Down Expand Up @@ -122,6 +121,7 @@ workflows:
requires:
- nodefetch1
- nodefetch2
- node6
- chrome
# - firefox
- lint
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export PATH := $(PATH):./node_modules/.bin

.PHONY: test

test-dev:
Expand All @@ -12,8 +14,7 @@ test-firefox:
test-unit:
./node_modules/.bin/mocha test/server.js

test-node6:
npm run babelify
test-node6: transpile
node test/node6.js

lint:
Expand All @@ -25,3 +26,9 @@ coverage-report:

local-coverage:
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha 'test/server.js'

transpile:
babel src --out-dir es5

bundle:
webpack --mode development --output-library fetchMock --entry ./es5/client.js --output-filename ./es5/client-bundle.js
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = karma => karma.set({
'test/**/*.js': ['webpack']
},
webpack: {
mode: 'development',
devtool: 'source-map',
module: {
rules: [
Expand Down
Loading

0 comments on commit 9f6d2f2

Please sign in to comment.