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.

Sign up for GitHub

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

Jump to bottom

Refactor/build setup #86

Merged
merged 10 commits into from
Oct 7, 2019
Merged

Refactor/build setup #86

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
355f1c5
Remove day picker from peer deps
bor3ham Oct 4, 2019
fcc02a9
Build css for distribution
bor3ham Oct 6, 2019
542e137
Undo weird version shift
bor3ham Oct 6, 2019
3b527a3
Change css build command
bor3ham Oct 7, 2019
9290f1e
Add folder safety to css build command
bor3ham Oct 7, 2019
34d0a4c
Change the gitignore back to all dist
bor3ham Oct 7, 2019
27ed339
Bump travis node to current LTS
bor3ham Oct 7, 2019
c0ce6f5
Bump eslint to fix no unused vars
bor3ham Oct 7, 2019
e59361a
Change sass source distribution
bor3ham Oct 7, 2019
6fbf36a
Update brain-dead test assertions
bor3ham Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
dist/
dist/*.css
bor3ham marked this conversation as resolved.
Show resolved Hide resolved
demo-site/_site/
/cells.js
/filters.js
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ yarn add react-object-list
```
Ensure you have all peer dependencies installed
```
yarn add classnames moment prop-types react-day-picker react-month-picker react-select
yarn add classnames moment prop-types react-month-picker react-select
```


Expand Down
12 changes: 8 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"files": [
"main.js",
"styles",
"dist",
"filters.js",
"cells.js",
"renderers.js",
Expand All @@ -19,7 +20,9 @@
"main": "main.js",
"scripts": {
"publish-demo": "git branch -D gh-pages; git push origin --delete gh-pages; git checkout -b gh-pages; cd demo-site; yarn; npm run build; cd ..; git add .; git add -f demo-site/dist; git add -f demo-site/node_modules/uptick-demo-site/dist; git commit -m \"Demo site build\"; git push origin gh-pages; git checkout master; git push origin `git subtree split --prefix demo-site gh-pages`:gh-pages --force;",
"build": "webpack --mode production",
"build:js": "webpack --mode production",
"build:css": "npx node-sass styles/main.sass dist/react-object-table.css",
"build": "yarn build:js && yarn build:css",
"dev": "webpack --mode development",
"watch": "webpack --mode development --watch",
"test": "jest",
Expand Down Expand Up @@ -63,12 +66,11 @@
"file-loader": "^1.1.11",
"jest": "^22.4.2",
"moment": "^2.21.0",
"node-sass": "^4.7.2",
"node-sass": "^4.12.0",
"peer-deps-externals-webpack-plugin": "^1.0.2",
"prop-types": "^15.6.1",
"raf": "^3.4.0",
"react": "^16.2.0",
"react-day-picker": "^7.1.1",
"react-dom": "^16.2.0",
"react-month-picker": "^1.3.5",
"react-select": "^2.4.2",
Expand All @@ -85,9 +87,11 @@
"moment": "^2.21.0",
"prop-types": "^15.6.1",
"react": "15.x - 16.x",
"react-day-picker": "^7.1.1",
"react-dom": "15.x - 16.x",
"react-month-picker": "^1.3.5",
"react-select": "^2.0.0-beta.6"
},
"dependencies": {
"react-day-picker": "^7.1.1"
}
}
3 changes: 0 additions & 3 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ module.exports = {
],
}],
},
externals: [
/react-day-picker.*/,
],
plugins: [
extractSass,
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
Expand Down