Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
bacf54cd
Commit
bacf54cd
authored
Dec 21, 2018
by
moZLeo
Committed by
陈帅
Dec 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sweet the prettier scripts (#3177)
* alter lint-prettier * add prettier file
parent
d9ae08dc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
27 deletions
+35
-27
scripts/lint-prettier.js
scripts/lint-prettier.js
+33
-27
scripts/prettier.js
scripts/prettier.js
+2
-0
No files found.
scripts/lint-prettier.js
View file @
bacf54cd
...
...
@@ -6,7 +6,6 @@
*----------*****--------------
*/
const
glob
=
require
(
'
glob
'
);
const
prettier
=
require
(
'
prettier
'
);
const
fs
=
require
(
'
fs
'
);
const
prettierConfigPath
=
require
.
resolve
(
'
../.prettierrc
'
);
...
...
@@ -17,11 +16,14 @@ let didError = false;
let
didWarn
=
false
;
files
.
forEach
(
file
=>
{
const
options
=
prettier
.
resolveConfig
.
sync
(
file
,
{
Promise
.
all
([
prettier
.
resolveConfig
(
file
,
{
config
:
prettierConfigPath
,
});
try
{
const
fileInfo
=
prettier
.
getFileInfo
.
sync
(
file
);
}),
prettier
.
getFileInfo
(
file
),
])
.
then
(
resolves
=>
{
const
[
options
,
fileInfo
]
=
resolves
;
if
(
fileInfo
.
ignored
)
{
return
;
}
...
...
@@ -32,15 +34,19 @@ files.forEach(file => {
};
const
isPrettier
=
prettier
.
check
(
input
,
withParserOptions
);
if
(
!
isPrettier
)
{
console
.
log
(
`\x1b[31m
${
file
}
is no prettier, please use npm run prettier and git add !\x1b[0m`
);
console
.
log
(
`\x1b[31m
${
file
}
is no prettier, please use npm run prettier and git add !\x1b[0m`
);
didWarn
=
true
;
}
}
catch
(
e
)
{
})
.
catch
(
e
=>
{
didError
=
true
;
})
.
finally
(()
=>
{
if
(
didWarn
||
didError
)
{
process
.
exit
(
1
);
}
console
.
log
(
'
\
x1b[32m lint prettier success!
\
x1b[0m
'
);
});
});
if
(
didWarn
||
didError
)
{
process
.
exit
(
1
);
}
console
.
log
(
'
\
x1b[32m lint prettier success!
\
x1b[0m
'
);
scripts/prettier.js
View file @
bacf54cd
...
...
@@ -17,10 +17,12 @@ let files = [];
const
jsFiles
=
glob
.
sync
(
'
src/**/*.js*
'
,
{
ignore
:
[
'
**/node_modules/**
'
,
'
build/**
'
]
});
const
tsFiles
=
glob
.
sync
(
'
src/**/*.ts*
'
,
{
ignore
:
[
'
**/node_modules/**
'
,
'
build/**
'
]
});
const
configFiles
=
glob
.
sync
(
'
config/**/*.js*
'
,
{
ignore
:
[
'
**/node_modules/**
'
,
'
build/**
'
]
});
const
scriptFiles
=
glob
.
sync
(
'
scripts/**/*.js
'
);
const
lessFiles
=
glob
.
sync
(
'
src/**/*.less*
'
,
{
ignore
:
[
'
**/node_modules/**
'
,
'
build/**
'
]
});
files
=
files
.
concat
(
jsFiles
);
files
=
files
.
concat
(
tsFiles
);
files
=
files
.
concat
(
configFiles
);
files
=
files
.
concat
(
scriptFiles
);
files
=
files
.
concat
(
lessFiles
);
if
(
!
files
.
length
)
{
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment