From c1ae66888d95b00e559840fb9cf069e72f53fb7c Mon Sep 17 00:00:00 2001 From: Dimitri Kopriwa Date: Mon, 11 Mar 2019 17:09:28 +0700 Subject: [PATCH] fix(dependencies): upgrade all dependencies --- .travis.yml | 38 +++++++++++++++++--------------------- babel.config.js | 3 ++- babel.ext.json | 6 ------ package.json | 33 ++++++++++++++++----------------- 4 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 babel.ext.json diff --git a/.travis.yml b/.travis.yml index e688a5f..9ebf691 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,23 +7,23 @@ branches: except: - gh-pages # will be deployed to, no need to build it -cache: - directories: - - node_modules +#cache: +# directories: +# - node_modules before_install: - - npm install -g npm - # const - - export PACKAGE_NAME=$(node -p "require('./package.json').name") - - export PACKAGE_VERSION=$(node -p "require('./package.json').version") - - export SONAR_VERSION=${PACKAGE_VERSION}-b${TRAVIS_BUILD_ID}-${TRAVIS_BRANCH} - - export NODE_VERSION=$(node --version) - - export NPM_VERSION=$(npm --version) + - npm install -g npm + # const + - export PACKAGE_NAME=$(node -p "require('./package.json').name") + - export PACKAGE_VERSION=$(node -p "require('./package.json').version") + - export SONAR_VERSION=${PACKAGE_VERSION}-b${TRAVIS_BUILD_ID}-${TRAVIS_BRANCH} + - export NODE_VERSION=$(node --version) + - export NPM_VERSION=$(npm --version) - # logging - - npm --version || echo npm not installed - - node --version || echo node not installed - - echo "package version $PACKAGE_VERSION" + # logging + - npm --version || echo npm not installed + - node --version || echo node not installed + - echo "package version $PACKAGE_VERSION" stages: - build @@ -53,7 +53,7 @@ jobs: organization: $(echo $TRAVIS_REPO_SLUG | awk -F '/' '{print $1}') script: - npm run test - - if [[ "$TRAVIS_BRANCH" != greenkeeper* ]]; then sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}; fi + - if [[ "$TRAVIS_BRANCH" != greenkeeper* && -n "$SONAR_TOKEN" ]]; then sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}; fi # Job: Release - stage: release @@ -70,12 +70,8 @@ jobs: node_js: - 'lts/*' script: - - git fetch --tags - - git checkout refs/tags/$(git describe --tags `git rev-list --tags --max-count=1`) - - npm install - - chmod +x styleguide/prepare.sh - - styleguide/prepare.sh - - npm run styleguide:build + - targetVersion=$(git describe --tags `git rev-list --tags --max-count=1`) + - npx @rollup-umd/deploy --target-version "${targetVersion}" deploy: - provider: pages skip_cleanup: true diff --git a/babel.config.js b/babel.config.js index e5aaa60..68f90b4 100644 --- a/babel.config.js +++ b/babel.config.js @@ -19,13 +19,14 @@ module.exports = merge({ ], plugins: [ 'babel-plugin-array-includes', + 'babel-plugin-inline-react-svg', '@babel/plugin-transform-runtime', '@babel/plugin-transform-async-to-generator', '@babel/plugin-proposal-class-properties', '@babel/plugin-syntax-dynamic-import', '@babel/plugin-syntax-import-meta', '@babel/plugin-proposal-json-strings', - [ + [ '@babel/plugin-proposal-decorators', { legacy: true, diff --git a/babel.ext.json b/babel.ext.json deleted file mode 100644 index 2132671..0000000 --- a/babel.ext.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "presets": [], - "plugins": [ - "babel-plugin-inline-react-svg" - ] -} \ No newline at end of file diff --git a/package.json b/package.json index ef24c8e..d98bd61 100644 --- a/package.json +++ b/package.json @@ -180,17 +180,17 @@ "@babel/polyfill": "^7.2.5", "@babel/preset-env": "^7.3.4", "@babel/preset-react": "^7.0.0", - "@bootstrap-styled/documentation": "^1.2.4", - "@bootstrap-styled/ra-ui": "^1.0.16", - "@rollup-umd/documentation": "^1.3.16", - "@rollup-umd/ncu": "^1.0.3", + "@bootstrap-styled/documentation": "^2.0.0", + "@bootstrap-styled/ra-ui": "^1.0.17", + "@rollup-umd/documentation": "^2.0.1", + "@rollup-umd/ncu": "^1.0.8", "@semantic-release/changelog": "^3.0.2", "@semantic-release/git": "^7.0.8", "@semantic-release/github": "^5.2.10", "@semantic-release/npm": "^5.1.4", - "@yeutech-lab/test-polyfill": "^1.1.4", + "@yeutech-lab/test-polyfill": "^1.1.5", "babel-eslint": "^10.0.1", - "babel-jest": "^24.1.0", + "babel-jest": "^24.3.1", "babel-loader": "^8.0.5", "babel-merge": "^2.0.1", "babel-plugin-add-module-exports": "^1.0.0", @@ -203,24 +203,23 @@ "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.10.0", "es6-promise": "^4.2.6", - "eslint": "^5.15.0", + "eslint": "^5.15.1", "eslint-config-airbnb": "^17.1.0", "eslint-plugin-import": "^2.16.0", "eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-react": "^7.12.4", "exports-loader": "^0.7.0", - "istanbul-api": "^2.1.0", - "istanbul-reports": "^2.1.0", - "jest-cli": "^24.1.0", + "istanbul-api": "^2.1.1", + "istanbul-reports": "^2.1.1", + "jest-cli": "^24.3.1", "jest-sonar-reporter": "^2.0.0", "lint-staged": "^8.1.5", "pre-commit": "^1.2.2", "ra-core": "^2.6.4", "raf": "^3.4.1", - "react": "^16.8.3", - "react-dom": "^16.8.3", - "react-styleguidist": "^8.0.6", - "react-test-renderer": "^16.8.1", + "react": "^16.8.4", + "react-dom": "^16.8.4", + "react-test-renderer": "^16.8.4", "semantic-release": "^15.13.3", "toctoc": "^0.3.2", "webpack": "^4.29.6" @@ -229,10 +228,10 @@ "prop-types": "^15.7.2" }, "peerDependencies": { - "react": "^16.8.3", - "react-dom": "^16.8.3", + "react": "^16.8.4", + "react-dom": "^16.8.4", "ra-core": "^2.6.4", - "@bootstrap-styled/ra-ui": "^1.0.16" + "@bootstrap-styled/ra-ui": "^1.0.17" }, "publishConfig": { "registry": "https://registry.npmjs.org",