Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.

Commit eee249c

Browse files
committed
chore: Update to defaults 1.5.0
1 parent 92c9514 commit eee249c

File tree

7 files changed

+102
-5010
lines changed

7 files changed

+102
-5010
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"useBuiltIns": true,
77
"targets": {
8-
"node": 4.3
8+
"node": "4.3"
99
},
1010
"exclude": [
1111
"transform-async-to-generator",
@@ -32,4 +32,4 @@
3232
]
3333
}
3434
}
35-
}
35+
}

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
yarn.lock -diff
22
* text=auto
3-
bin/* eol=lf
3+
bin/* eol=lf
4+
package-lock.json -diff

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
<!--
12
1. Check the version of package you are using. If it's not the newest version, update and try again (see changelog while updating!).
23
2. If the issue is still there, write a minimal project showing the problem and expected output.
34
3. Link to the project and mention Node version and OS in your report.
45
56
**IMPORTANT! You should use [Stack Overflow](https://stackoverflow.com/) for support related questions.**
7+
-->

.travis.yml

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,48 @@
11
sudo: false
2+
dist: trusty
23
language: node_js
34
branches:
45
only:
56
- master
6-
matrix:
7+
jobs:
78
fast_finish: true
9+
allow_failures:
10+
- env: WEBPACK_VERSION=canary
811
include:
9-
- os: linux
10-
node_js: '7'
11-
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
12-
- os: linux
13-
node_js: '4.3'
14-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
15-
- os: linux
16-
node_js: '6'
17-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
18-
- os: linux
19-
node_js: '7'
20-
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
12+
- &test-latest
13+
stage: Webpack latest
14+
node_js: 6
15+
env: WEBPACK_VERSION=latest JOB_PART=test
16+
script: npm run travis:$JOB_PART
17+
- <<: *test-latest
18+
node_js: 4.3
19+
env: WEBPACK_VERSION=latest JOB_PART=test
20+
script: npm run travis:$JOB_PART
21+
- <<: *test-latest
22+
node_js: 8
23+
env: WEBPACK_VERSION=latest JOB_PART=lint
24+
script: npm run travis:$JOB_PART
25+
- <<: *test-latest
26+
node_js: 8
27+
env: WEBPACK_VERSION=latest JOB_PART=coverage
28+
script: npm run travis:$JOB_PART
29+
after_success: 'bash <(curl -s https://codecov.io/bash)'
30+
- stage: Webpack canary
31+
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
32+
script: npm run travis:$JOB_PART
33+
node_js: 8
34+
env: WEBPACK_VERSION=canary JOB_PART=test
2135
before_install:
36+
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
2237
- nvm --version
2338
- node --version
39+
- npm --version
2440
before_script:
2541
- |-
2642
if [ "$WEBPACK_VERSION" ]; then
27-
yarn add webpack@^$WEBPACK_VERSION
43+
npm i --no-save webpack@$WEBPACK_VERSION
2844
fi
2945
script:
30-
- 'yarn run travis:$JOB_PART'
46+
- 'npm run travis:$JOB_PART'
3147
after_success:
3248
- 'bash <(curl -s https://codecov.io/bash)'

appveyor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
branches:
2+
only:
3+
- master
4+
init:
5+
- git config --global core.autocrlf input
6+
environment:
7+
matrix:
8+
- nodejs_version: '8'
9+
webpack_version: latest
10+
job_part: test
11+
- nodejs_version: '6'
12+
webpack_version: latest
13+
job_part: test
14+
- nodejs_version: '4.3'
15+
webpack_version: latest
16+
job_part: test
17+
build: 'off'
18+
matrix:
19+
fast_finish: true
20+
install:
21+
- ps: Install-Product node $env:nodejs_version x64
22+
- npm install
23+
before_test:
24+
- cmd: npm install webpack@%webpack_version%
25+
test_script:
26+
- node --version
27+
- npm --version
28+
- cmd: npm run appveyor:%job_part%

package.json

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,50 @@
22
"name": "svg-inline-loader",
33
"version": "0.7.1",
44
"description": "Cleans up and inlines your SVG files into Webpack module.",
5+
"author": "Jaeho Lee <[email protected]>",
6+
"license": "MIT",
57
"main": "dist/cjs.js",
8+
"files": [
9+
"dist"
10+
],
611
"scripts": {
712
"test": "jest",
813
"test:integration": "karma start",
914
"webpack-defaults": "webpack-defaults",
10-
"start": "yarn run serve:dev src",
15+
"start": "npm run build -- -w",
1116
"build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js'",
1217
"clean:dist": "del-cli dist",
1318
"lint": "eslint --cache src test",
1419
"lint-staged": "lint-staged",
15-
"prebuild": "yarn run clean:dist",
16-
"prepublish": "yarn run build",
17-
"release": "yarn run standard-version",
20+
"prebuild": "npm run clean",
21+
"prepublish": "npm run build",
22+
"release": "standard-version",
1823
"security": "nsp check",
1924
"serve:dev": "nodemon $2 --exec babel-node",
2025
"test:watch": "jest --watch",
2126
"test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage",
22-
"travis:coverage": "yarn run test:coverage",
23-
"travis:lint": "yarn run lint && yarn run security",
24-
"travis:test": "yarn run test"
25-
},
26-
"author": "Jaeho Lee <[email protected]>",
27-
"license": "MIT",
28-
"repository": {
29-
"type": "git",
30-
"url": "[email protected]:sairion/svg-inline-loader.git"
31-
},
32-
"keywords": [
33-
"svg",
34-
"webpack",
35-
"react",
36-
"loader"
37-
],
38-
"bugs": {
39-
"url": "https://github.com/sairion/svg-inline-loader/issues"
27+
"travis:coverage": "npm run test:coverage -- --runInBand",
28+
"travis:lint": "npm run lint && npm run security",
29+
"travis:test": "npm run test -- --runInBand",
30+
"appveyor:test": "npm run test",
31+
"clean": "del-cli dist"
4032
},
41-
"homepage": "https://github.com/sairion/svg-inline-loader",
4233
"dependencies": {
4334
"loader-utils": "^1.1.0",
4435
"simple-html-tokenizer": "^0.1.1"
4536
},
4637
"devDependencies": {
4738
"babel-cli": "^6.24.0",
48-
"babel-jest": "^19.0.0",
39+
"babel-jest": "^20.0.3",
4940
"babel-plugin-transform-object-rest-spread": "^6.23.0",
5041
"babel-polyfill": "^6.23.0",
51-
"babel-preset-env": "^1.2.2",
52-
"cross-env": "^3.2.4",
53-
"del-cli": "^0.2.1",
42+
"babel-preset-env": "^1.6.0",
43+
"cross-env": "^5.0.1",
44+
"del-cli": "^1.1.0",
5445
"eslint": "^3.18.0",
5546
"eslint-config-webpack": "^1.2.0",
56-
"eslint-plugin-import": "^2.2.0",
57-
"jest": "^19.0.2",
47+
"eslint-plugin-import": "^2.7.0",
48+
"jest": "^20.0.4",
5849
"json-loader": "^0.5.4",
5950
"lint-staged": "^3.4.0",
6051
"lodash": "^4.6.1",
@@ -63,17 +54,29 @@
6354
"nsp": "^2.6.3",
6455
"pre-commit": "^1.2.2",
6556
"raw-loader": "^0.5.1",
66-
"standard-version": "^4.0.0",
67-
"webpack-defaults": "^0.4.5"
57+
"standard-version": "^4.2.0",
58+
"webpack": "^3.2.0",
59+
"webpack-defaults": "^1.5.0"
6860
},
6961
"peerDependencies": {
70-
"webpack": "^2.3.0"
62+
"webpack": "^2.0.0 || ^3.0.0"
7163
},
7264
"engines": {
7365
"node": ">= 4.3 < 5.0.0 || >= 5.10"
7466
},
75-
"files": [
76-
"dist"
67+
"repository": {
68+
"type": "git",
69+
"url": "[email protected]:sairion/svg-inline-loader.git"
70+
},
71+
"bugs": {
72+
"url": "https://github.com/sairion/svg-inline-loader/issues"
73+
},
74+
"homepage": "https://github.com/sairion/svg-inline-loader",
75+
"keywords": [
76+
"svg",
77+
"webpack",
78+
"react",
79+
"loader"
7780
],
7881
"pre-commit": "lint-staged",
7982
"lint-staged": {

0 commit comments

Comments
 (0)