Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #60

Merged
merged 9 commits into from
Jan 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*
!src/**/*.*
!lib/**/*.*
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ MIT licensed

## Release

### 2.0.3
* fix: use `/lib`

### 2.0.2
* fix: incomplete src code

Expand Down
6 changes: 6 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
unmockedModulePathPatterns: [
'node_modules/react/',
'node_modules/enzyme/'
]
};
32 changes: 12 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "react-two-points-range-selector",
"version": "2.0.2",
"version": "2.0.3",
"description": "React component for select range in the form",
"main": "src/index",
"main": "lib/index",
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.23.1",
Expand All @@ -21,18 +21,24 @@
"istanbul": "^0.4.2",
"jest": "^21.2.1",
"jest-cli": "^21.2.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-test-renderer": "^16.2.0",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.4.1"
},
"peerDependencies": {
"react": "16"
"react": "16",
"react-dom": "16"
},
"scripts": {
"test": "yarn lint && yarn unit",
"unit": "yarn jest --coverage",
"lint": "yarn eslint src",
"start": "yarn webpack-dev-server --content-base"
"build": "yarn build:package && yarn build:script",
"build:package": "yarn webpack",
"build:script": "yarn webpack --config webpack.config.demo.js",
"start": "yarn webpack-dev-server --content-base --config webpack.config.demo.js"
},
"repository": {
"type": "git",
Expand All @@ -44,27 +50,13 @@
"author": "sihui / [email protected]",
"license": "MIT",
"dependencies": {
"lodash": "^4.17.10",
"react": "^16.2.0",
"react-dom": "^16.2.0"
},
"babel": {
"presets": [
"es2015",
"react"
]
"lodash": "^4.17.10"
},
"bin": {
"codecov": "./bin/codecov"
},
"bugs": {
"url": "https://github.com/seeliang/react-range-selector"
},
"homepage": "https://github.com/seeliang/react-range-selector",
"jest": {
"unmockedModulePathPatterns": [
"node_modules/react/",
"node_modules/enzyme/"
]
}
"homepage": "https://github.com/seeliang/react-range-selector"
}
41 changes: 41 additions & 0 deletions webpack.config.demo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const webpack = require('webpack'),
path = require('path'),
CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
// TODO: build set
module.exports = {
entry: {
'react-range-selector': './demo/plugin-set/app.js', // todo: sort the filename
'form' : './demo/import-set/form.js'
},

externals: {
'react': 'React',
'react-dom': 'ReactDOM'
},

module: {
rules: [{
test: /\.jsx?$/, // A regexp to test the require path. accepts either js or jsx
loader: 'babel-loader'
}]
},

output: {
path: (path.join(__dirname,'docs/build/js')),
publicPath:'build/js',
filename: '[name].js'
},

plugins: [
new webpack.optimize.UglifyJsPlugin({
comments: false
})
],

resolve: {
modules: [
'node_modules'
]
}

};
10 changes: 3 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
const webpack = require('webpack'),
path = require('path'),
CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
// TODO: build set
path = require('path');
module.exports = {
entry: {
'react-range-selector': './demo/plugin-set/app.js', // todo: sort the filename
'form' : './demo/import-set/form.js'
index: './src/index.js'
},

externals: {
Expand All @@ -21,8 +18,7 @@ module.exports = {
},

output: {
path: (path.join(__dirname,'docs/build/js')),
publicPath:'build/js',
path: (path.join(__dirname,'lib/')),
filename: '[name].js'
},

Expand Down
57 changes: 46 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3714,6 +3714,11 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

"js-tokens@^3.0.0 || ^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

[email protected], js-yaml@^3.7.0:
version "3.8.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
Expand Down Expand Up @@ -4027,12 +4032,19 @@ longest@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"

loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
loose-envify@^1.0.0, loose-envify@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
dependencies:
js-tokens "^3.0.0"

loose-envify@^1.1.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
dependencies:
js-tokens "^3.0.0 || ^4.0.0"

lru-cache@2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
Expand Down Expand Up @@ -4787,6 +4799,15 @@ prop-types@^15.5.10, prop-types@^15.6.0:
loose-envify "^1.3.1"
object-assign "^4.1.1"

prop-types@^15.6.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
dependencies:
loose-envify "^1.4.0"
object-assign "^4.1.1"
react-is "^16.8.1"

proxy-addr@~1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.3.tgz#dc97502f5722e888467b3fa2297a7b1ff47df074"
Expand Down Expand Up @@ -4894,14 +4915,20 @@ rc@~1.1.6:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-dom@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
react-dom@^16.12.0:
version "16.12.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
scheduler "^0.18.0"

react-is@^16.8.1:
version "16.12.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==

react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
version "16.2.0"
Expand All @@ -4911,14 +4938,14 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
react@^16.12.0:
version "16.12.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"

read-pkg-up@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5256,6 +5283,14 @@ sax@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"

scheduler@^0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

select-hose@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
Expand Down