Unverified Commit 90ddd0dc authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Replace node-sass test dependency with sass (#39053)

* Replace node-sass test dependency with sass

* breakup css/scss tests for more parallelism

* update compiled
parent c3e5caf1
...@@ -159,7 +159,6 @@ ...@@ -159,7 +159,6 @@
"next": "workspace:*", "next": "workspace:*",
"node-fetch": "2.6.7", "node-fetch": "2.6.7",
"node-notifier": "8.0.1", "node-notifier": "8.0.1",
"node-sass": "6.0.1",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pixrem": "5.0.0", "pixrem": "5.0.0",
...@@ -186,6 +185,7 @@ ...@@ -186,6 +185,7 @@
"release": "6.3.1", "release": "6.3.1",
"request-promise-core": "1.1.2", "request-promise-core": "1.1.2",
"resolve-from": "5.0.0", "resolve-from": "5.0.0",
"sass": "1.54.0",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"selenium-webdriver": "4.0.0-beta.4", "selenium-webdriver": "4.0.0-beta.4",
"semver": "7.3.7", "semver": "7.3.7",
......
This diff is collapsed.
...@@ -1473,15 +1473,22 @@ export async function copy_react_server_dom_webpack(task, opts) { ...@@ -1473,15 +1473,22 @@ export async function copy_react_server_dom_webpack(task, opts) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
externals['sass-loader'] = 'next/dist/compiled/sass-loader' externals['sass-loader'] = 'next/dist/compiled/sass-loader'
export async function ncc_sass_loader(task, opts) { export async function ncc_sass_loader(task, opts) {
const sassLoaderPath = require.resolve('sass-loader')
const utilsPath = join(dirname(sassLoaderPath), 'utils.js')
const originalContent = await fs.readFile(utilsPath, 'utf8')
await fs.writeFile(
utilsPath,
originalContent.replace(
/require\.resolve\(["'](sass|node-sass)["']\)/g,
'eval("require").resolve("$1")'
)
)
await task await task
.source(opts.src || relative(__dirname, require.resolve('sass-loader'))) .source(opts.src || relative(__dirname, sassLoaderPath))
.ncc({ .ncc({
packageName: 'sass-loader', packageName: 'sass-loader',
customEmit(path, isRequire) {
if (isRequire && path === 'sass') return false
if (path.indexOf('node-sass') !== -1)
return `eval("require.resolve('node-sass')")`
},
externals: { externals: {
...externals, ...externals,
'schema-utils': externals['schema-utils3'], 'schema-utils': externals['schema-utils3'],
...@@ -1854,7 +1861,6 @@ export async function ncc(task, opts) { ...@@ -1854,7 +1861,6 @@ export async function ncc(task, opts) {
'ncc_postcss_modules_values', 'ncc_postcss_modules_values',
'ncc_postcss_value_parser', 'ncc_postcss_value_parser',
'ncc_icss_utils', 'ncc_icss_utils',
'ncc_sass_loader',
'ncc_schema_utils2', 'ncc_schema_utils2',
'ncc_schema_utils3', 'ncc_schema_utils3',
'ncc_semver', 'ncc_semver',
...@@ -1888,6 +1894,7 @@ export async function ncc(task, opts) { ...@@ -1888,6 +1894,7 @@ export async function ncc(task, opts) {
'copy_constants_browserify', 'copy_constants_browserify',
'copy_react_server_dom_webpack', 'copy_react_server_dom_webpack',
'copy_react_is', 'copy_react_is',
'ncc_sass_loader',
'ncc_jest_worker', 'ncc_jest_worker',
'ncc_edge_runtime_primitives', 'ncc_edge_runtime_primitives',
'ncc_edge_runtime', 'ncc_edge_runtime',
......
This diff is collapsed.
...@@ -2,6 +2,6 @@ let originalLoader ...@@ -2,6 +2,6 @@ let originalLoader
const M = require('module') const M = require('module')
originalLoader = M._load originalLoader = M._load
M._load = function hookedLoader(request, parent, isMain) { M._load = function hookedLoader(request, parent, isMain) {
if (request === 'node-sass') request = 'node-sass-begone' if (request === 'sass') request = 'sass-begone'
return originalLoader(request, parent, isMain) return originalLoader(request, parent, isMain)
} }
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment