Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
caab8076
Commit
caab8076
authored
Mar 07, 2022
by
Evan Read
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove node-sass-magic-importer
parent
d0f3a0ed
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
293 deletions
+35
-293
storybook/config/webpack.config.js
storybook/config/webpack.config.js
+29
-1
storybook/package.json
storybook/package.json
+0
-1
storybook/yarn.lock
storybook/yarn.lock
+6
-291
No files found.
storybook/config/webpack.config.js
View file @
caab8076
...
...
@@ -2,13 +2,41 @@
const
{
statSync
}
=
require
(
'
fs
'
);
const
path
=
require
(
'
path
'
);
const
glob
=
require
(
'
glob
'
);
const
sass
=
require
(
'
sass
'
);
const
{
buildIncludePaths
,
resolveGlobUrl
}
=
require
(
'
node-sass-magic-importer/dist/toolbox
'
);
const
webpack
=
require
(
'
webpack
'
);
const
IS_EE
=
require
(
'
../../config/helpers/is_ee_env
'
);
const
IS_JH
=
require
(
'
../../config/helpers/is_jh_env
'
);
const
gitlabWebpackConfig
=
require
(
'
../../config/webpack.config
'
);
const
buildIncludePaths
=
(
nodeSassIncludePaths
,
previouslyResolvedPath
)
=>
{
const
includePaths
=
[];
if
(
path
.
isAbsolute
(
previouslyResolvedPath
))
{
includePaths
.
push
(
path
.
dirname
(
previouslyResolvedPath
));
}
return
[...
new
Set
([...
includePaths
,
...
nodeSassIncludePaths
.
split
(
path
.
delimiter
)])];
};
const
resolveGlobUrl
=
(
url
,
includePaths
=
[])
=>
{
const
filePaths
=
new
Set
();
if
(
glob
.
hasMagic
(
url
))
{
includePaths
.
forEach
((
includePath
)
=>
{
const
globPaths
=
glob
.
sync
(
url
,
{
cwd
:
includePath
});
globPaths
.
forEach
((
relativePath
)
=>
{
filePaths
.
add
(
path
.
resolve
(
includePath
,
relativePath
)
// This fixes a problem with importing absolute paths on windows.
.
split
(
`\\`
)
.
join
(
`/`
),
);
});
});
return
[...
filePaths
];
}
return
null
;
};
const
ROOT
=
path
.
resolve
(
__dirname
,
'
../../
'
);
const
TRANSPARENT_1X1_PNG
=
'
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==)
'
;
...
...
storybook/package.json
View file @
caab8076
...
...
@@ -15,7 +15,6 @@
"@storybook/addon-essentials"
:
"^6.2.9"
,
"@storybook/vue"
:
"6.2.9"
,
"graphql-tag"
:
"^2.12.5"
,
"node-sass-magic-importer"
:
"^5.3.2"
,
"postcss-loader"
:
"3.0.0"
,
"sass"
:
"^1.49.9"
,
"sass-loader"
:
"^7.1.0"
,
...
...
storybook/yarn.lock
View file @
caab8076
This diff is collapsed.
Click to expand it.
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