fix: remove temp code for PostCSS AST (#3537)

web-infra-dev · Sep 23, 2024 · 0c3188d · 0c3188d
1 parent 880d337
commit 0c3188d
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 46 deletions.
diff --git a/packages/compat/webpack/tests/__snapshots__/default.test.ts.snap b/packages/compat/webpack/tests/__snapshots__/default.test.ts.snap
@@ -56,7 +56,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,
@@ -426,7 +425,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when produ
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,
@@ -792,7 +790,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,
@@ -1105,7 +1102,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,

diff --git a/packages/core/prebundle.config.mjs b/packages/core/prebundle.config.mjs
@@ -161,21 +161,6 @@ export default {
         postcss: '../postcss',
         picocolors: '../picocolors',
       },
-      beforeBundle(task) {
-        // Temp fix for https://github.com/web-infra-dev/rspack/issues/7819
-        replaceFileContent(join(task.depPath, 'dist/index.js'), (content) =>
-          content.replaceAll(
-            'if (meta) {',
-            'if (meta && !rawOptions._skipReuseAST) {',
-          ),
-        );
-        replaceFileContent(join(task.depPath, 'dist/index.js'), (content) =>
-          content.replaceAll(
-            'this.getOptions(_options.default)',
-            'this.getOptions()',
-          ),
-        );
-      },
       afterBundle: writeEmptySemver,
     },
     {

diff --git a/packages/core/src/plugins/css.ts b/packages/core/src/plugins/css.ts
@@ -173,7 +173,6 @@ const getCSSLoaderOptions = ({
       localIdentName,
     },
     sourceMap: config.output.sourceMap.css,
-    _skipReuseAST: config.tools.lightningcssLoader !== false,
   };
 
   const mergedCssLoaderOptions = reduceConfigs({

diff --git a/packages/core/src/types/thirdParty.ts b/packages/core/src/types/thirdParty.ts
@@ -187,11 +187,6 @@ export interface CSSLoaderOptions {
    * @default 'array'
    */
   exportType?: 'array' | 'string' | 'css-style-sheet';
-  /**
-   * Temp fix for https://github.com/web-infra-dev/rspack/issues/7819
-   * @private
-   */
-  _skipReuseAST?: boolean;
 }
 
 export type StyleLoaderInjectType =

diff --git a/packages/core/tests/__snapshots__/builder.test.ts.snap b/packages/core/tests/__snapshots__/builder.test.ts.snap
@@ -43,7 +43,6 @@ exports[`should use rspack as default bundler > apply rspack correctly 1`] = `
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": true,

diff --git a/packages/core/tests/__snapshots__/css.test.ts.snap b/packages/core/tests/__snapshots__/css.test.ts.snap
@@ -18,7 +18,6 @@ exports[`plugin-css > should use custom cssModules rule when using output.cssMod
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": [Function],
@@ -69,7 +68,6 @@ exports[`plugin-css injectStyles > should apply ignoreCssLoader when injectStyle
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,
@@ -110,7 +108,6 @@ exports[`plugin-css injectStyles > should use css-loader + style-loader when inj
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": true,
@@ -159,7 +156,6 @@ exports[`should ensure isolation of PostCSS config objects between different bui
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,
@@ -218,7 +214,6 @@ exports[`should ensure isolation of PostCSS config objects between different bui
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,

diff --git a/packages/core/tests/__snapshots__/default.test.ts.snap b/packages/core/tests/__snapshots__/default.test.ts.snap
@@ -43,7 +43,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": true,
@@ -443,7 +442,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": true,
@@ -905,7 +903,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 0,
               "modules": {
                 "auto": true,
@@ -1245,7 +1242,6 @@ exports[`tools.rspack > should match snapshot 1`] = `
           {
             "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
             "options": {
-              "_skipReuseAST": true,
               "importLoaders": 1,
               "modules": {
                 "auto": true,

diff --git a/packages/core/tests/__snapshots__/environments.test.ts.snap b/packages/core/tests/__snapshots__/environments.test.ts.snap
@@ -1415,7 +1415,6 @@ exports[`environment config > tools.rspack / bundlerChain can be configured in e
             {
               "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
               "options": {
-                "_skipReuseAST": true,
                 "importLoaders": 1,
                 "modules": {
                   "auto": true,
@@ -1755,7 +1754,6 @@ exports[`environment config > tools.rspack / bundlerChain can be configured in e
             {
               "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
               "options": {
-                "_skipReuseAST": true,
                 "importLoaders": 0,
                 "modules": {
                   "auto": true,

diff --git a/packages/plugin-less/tests/__snapshots__/index.test.ts.snap b/packages/plugin-less/tests/__snapshots__/index.test.ts.snap
@@ -15,7 +15,6 @@ exports[`plugin-less > should add less-loader 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,
@@ -71,7 +70,6 @@ exports[`plugin-less > should add less-loader and css-loader when injectStyles 1
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,
@@ -130,7 +128,6 @@ exports[`plugin-less > should add less-loader with excludes 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,
@@ -186,7 +183,6 @@ exports[`plugin-less > should add less-loader with tools.less 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,

diff --git a/packages/plugin-sass/tests/__snapshots__/index.test.ts.snap b/packages/plugin-sass/tests/__snapshots__/index.test.ts.snap
@@ -15,7 +15,6 @@ exports[`plugin-sass > should add sass-loader 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 3,
           "modules": {
             "auto": true,
@@ -73,7 +72,6 @@ exports[`plugin-sass > should add sass-loader and css-loader when injectStyles 1
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 3,
           "modules": {
             "auto": true,
@@ -134,7 +132,6 @@ exports[`plugin-sass > should add sass-loader with excludes 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 3,
           "modules": {
             "auto": true,

diff --git a/packages/plugin-stylus/tests/__snapshots__/index.test.ts.snap b/packages/plugin-stylus/tests/__snapshots__/index.test.ts.snap
@@ -15,7 +15,6 @@ exports[`plugin-stylus > should add stylus loader config correctly 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,
@@ -64,7 +63,6 @@ exports[`plugin-stylus > should allow to configure stylus options 1`] = `
       {
         "loader": "<ROOT>/packages/core/compiled/css-loader/index.js",
         "options": {
-          "_skipReuseAST": true,
           "importLoaders": 2,
           "modules": {
             "auto": true,