Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use picomatch instead of regex #369

Merged
merged 2 commits into from Feb 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -34,7 +34,8 @@
"@babel/helper-annotate-as-pure": "^7.16.0",
"@babel/helper-module-imports": "^7.16.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"lodash": "^4.17.11"
"lodash": "^4.17.11",
"picomatch": "^2.3.0"
},
"resolutions": {
"babel-core": "7.0.0-bridge.0"
Expand Down
5 changes: 2 additions & 3 deletions src/utils/detectors.js
@@ -1,18 +1,17 @@
import escapeRegExp from 'lodash/escapeRegExp'
import { useTopLevelImportPathMatchers } from './options'

const VALID_TOP_LEVEL_IMPORT_PATH_MATCHERS = [
'styled-components',
'styled-components/no-tags',
'styled-components/native',
'styled-components/primitives',
].map(literal => new RegExp(`^${escapeRegExp(literal)}$`))
].map(literal => x => x === literal);

export const isValidTopLevelImport = (x, state) => {
return [
...VALID_TOP_LEVEL_IMPORT_PATH_MATCHERS,
...useTopLevelImportPathMatchers(state),
].some(re => re.test(x));
].some(isMatch => isMatch(x));
}

const localNameCache = {}
Expand Down
4 changes: 3 additions & 1 deletion src/utils/options.js
@@ -1,3 +1,5 @@
import pm from 'picomatch';

function getOption({ opts }, name, defaultValue = true) {
return opts[name] === undefined || opts[name] === null
? defaultValue
Expand All @@ -6,7 +8,7 @@ function getOption({ opts }, name, defaultValue = true) {

export const useDisplayName = state => getOption(state, 'displayName')
export const useTopLevelImportPathMatchers = state =>
getOption(state, 'topLevelImportPaths', []).map(pattern => new RegExp(pattern))
getOption(state, 'topLevelImportPaths', []).map(pattern => pm(pattern))
export const useSSR = state => getOption(state, 'ssr', true)
export const useFileName = state => getOption(state, 'fileName')
export const useMeaninglessFileNames = state => getOption(state, 'meaninglessFileNames', ['index'])
Expand Down
Expand Up @@ -6,7 +6,7 @@
"displayName": true,
"fileName": false,
"ssr": true,
"topLevelImportPaths": [".*\/example$"],
"topLevelImportPaths": ["*(../)**/example"],
"transpileTemplateLiterals": false
}
]
Expand Down
Expand Up @@ -8,7 +8,7 @@
"ssr": true,
"topLevelImportPaths": [
"@xstyled/styled-components",
"@xstyled/styled-components/*"
"@xstyled/styled-components/*",
],
"transpileTemplateLiterals": false
}
Expand Down
@@ -1,4 +1,5 @@
import styled from '@xstyled/styled-components/test'
import styled from '@xstyled/styled-components'
import unstyled from '@xstyled/styled-components-test'

rockwotj marked this conversation as resolved.
Show resolved Hide resolved
const Test = styled.div`
width: 100%;
Expand All @@ -8,3 +9,4 @@ const styles = { One: styled.div`` }
let Component
Component = styled.div``
const WrappedComponent = styled(Inner)``
const NoTransformComponent = unstyled.div``;
@@ -1,4 +1,5 @@
import styled from '@xstyled/styled-components/test';
import styled from '@xstyled/styled-components';
import unstyled from '@xstyled/styled-components-test';
const Test = styled.div.withConfig({
componentId: "sc-1mlyrvc-0"
})`width:100%;`;
Expand All @@ -19,3 +20,4 @@ Component = styled.div.withConfig({
const WrappedComponent = styled(Inner).withConfig({
componentId: "sc-1mlyrvc-5"
})``;
const NoTransformComponent = unstyled.div``;
2 changes: 1 addition & 1 deletion yarn.lock
Expand Up @@ -3365,7 +3365,7 @@ picocolors@^1.0.0:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
Expand Down