Skip to content

Commit 6a78e70

Browse files
committed
fix: update dependencies
1 parent f635b35 commit 6a78e70

13 files changed

+73
-51
lines changed

.babelrc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
22
"plugins": [
3-
"transform-es2015-modules-commonjs",
4-
"transform-es2015-parameters",
5-
"transform-es2015-destructuring",
6-
"transform-flow-strip-types"
3+
"@babel/plugin-transform-flow-strip-types"
4+
],
5+
"presets": [
6+
[
7+
"@babel/env",
8+
{
9+
"targets": {
10+
"node": "8.0"
11+
}
12+
}
13+
]
714
]
815
}

.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PROJECT_ROOT>/node_modules/config-chain/test/broken.json
33
<PROJECT_ROOT>/node_modules/conventional-changelog-core/test/fixtures/_malformation.json
44
<PROJECT_ROOT>/node_modules/npmconf/test/fixtures/package.json
5+
<PROJECT_ROOT>/node_modules/npm/node_modules/config-chain/test/broken.json
56

67
[options]
78
module.ignore_non_literal_requires=true

demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"webpack": "^2.2.0-rc.3"
1111
},
1212
"devDependencies": {
13-
"babel-core": "^6.21.0",
14-
"babel-loader": "^6.2.10",
15-
"babel-plugin-transform-react-jsx": "^6.8.0",
13+
"@babel/core": "^6.21.0",
14+
"@babel/loader": "^6.2.10",
15+
"@babel/plugin-transform-react-jsx": "^6.8.0",
1616
"css-loader": "^0.26.1",
1717
"style-loader": "^0.13.1",
1818
"webpack-dev-server": "^2.2.0-rc.0"

demo/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
},
1919
{
2020
include: path.resolve(__dirname, './src'),
21-
loader: 'babel-loader',
21+
loader: '@babel/loader',
2222
query: {
2323
plugins: [
2424
'transform-react-jsx',

package.json

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,53 @@
55
"url": "http://gajus.com"
66
},
77
"dependencies": {
8-
"ajv": "^6.5.0",
8+
"@babel/plugin-syntax-jsx": "^7.0.0",
9+
"@babel/types": "^7.0.0",
10+
"ajv": "^6.5.3",
911
"ajv-keywords": "^3.2.0",
10-
"babel-plugin-syntax-jsx": "^6.18.0",
11-
"babel-types": "^6.26.0",
12-
"generic-names": "^1.0.3",
13-
"postcss": "^6.0.22",
14-
"postcss-modules": "^1.1.0",
15-
"postcss-modules-extract-imports": "^1.1.0",
12+
"generic-names": "^2.0.1",
13+
"postcss": "^7.0.2",
14+
"postcss-modules": "^1.3.2",
15+
"postcss-modules-extract-imports": "^1.2.0",
1616
"postcss-modules-local-by-default": "^1.2.0",
1717
"postcss-modules-parser": "^1.1.1",
1818
"postcss-modules-scope": "^1.1.0",
1919
"postcss-modules-values": "^1.3.0"
2020
},
2121
"description": "Transforms styleName to className using compile time CSS module resolution.",
2222
"devDependencies": {
23-
"babel-cli": "^6.26.0",
24-
"babel-helper-plugin-test-runner": "^6.24.1",
25-
"babel-plugin-transform-es2015-destructuring": "^6.23.0",
26-
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
27-
"babel-plugin-transform-es2015-parameters": "^6.24.1",
28-
"babel-plugin-transform-flow-strip-types": "^6.22.0",
29-
"babel-preset-es2015": "^6.24.1",
30-
"eslint": "^4.19.1",
31-
"eslint-config-canonical": "^9.3.2",
32-
"flow-bin": "^0.72.0",
33-
"husky": "^0.14.3",
34-
"mocha": "^5.2.0",
35-
"postcss-less": "^1.1.5",
23+
"@babel/cli": "^7.0.0",
24+
"@babel/core": "^7.0.0",
25+
"@babel/helper-plugin-test-runner": "^7.0.0",
26+
"@babel/plugin-transform-flow-strip-types": "^7.0.0",
27+
"@babel/preset-env": "^7.0.0",
28+
"@babel/register": "^7.0.0",
29+
"babel-core": "^7.0.0-bridge.0",
30+
"babel-plugin-tester": "^5.5.1",
31+
"eslint": "^5.5.0",
32+
"eslint-config-canonical": "^12.0.0",
33+
"flow-bin": "^0.80.0",
34+
"husky": "^1.0.0-rc.13",
35+
"jest": "^23.5.0",
36+
"postcss-less": "^2.0.0",
3637
"postcss-nested": "^3.0.0",
37-
"postcss-scss": "^1.0.5",
38-
"semantic-release": "^15.5.0"
38+
"postcss-scss": "^2.0.0",
39+
"semantic-release": "^15.9.12"
3940
},
4041
"engines": {
41-
"node": ">4.0.0"
42+
"node": ">8.0.0"
43+
},
44+
"husky": {
45+
"hooks": {
46+
"pre-commit": "npm run test && npm run lint"
47+
}
48+
},
49+
"jest": {
50+
"modulePathIgnorePatterns": [
51+
"/test/fixtures/"
52+
],
53+
"testEnvironment": "node",
54+
"testRegex": "./test/.+\\.js$"
4255
},
4356
"keywords": [
4457
"babel-plugin",
@@ -55,8 +68,7 @@
5568
"build": "rm -fr ./dist && NODE_ENV=production babel ./src --out-dir ./dist --source-maps --copy-files && npm run build-helper",
5669
"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",
5770
"lint": "eslint ./src && flow",
58-
"precommit": "npm run test && npm run lint",
59-
"test": " NODE_ENV=test mocha --require babel-core/register"
71+
"test": "jest"
6072
},
6173
"version": "1.0.0"
6274
}

src/conditionalClassMerge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
binaryExpression,
55
conditionalExpression,
66
stringLiteral
7-
} from 'babel-types';
7+
} from '@babel/types';
88

99
/* eslint-disable flowtype/no-weak-types */
1010

src/createObjectExpression.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import BabelTypes, {
44
ObjectExpression
5-
} from 'babel-types';
5+
} from '@babel/types';
66

77
type InputObjectType = {
88
[key: string]: *

src/getClassName.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import type {
66
HandleMissingStyleNameOptionType
77
} from './types';
88

9+
type OptionsType = {|
10+
handleMissingStyleName: HandleMissingStyleNameOptionType
11+
|};
12+
913
const DEFAULT_HANDLE_MISSING_STYLENAME_OPTION = 'throw';
1014

1115
const isNamespacedStyleName = (styleName: string): boolean => {
@@ -62,10 +66,6 @@ const getClassNameForNamespacedStyleName = (
6266
return styleModuleImportMap[importName][moduleName];
6367
};
6468

65-
type OptionsType = {|
66-
handleMissingStyleName: HandleMissingStyleNameOptionType
67-
|};
68-
6969
export default (styleNameValue: string, styleModuleImportMap: StyleModuleImportMapType, options?: OptionsType): string => {
7070
const styleModuleImportMapKeys = Object.keys(styleModuleImportMap);
7171

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {
44
dirname,
55
resolve
66
} from 'path';
7-
import babelPluginJsxSyntax from 'babel-plugin-syntax-jsx';
8-
import BabelTypes from 'babel-types';
7+
import babelPluginJsxSyntax from '@babel/plugin-syntax-jsx';
8+
import BabelTypes from '@babel/types';
99
import ajvKeywords from 'ajv-keywords';
1010
import Ajv from 'ajv';
1111
import optionsSchema from './schemas/optionsSchema.json';

src/replaceJsxExpressionContainer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// @flow
2+
23
import BabelTypes, {
34
binaryExpression,
45
Identifier,
@@ -8,7 +9,7 @@ import BabelTypes, {
89
JSXAttribute,
910
jSXExpressionContainer,
1011
jSXIdentifier
11-
} from 'babel-types';
12+
} from '@babel/types';
1213
import type {
1314
HandleMissingStyleNameOptionType
1415
} from './types';

src/requireCssModule.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ type FiletypesConfigurationType = {
2828
[key: string]: FiletypeOptionsType
2929
};
3030

31+
type OptionsType = {|
32+
filetypes: FiletypesConfigurationType,
33+
generateScopedName?: GenerateScopedNameConfigurationType,
34+
context?: string
35+
|};
36+
3137
const getFiletypeOptions = (cssSourceFilePath: string, filetypes: FiletypesConfigurationType): ?FiletypeOptionsType => {
3238
const extension = cssSourceFilePath.substr(cssSourceFilePath.lastIndexOf('.'));
3339
const filetype = filetypes ? filetypes[extension] : null;
@@ -87,12 +93,6 @@ const getTokens = (runner, cssSourceFilePath: string, filetypeOptions: ?Filetype
8793
return lazyResult.root.tokens;
8894
};
8995

90-
type OptionsType = {|
91-
filetypes: FiletypesConfigurationType,
92-
generateScopedName?: GenerateScopedNameConfigurationType,
93-
context?: string
94-
|};
95-
9696
export default (cssSourceFilePath: string, options: OptionsType): StyleModuleMapType => {
9797
// eslint-disable-next-line prefer-const
9898
let runner;

src/resolveStringLiteral.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
isStringLiteral,
66
JSXAttribute,
77
stringLiteral
8-
} from 'babel-types';
8+
} from '@babel/types';
99
import conditionalClassMerge from './conditionalClassMerge';
1010
import getClassName from './getClassName';
1111
import type {
@@ -25,7 +25,8 @@ export default (
2525
styleModuleImportMap: StyleModuleImportMapType,
2626
sourceAttribute: JSXAttribute,
2727
destinationName: string,
28-
options: OptionsType): void => {
28+
options: OptionsType
29+
): void => {
2930
const resolvedStyleName = getClassName(sourceAttribute.value.value, styleModuleImportMap, options);
3031

3132
const destinationAttribute = path.node.openingElement.attributes

test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// eslint-disable-next-line import/no-commonjs
2-
require('babel-helper-plugin-test-runner')(__dirname);
2+
require('@babel/helper-plugin-test-runner').default(__dirname);

0 commit comments

Comments
 (0)