fix: update dependencies

gajus · gajus · commit 6a78e70a3049 · 2018-09-03T13:00:43.000+03:00
diff --git a/.babelrc b/.babelrc
@@ -1,8 +1,15 @@
 {
   "plugins": [
-    "transform-es2015-modules-commonjs",
-    "transform-es2015-parameters",
-    "transform-es2015-destructuring",
-    "transform-flow-strip-types"
+    "@babel/plugin-transform-flow-strip-types"
+  ],
+  "presets": [
+    [
+      "@babel/env",
+      {
+        "targets": {
+          "node": "8.0"
+        }
+      }
+    ]
   ]
 }
diff --git a/.flowconfig b/.flowconfig
@@ -2,6 +2,7 @@
 <PROJECT_ROOT>/node_modules/config-chain/test/broken.json
 <PROJECT_ROOT>/node_modules/conventional-changelog-core/test/fixtures/_malformation.json
 <PROJECT_ROOT>/node_modules/npmconf/test/fixtures/package.json
+<PROJECT_ROOT>/node_modules/npm/node_modules/config-chain/test/broken.json
 
 [options]
 module.ignore_non_literal_requires=true
diff --git a/demo/package.json b/demo/package.json
@@ -10,9 +10,9 @@
     "webpack": "^2.2.0-rc.3"
   },
   "devDependencies": {
-    "babel-core": "^6.21.0",
-    "babel-loader": "^6.2.10",
-    "babel-plugin-transform-react-jsx": "^6.8.0",
+    "@babel/core": "^6.21.0",
+    "@babel/loader": "^6.2.10",
+    "@babel/plugin-transform-react-jsx": "^6.8.0",
     "css-loader": "^0.26.1",
     "style-loader": "^0.13.1",
     "webpack-dev-server": "^2.2.0-rc.0"
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -18,7 +18,7 @@ module.exports = {
       },
       {
         include: path.resolve(__dirname, './src'),
-        loader: 'babel-loader',
+        loader: '@babel/loader',
         query: {
           plugins: [
             'transform-react-jsx',
diff --git a/package.json b/package.json
@@ -5,40 +5,53 @@
     "url": "http://gajus.com"
   },
   "dependencies": {
-    "ajv": "^6.5.0",
+    "@babel/plugin-syntax-jsx": "^7.0.0",
+    "@babel/types": "^7.0.0",
+    "ajv": "^6.5.3",
     "ajv-keywords": "^3.2.0",
-    "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-types": "^6.26.0",
-    "generic-names": "^1.0.3",
-    "postcss": "^6.0.22",
-    "postcss-modules": "^1.1.0",
-    "postcss-modules-extract-imports": "^1.1.0",
+    "generic-names": "^2.0.1",
+    "postcss": "^7.0.2",
+    "postcss-modules": "^1.3.2",
+    "postcss-modules-extract-imports": "^1.2.0",
     "postcss-modules-local-by-default": "^1.2.0",
     "postcss-modules-parser": "^1.1.1",
     "postcss-modules-scope": "^1.1.0",
     "postcss-modules-values": "^1.3.0"
   },
   "description": "Transforms styleName to className using compile time CSS module resolution.",
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-helper-plugin-test-runner": "^6.24.1",
-    "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "babel-plugin-transform-es2015-parameters": "^6.24.1",
-    "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-preset-es2015": "^6.24.1",
-    "eslint": "^4.19.1",
-    "eslint-config-canonical": "^9.3.2",
-    "flow-bin": "^0.72.0",
-    "husky": "^0.14.3",
-    "mocha": "^5.2.0",
-    "postcss-less": "^1.1.5",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/helper-plugin-test-runner": "^7.0.0",
+    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/register": "^7.0.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-plugin-tester": "^5.5.1",
+    "eslint": "^5.5.0",
+    "eslint-config-canonical": "^12.0.0",
+    "flow-bin": "^0.80.0",
+    "husky": "^1.0.0-rc.13",
+    "jest": "^23.5.0",
+    "postcss-less": "^2.0.0",
     "postcss-nested": "^3.0.0",
-    "postcss-scss": "^1.0.5",
-    "semantic-release": "^15.5.0"
+    "postcss-scss": "^2.0.0",
+    "semantic-release": "^15.9.12"
   },
   "engines": {
-    "node": ">4.0.0"
+    "node": ">8.0.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run test && npm run lint"
+    }
+  },
+  "jest": {
+    "modulePathIgnorePatterns": [
+      "/test/fixtures/"
+    ],
+    "testEnvironment": "node",
+    "testRegex": "./test/.+\\.js$"
   },
   "keywords": [
     "babel-plugin",
@@ -55,8 +68,7 @@
     "build": "rm -fr ./dist && NODE_ENV=production babel ./src --out-dir ./dist --source-maps --copy-files && npm run build-helper",
     "build-helper": "mkdir -p ./dist/browser && NODE_ENV=production babel ./src/getClassName.js --out-file ./dist/browser/getClassName.js --source-maps --no-babelrc --plugins transform-es2015-modules-commonjs,transform-flow-strip-types --presets es2015",
     "lint": "eslint ./src && flow",
-    "precommit": "npm run test && npm run lint",
-    "test": " NODE_ENV=test mocha --require babel-core/register"
+    "test": "jest"
   },
   "version": "1.0.0"
 }
diff --git a/src/conditionalClassMerge.js b/src/conditionalClassMerge.js
@@ -4,7 +4,7 @@ import {
   binaryExpression,
   conditionalExpression,
   stringLiteral
-} from 'babel-types';
+} from '@babel/types';
 
 /* eslint-disable flowtype/no-weak-types */
 
diff --git a/src/createObjectExpression.js b/src/createObjectExpression.js
@@ -2,7 +2,7 @@
 
 import BabelTypes, {
   ObjectExpression
-} from 'babel-types';
+} from '@babel/types';
 
 type InputObjectType = {
   [key: string]: *
diff --git a/src/getClassName.js b/src/getClassName.js
@@ -6,6 +6,10 @@ import type {
   HandleMissingStyleNameOptionType
 } from './types';
 
+type OptionsType = {|
+  handleMissingStyleName: HandleMissingStyleNameOptionType
+|};
+
 const DEFAULT_HANDLE_MISSING_STYLENAME_OPTION = 'throw';
 
 const isNamespacedStyleName = (styleName: string): boolean => {
@@ -62,10 +66,6 @@ const getClassNameForNamespacedStyleName = (
   return styleModuleImportMap[importName][moduleName];
 };
 
-type OptionsType = {|
-  handleMissingStyleName: HandleMissingStyleNameOptionType
-|};
-
 export default (styleNameValue: string, styleModuleImportMap: StyleModuleImportMapType, options?: OptionsType): string => {
   const styleModuleImportMapKeys = Object.keys(styleModuleImportMap);
 
diff --git a/src/index.js b/src/index.js
@@ -4,8 +4,8 @@ import {
   dirname,
   resolve
 } from 'path';
-import babelPluginJsxSyntax from 'babel-plugin-syntax-jsx';
-import BabelTypes from 'babel-types';
+import babelPluginJsxSyntax from '@babel/plugin-syntax-jsx';
+import BabelTypes from '@babel/types';
 import ajvKeywords from 'ajv-keywords';
 import Ajv from 'ajv';
 import optionsSchema from './schemas/optionsSchema.json';
diff --git a/src/replaceJsxExpressionContainer.js b/src/replaceJsxExpressionContainer.js
@@ -1,4 +1,5 @@
 // @flow
+
 import BabelTypes, {
   binaryExpression,
   Identifier,
@@ -8,7 +9,7 @@ import BabelTypes, {
   JSXAttribute,
   jSXExpressionContainer,
   jSXIdentifier
-} from 'babel-types';
+} from '@babel/types';
 import type {
   HandleMissingStyleNameOptionType
 } from './types';
diff --git a/src/requireCssModule.js b/src/requireCssModule.js
@@ -28,6 +28,12 @@ type FiletypesConfigurationType = {
   [key: string]: FiletypeOptionsType
 };
 
+type OptionsType = {|
+  filetypes: FiletypesConfigurationType,
+  generateScopedName?: GenerateScopedNameConfigurationType,
+  context?: string
+|};
+
 const getFiletypeOptions = (cssSourceFilePath: string, filetypes: FiletypesConfigurationType): ?FiletypeOptionsType => {
   const extension = cssSourceFilePath.substr(cssSourceFilePath.lastIndexOf('.'));
   const filetype = filetypes ? filetypes[extension] : null;
@@ -87,12 +93,6 @@ const getTokens = (runner, cssSourceFilePath: string, filetypeOptions: ?Filetype
   return lazyResult.root.tokens;
 };
 
-type OptionsType = {|
-  filetypes: FiletypesConfigurationType,
-  generateScopedName?: GenerateScopedNameConfigurationType,
-  context?: string
-|};
-
 export default (cssSourceFilePath: string, options: OptionsType): StyleModuleMapType => {
   // eslint-disable-next-line prefer-const
   let runner;
diff --git a/src/resolveStringLiteral.js b/src/resolveStringLiteral.js
@@ -5,7 +5,7 @@ import {
   isStringLiteral,
   JSXAttribute,
   stringLiteral
-} from 'babel-types';
+} from '@babel/types';
 import conditionalClassMerge from './conditionalClassMerge';
 import getClassName from './getClassName';
 import type {
@@ -25,7 +25,8 @@ export default (
   styleModuleImportMap: StyleModuleImportMapType,
   sourceAttribute: JSXAttribute,
   destinationName: string,
-  options: OptionsType): void => {
+  options: OptionsType
+): void => {
   const resolvedStyleName = getClassName(sourceAttribute.value.value, styleModuleImportMap, options);
 
   const destinationAttribute = path.node.openingElement.attributes
diff --git a/test/index.js b/test/index.js
@@ -1,2 +1,2 @@
 // eslint-disable-next-line import/no-commonjs
-require('babel-helper-plugin-test-runner')(__dirname);
+require('@babel/helper-plugin-test-runner').default(__dirname);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ module.exports = {`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`include: path.resolve(__dirname, './src'),`
`21`		`- loader: 'babel-loader',`
	`21`	`+ loader: '@babel/loader',`
`22`	`22`	`query: {`
`23`	`23`	`plugins: [`
`24`	`24`	`'transform-react-jsx',`