Skip to content

Commit

Permalink
Merge pull request #423 from hackoregon/fix/remove-deps-from-root
Browse files Browse the repository at this point in the history
Major Dependency Updates
  • Loading branch information
jaronheard authored Apr 8, 2019
2 parents 906e226 + 0632938 commit eb3a513
Show file tree
Hide file tree
Showing 354 changed files with 13,897 additions and 17,530 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.11.1
10.15.3
16 changes: 12 additions & 4 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
"printWidth": 80,
"tabWidth": 2,
"semi": true,
"singleQuote": false,
"jsxSingleQuote": false,
"trailingComma": "none",
"bracketSpacing": "true",
"jsxBracketSameLine": "false",
"arrowParens": "avoid",
"proseWrap": "preserve",
"htmlWhitespaceSensitivity": "css",
"endOfLine": "lf",
}
97 changes: 86 additions & 11 deletions .storybook/.babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,112 @@
"env": {
"test": {
"presets": [
"es2015",
"stage-1",
"react"
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"istanbul"
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-import-meta",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-json-strings",
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
"@babel/plugin-proposal-function-sent",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-throw-expressions",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-logical-assignment-operators",
"@babel/plugin-proposal-optional-chaining",
[
"@babel/plugin-proposal-pipeline-operator",
{
"proposal": "minimal"
}
],
"@babel/plugin-proposal-nullish-coalescing-operator",
"@babel/plugin-proposal-do-expressions"
]
},
"cjs": {
"presets": [
[
"es2015",
"@babel/preset-env",
{
"modules": "commonjs"
}
],
"stage-1",
"react"
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-import-meta",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-json-strings",
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
"@babel/plugin-proposal-function-sent",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-throw-expressions",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-logical-assignment-operators",
"@babel/plugin-proposal-optional-chaining",
[
"@babel/plugin-proposal-pipeline-operator",
{
"proposal": "minimal"
}
],
"@babel/plugin-proposal-nullish-coalescing-operator",
"@babel/plugin-proposal-do-expressions"
]
},
"esm": {
"presets": [
[
"es2015",
"@babel/preset-env",
{
"modules": false
}
],
"stage-1",
"react"
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-import-meta",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-json-strings",
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
"@babel/plugin-proposal-function-sent",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-throw-expressions",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-logical-assignment-operators",
"@babel/plugin-proposal-optional-chaining",
[
"@babel/plugin-proposal-pipeline-operator",
{
"proposal": "minimal"
}
],
"@babel/plugin-proposal-nullish-coalescing-operator",
"@babel/plugin-proposal-do-expressions"
]
}
}
}
}
16 changes: 15 additions & 1 deletion .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
const webpack = require('webpack');
const autoprefixer = require('autoprefixer');
const { createConfig, match, css, postcss, file } = require('webpack-blocks');
const {
createConfig,
match,
css,
postcss,
file,
customConfig,
} = require('webpack-blocks');

module.exports = createConfig([
match(
Expand All @@ -13,4 +20,11 @@ module.exports = createConfig([
]
),
match(['*.svg', '*.png', '*.gif', '*.jpg', '*.jpeg'], [file()]),
customConfig({
externals: [
{
xmlhttprequest: '{XMLHttpRequest:XMLHttpRequest}',
},
],
}),
]);
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
cache: yarn
node_js:
- '8.11.1'
- '10.15.3'
services:
- docker
install:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ $ nvm use
# Note for next two steps, if you get an error, keep trying the same command again.

# Installs all package dependencies and links cross-dependencies.
$ yarn bootstrap
$ yarn install

# This will build all packages. Since some packages are used internally, they need to be built before the dependent packages are worked on.
$ yarn build
Expand Down
7 changes: 7 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = function(api) {
api.cache(true);

return {
extends: '@hackoregon/civic-babel-presets/.babelrc',
};
};
2 changes: 0 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"lerna": "2.5.1",
"version": "1.0.0-alpha.1c62c05f",
"useWorkspaces": true,
"npmClient": "yarn",
"hoist": true,
"private": true
}
119 changes: 57 additions & 62 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"private": true,
"scripts": {
"bootstrap": "yarn install --frozen-lockfile && lerna bootstrap",
"bootstrap": "yarn install --frozen-lockfile",
"build": "lerna run build",
"configure": "lerna run configure",
"tag": "lerna publish --skip-npm",
Expand All @@ -32,11 +32,13 @@
"deploy-storybook": "BABEL_ENV=esm storybook-to-ghpages",
"in": "lerna run --scope",
"link:all": "lerna link",
"lint": "lerna run lint -- --fix",
"lint": "lerna run lint",
"lint:fix": "lerna run lint --no-bail -- --fix",
"storybook": "BABEL_ENV=esm start-storybook -p 6006",
"test": "lerna run test",
"test": "lerna run test --no-bail",
"travis": "make travis",
"pretty": "prettier --write \"./**/*.{js,jsx,css,md}\""
"pretty": "prettier --write \"./**/*.{js,jsx,css,md}\"",
"eslint-check": "eslint --print-config . | eslint-config-prettier-check"
},
"husky": {
"hooks": {}
Expand All @@ -53,86 +55,79 @@
]
},
"devDependencies": {
"@storybook/addon-a11y": "^3.4.3",
"@storybook/addon-actions": "^3.4.2",
"@storybook/addon-info": "^3.4.2",
"@storybook/addon-knobs": "^3.4.2",
"@storybook/addon-links": "^3.4.2",
"@storybook/addon-notes": "^3.4.2",
"@storybook/react": "^3.4.2",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@hackoregon/civic-babel-presets": "^1.0.0-alpha.1c62c05f",
"@storybook/addon-a11y": "^4.1.12",
"@storybook/addon-actions": "^4.1.12",
"@storybook/addon-info": "^4.1.12",
"@storybook/addon-knobs": "^4.1.12",
"@storybook/addon-links": "^4.1.12",
"@storybook/addon-notes": "^4.1.12",
"@storybook/react": "^4.1.12",
"@storybook/storybook-deployer": "^2.3.0",
"autoprefixer": "^6.7.7",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.1.1",
"babel-loader": "^7.1.1",
"babili-webpack-plugin": "0.0.10",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"chai-enzyme": "^0.6.1",
"autoprefixer": "^9.4.10",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.5.0",
"babel-loader": "^8.0.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"chai-enzyme": "^1.0.0-beta.1",
"chalk": "^1.1.3",
"cheerio": "^0.22.0",
"clean-webpack-plugin": "^0.1.15",
"clean-webpack-plugin": "^2.0.0",
"colors": "^1.1.2",
"coveralls": "^2.11.15",
"css-loader": "^0.28.0",
"enzyme": "^2.7.1",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^14.1.0",
"coveralls": "^3.0.3",
"css-loader": "^2.1.1",
"enzyme": "^3.9.0",
"eslint": "^5.15.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-babel": "^4.0.1",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-emotion": "^10.0.7",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-prefer-object-spread": "^1.1.0",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^6.10.0",
"eslint-watch": "^2.1.14",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^0.11.1",
"html-webpack-plugin": "^2.28.0",
"eslint-plugin-react": "^7.12.4",
"eslint-watch": "^5.0.1",
"file-loader": "^3.0.1",
"html-webpack-plugin": "^3.2.0",
"husky": "^1.3.1",
"isparta": "^4.0.0",
"istanbul": "^0.4.4",
"jest": "^20.0.4",
"jsdom": "^9.8.3",
"jsdom-global": "^2.1.0",
"jest": "^24.5.0",
"jsdom": "^14.0.0",
"jsdom-global": "^3.0.2",
"json-loader": "^0.5.4",
"lerna": "^2.5.1",
"lerna": "^3.13.1",
"lint-staged": "^8.1.4",
"lodash-webpack-plugin": "^0.11.2",
"mocha": "^3.2.0",
"mocha": "^6.0.2",
"mocha-clean": "^1.0.0",
"mochawesome": "^1.5.1",
"nock": "^9.0.2",
"mochawesome": "^3.1.1",
"nock": "^10.0.6",
"node-notifier": "^5.0.2",
"npm-run-all": "^4.0.2",
"postcss-loader": "^1.3.3",
"postcss-loader": "^3.0.0",
"prettier": "1.16.4",
"prop-types": "^15.5.3",
"react-addons-test-utils": "^15.5.3",
"react-hot-loader": "^3.0.0-beta.7",
"react-transform-hmr": "^1.0.4",
"redux-immutable-state-invariant": "^1.2.4",
"redux-mock-store": "^1.2.1",
"regenerator-runtime": "^0.10.1",
"regenerator-runtime": "^0.13.1",
"rimraf": "^2.6.2",
"sinon": "^1.17.7",
"sinon-chai": "^2.8.0",
"style-loader": "^0.16.1",
"url-loader": "^0.5.7",
"sinon": "^7.2.7",
"sinon-chai": "^3.3.0",
"style-loader": "^0.23.1",
"url-loader": "^1.1.2",
"version-bump-prompt": "^3.1.0",
"watch": "^1.0.2",
"webpack": "^2.7.0",
"webpack-bundle-analyzer": "^2.1.1",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.4.1",
"webpack-hot-middleware": "^2.17.0",
"webpack-md5-hash": "^0.0.5",
"webpack": "^4.29.6",
"webpack-blocks": "^2.0.0-rc",
"webpack-bundle-analyzer": "^3.1.0",
"webpack-dev-middleware": "^3.6.1",
"webpack-dev-server": "^3.2.1",
"webpack-hot-middleware": "^2.24.3",
"webpack-md5-hash": "^0.0.6",
"webpack-node-externals": "^1.5.4"
},
"dependencies": {
"@hackoregon/civic-server": "0.0.10",
"d3-request": "^1.0.6",
"deck.gl": "^5.2.4"
}
"dependencies": {}
}
2 changes: 1 addition & 1 deletion packages/2017/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8.11-stretch
FROM node:10.15.3-stretch

# Create app directory
WORKDIR /usr/src/app
Expand Down
Loading

0 comments on commit eb3a513

Please sign in to comment.