Merge remote-tracking branch 'origin/4.x' into refactor-eslint

.babelrc

@@ -2,8 +2,9 @@
   "env": {
     "ui": {
       "presets": [
-        "react",
-        ["env",{
+        "@babel/react",
+        "@babel/flow",
+        ["@babel/env",{
           "targets": {
             "browsers": [
               "last 5 versions",
@@ -11,70 +12,57 @@
               "Safari >= 7",
               "Explorer 11",
               "last 4 Edge versions"
-            ],
-            "loose": true
+            ]
           }
-        }],
-        "stage-2",
-        "stage-3"
+        }]
       ],
       "plugins": [
         "react-hot-loader/babel",
-        "transform-runtime",
-        "transform-class-properties",
-        "transform-object-rest-spread",
-        "transform-decorators-legacy",
-        "syntax-dynamic-import",
+        "@babel/transform-runtime",
+        "@babel/proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/syntax-dynamic-import",
         "emotion"
       ]
     },
     "test": {
-      "presets": [["env", {
+      "presets": [["@babel/env", {
         "targets": {
           "node": "6.10"
         }
-      }], "flow", "react"],
+      }], "@babel/flow",
+          "@babel/react"],
       "plugins": [
-        "transform-class-properties",
-        "transform-object-rest-spread",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
         "babel-plugin-dynamic-import-node",
         "emotion"
       ]
     },
-    "testOldEnv": {
-      "presets": [ "es2015-node4", "flow"],
-      "plugins": [
-        "transform-class-properties",
-        "transform-object-rest-spread"
-      ]
-    },
     "registry": {
       "presets": [
-        ["env", {
+        ["@babel/env", {
           "targets": {
             "node": "6.10"
           }
-        }], "stage-3", "flow"],
+        }], "@babel/flow"],
       "plugins": [
-        "transform-object-rest-spread",
-        "transform-class-properties"
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/proposal-class-properties"
       ]
     },
     "registry-docker": {
       "presets": [
-        ["env", {
+        ["@babel/env", {
           "targets": {
             "node": "10"
           }
-        }], "flow"],
+        }],
+        "@babel/flow"],
       "plugins": [
-        "transform-object-rest-spread",
-        "transform-class-properties"
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/proposal-class-properties"
       ]
-    },
-    "development": {
-      "presets": ["flow"],
-      "plugins": ["flow-runtime"]
     }
   }
 }

.circleci/config.yml

@@ -76,7 +76,7 @@ jobs:
           key: *yarn_cache_key
       - run:
           name: Install Js dependencies
-          command: yarn install --no-progress
+          command: yarn install --no-progress --registry https://registry.verdaccio.org
       - run:
           name: Prepare CI
           command:  yarn run pre:ci

.github/lock.yml

@@ -1,7 +1,7 @@
 # Configuration for lock-threads - https://github.com/dessant/lock-threads
 
 # Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 365
+daysUntilLock: 200
 
 # Issues and pull requests with these labels will not be locked. Set to `[]` to disable
 exemptLabels: []
@@ -25,4 +25,4 @@ issues:
  lockLabel: outdated
 
 pulls:
- daysUntilLock: 180
+ daysUntilLock: 90

.github/stale.yml

@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 30
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 15
+daysUntilClose: 5
 # Issues with these labels will never be considered stale
 exemptLabels:
   - High Priority
@@ -17,4 +17,4 @@ markComment: >
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false

CHANGELOG.md

@@ -44,6 +44,15 @@ All notable changes to this project will be documented in this file. See [standa
 * replaced lunr by lunr-mutable ([#915](https://github.com/verdaccio/verdaccio/issues/915)) ([1602840](https://github.com/verdaccio/verdaccio/commit/1602840))
 * verdaccio update notification on CLI ([#988](https://github.com/verdaccio/verdaccio/issues/988)) ([#998](https://github.com/verdaccio/verdaccio/issues/998)) ([bc04703](https://github.com/verdaccio/verdaccio/commit/bc04703))
 
+<a name="3.10.1"></a>
+## [3.10.1](https://github.com/verdaccio/verdaccio/compare/v3.10.0...v3.10.1) (2018-12-20)
+
+
+### Bug Fixes
+
+* remove useless secureProtocol option ([#1158](https://github.com/verdaccio/verdaccio/issues/1158)) ([c99266d](https://github.com/verdaccio/verdaccio/commit/c99266d))
+
+
 
 <a name="3.10.0"></a>
 # [3.10.0](https://github.com/verdaccio/verdaccio/compare/v3.9.0...v3.10.0) (2018-12-06)

debug/bootstrap.js

@@ -1,4 +1,4 @@
 // this file aims to help local debugging with hot transpilation
 // it requires BABEL_ENV=registry set as env variable
-require('babel-register')();
+require('@babel/register')();
 require('../src/lib/cli');

package.json

@@ -20,7 +20,6 @@
     "@verdaccio/streams": "1.0.0",
     "JSONStream": "1.3.4",
     "async": "2.6.1",
-    "autosuggest-highlight": "3.1.1",
     "body-parser": "1.18.3",
     "bunyan": "1.8.12",
     "chalk": "2.4.1",
@@ -46,8 +45,6 @@
     "mkdirp": "0.5.1",
     "mv": "2.1.1",
     "pkginfo": "0.4.1",
-    "react-autosuggest": "9.4.2",
-    "react-router": "4.3.1",
     "request": "2.88.0",
     "semver": "5.5.1",
     "verdaccio-audit": "1.0.0",
@@ -55,35 +52,41 @@
     "verror": "1.10.0"
   },
   "devDependencies": {
+    "@babel/cli": "7.2.3",
+    "@babel/core": "7.2.2",
+    "@babel/node": "7.2.2",
+    "@babel/plugin-proposal-class-properties": "7.2.3",
+    "@babel/plugin-proposal-decorators": "7.2.3",
+    "@babel/plugin-proposal-export-namespace-from": "7.2.0",
+    "@babel/plugin-proposal-function-sent": "7.2.0",
+    "@babel/plugin-proposal-json-strings": "7.2.0",
+    "@babel/plugin-proposal-numeric-separator": "7.2.0",
+    "@babel/plugin-proposal-object-rest-spread": "7.2.0",
+    "@babel/plugin-proposal-throw-expressions": "7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "7.2.0",
+    "@babel/plugin-syntax-import-meta": "7.2.0",
+    "@babel/plugin-transform-async-to-generator": "7.2.0",
+    "@babel/plugin-transform-classes": "7.2.2",
+    "@babel/plugin-transform-runtime": "7.2.0",
+    "@babel/polyfill": "7.2.3",
+    "@babel/preset-env": "7.2.3",
+    "@babel/preset-flow": "7.0.0",
+    "@babel/preset-react": "7.0.0",
+    "@babel/register": "7.0.0",
+    "@babel/runtime": "^7.2.0",
     "@commitlint/cli": "7.2.1",
     "@commitlint/config-conventional": "7.1.2",
     "@material-ui/core": "3.1.0",
     "@material-ui/icons": "3.0.1",
     "@verdaccio/types": "4.0.0",
-    "babel-cli": "6.26.0",
-    "babel-core": "6.26.3",
+    "autosuggest-highlight": "3.1.1",
+    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
-    "babel-loader": "7.1.5",
-    "babel-plugin-dynamic-import-node": "2.1.0",
+    "babel-loader": "8.0.4",
+    "babel-plugin-dynamic-import-node": "2.2.0",
     "babel-plugin-emotion": "9.2.10",
     "babel-plugin-flow-runtime": "0.17.0",
-    "babel-plugin-syntax-dynamic-import": "6.18.0",
-    "babel-plugin-transform-async-to-generator": "6.24.1",
-    "babel-plugin-transform-class-properties": "6.24.1",
-    "babel-plugin-transform-decorators-legacy": "1.3.5",
-    "babel-plugin-transform-es2015-classes": "6.24.1",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-polyfill": "6.26.0",
-    "babel-preset-env": "1.7.0",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-es2015-node4": "2.1.1",
-    "babel-preset-flow": "6.23.0",
-    "babel-preset-react": "6.24.1",
-    "babel-preset-stage-2": "6.24.1",
-    "babel-preset-stage-3": "6.24.1",
-    "babel-register": "6.26.0",
-    "babel-runtime": "6.26.0",
     "bundlesize": "0.17.0",
     "codecov": "3.1.0",
     "cross-env": "5.2.0",
@@ -128,9 +131,11 @@
     "prop-types": "15.6.2",
     "puppeteer": "1.8.0",
     "react": "16.4.2",
+    "react-autosuggest": "9.4.2",
     "react-dom": "16.4.2",
     "react-emotion": "9.2.12",
     "react-hot-loader": "4.2.0",
+    "react-router": "4.3.1",
     "react-router-dom": "4.2.2",
     "rimraf": "2.6.2",
     "sass-loader": "7.1.0",
@@ -174,8 +179,8 @@
     "test": "npm run test:unit",
     "test:clean": "npx jest --clearCache",
     "test:unit": "cross-env NODE_ENV=test BABEL_ENV=test TZ=UTC FORCE_COLOR=1 jest --config ./jest.config.js --maxWorkers 2",
-    "test:functional": "cross-env NODE_ENV=testOldEnv jest --config ./test/jest.config.functional.js --testPathPattern ./test/functional/index*",
-    "test:e2e": "cross-env BABEL_ENV=testOldEnv jest --config ./test/jest.config.e2e.js",
+    "test:functional": "cross-env NODE_ENV=test jest --config ./test/jest.config.functional.js --testPathPattern ./test/functional/index*",
+    "test:e2e": "cross-env BABEL_ENV=test jest --config ./test/jest.config.e2e.js",
     "test:size": "bundlesize",
     "test:all": "npm run build:webui && npm run test && npm run test:functional && npm run test:e2e && npm run test:size",
     "pre:ci": "npm run lint && npm run build:webui",

src/lib/bootstrap.js

@@ -94,8 +94,7 @@ function logHTTPSWarning(storageLocation) {
 function handleHTTPS(app, configPath, config) {
   try {
     let httpsOptions = {
-      secureProtocol: 'SSLv23_method', // disable insecure SSLv2 and SSLv3
-      secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3,
+      secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3, // disable insecure SSLv2 and SSLv3
     };
 
     if (config.https.pfx) {

test/e2e/pre-setup.js

@@ -1,3 +1,2 @@
-require('babel-polyfill');
-require('babel-register');
+require('@babel/register');
 module.exports = require('./setup');

test/functional/pre-setup.js

@@ -1,3 +1,2 @@
-require('babel-polyfill');
-require('babel-register');
+require('@babel/register');
 module.exports = require('./lib/setup');

test/functional/teardown.js

@@ -1,4 +1,3 @@
-// const chalk = require('chalk');
 module.exports = async function() {
   // console.log(chalk.green('Teardown Verdaccio Functional'));
   // console.log(chalk.blue('Teardown:: all server were closed'));

test/functional/test-environment.js

@@ -1,3 +1,2 @@
-require("babel-polyfill");
-require('babel-register');
+require('@babel/register');
 module.exports = require('./lib/environment');

test/lib/helper/register.js

@@ -1,6 +1,5 @@
-require("babel-polyfill");
-require('babel-core/register')({
-  ignore: /node_modules\/(?!ProjectB)/,
+require('babel-polyfill');
+require('@babel/register')({
   sourceMap: 'inline',
 });
 require('../../../src/lib/cli');

test/lib/helper/verdaccio-test

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-require("babel-register");
+require('@babel/register');
 require('../../../src/lib/cli');