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.

Sign up for GitHub

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

Bump node-sass to 6.0.1 #109930

Merged
merged 6 commits into from
Aug 30, 2021
+1,196 −1,111
Merged

Bump node-sass to 6.0.1 #109930

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d1167c
Bump node-sass to 6.0.1
jbudz Aug 24, 2021
80b73ef
bump sass-loader to 10.2.0
jbudz Aug 24, 2021
3b7321e
use node-sass implementation
jbudz Aug 24, 2021
cc9e849
include content
jbudz Aug 24, 2021
65a0fd1
Merge branch 'master' into bump-node-sass
jbudz Aug 30, 2021
d880653
rebuild kbn-pm
jbudz Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@
"multimatch": "^4.0.0",
"mutation-observer": "^1.0.3",
"ncp": "^2.0.0",
"node-sass": "^4.14.1",
"node-sass": "^6.0.1",
"null-loader": "^3.0.0",
"nyc": "^15.0.1",
"oboe": "^2.1.4",
Expand All @@ -810,7 +810,7 @@
"regenerate": "^1.4.0",
"resolve": "^1.7.1",
"rxjs-marbles": "^5.0.6",
"sass-loader": "^8.0.2",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.0.1",
"selenium-webdriver": "^4.0.0-alpha.7",
"serve-static": "1.14.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-optimizer/src/worker/webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
{
loader: 'sass-loader',
options: {
prependData(loaderContext: webpack.loader.LoaderContext) {
additionalData(content: string, loaderContext: webpack.loader.LoaderContext) {
return `@import ${stringifyRequest(
loaderContext,
Path.resolve(
worker.repoRoot,
`src/core/public/core_app/styles/_globals_${theme}.scss`
)
)};\n`;
)};\n${content}`;
},
webpackImporter: false,
implementation: require('node-sass'),
Expand Down
5 changes: 3 additions & 2 deletions packages/kbn-storybook/src/webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ export default function ({ config: storybookConfig }: { config: Configuration })
{
loader: 'sass-loader',
options: {
prependData(loaderContext: any) {
additionalData(content: string, loaderContext: any) {
return `@import ${stringifyRequest(
loaderContext,
resolve(REPO_ROOT, 'src/core/public/core_app/styles/_globals_v7light.scss')
)};\n`;
)};\n${content}`;
},
implementation: require('node-sass'),
sassOptions: {
includePaths: [resolve(REPO_ROOT, 'node_modules')],
},
Expand Down
6 changes: 4 additions & 2 deletions x-pack/plugins/canvas/shareable_runtime/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ module.exports = {
{
loader: 'sass-loader',
options: {
implementation: require('node-sass'),
sourceMap: !isProd,
},
},
Expand Down Expand Up @@ -146,12 +147,13 @@ module.exports = {
{
loader: 'sass-loader',
options: {
prependData(loaderContext) {
additionalData(content, loaderContext) {
return `@import ${stringifyRequest(
loaderContext,
path.resolve(KIBANA_ROOT, 'src/core/public/core_app/styles/_globals_v7light.scss')
)};\n`;
)};\n${content}`;
},
implementation: require('node-sass'),
webpackImporter: false,
sassOptions: {
outputStyle: 'nested',
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/canvas/storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ const canvasWebpack = {
},
{
loader: 'sass-loader',
options: {
implementation: require('node-sass'),
},
},
],
},
Expand Down
Loading