chore: remove unsafe

vitejs · Feb 25, 2023 · 159eb0a · 159eb0a
1 parent 5072f8c
commit 159eb0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -734,7 +734,6 @@ function createCSSResolvers(config: ResolvedConfig): CSSAtImportResolvers {
           conditions: ['style'],
           tryIndex: false,
           preferRelative: true,
-          isUnsafeExport: true,
         }))
       )
     },
@@ -749,7 +748,6 @@ function createCSSResolvers(config: ResolvedConfig): CSSAtImportResolvers {
           tryIndex: true,
           tryPrefix: '_',
           preferRelative: true,
-          isUnsafeExport: true,
         }))
       )
     },
@@ -763,7 +761,6 @@ function createCSSResolvers(config: ResolvedConfig): CSSAtImportResolvers {
           conditions: ['less', 'style'],
           tryIndex: false,
           preferRelative: true,
-          isUnsafeExport: true,
         }))
       )
     },

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -100,9 +100,6 @@ export interface InternalResolveOptions extends Required<ResolveOptions> {
   skipPackageJson?: boolean
   preferRelative?: boolean
   isRequire?: boolean
-  isImport?: boolean
-  // When true, the export resolver should opt out of Node's default resolution conditions
-  isUnsafeExport?: boolean
   // #3040
   // when the importer is a ts module,
   // if the specifier requests a non-existent `.js/jsx/mjs/cjs` file,
@@ -1104,8 +1101,7 @@ function resolveExports(
   }
   if (
     (!overrideConditions || overrideConditions.has('module')) &&
-    !options.isRequire &&
-    !options.isUnsafeExport
+    !options.isRequire
   ) {
     conditions.push('module')
   }
@@ -1122,7 +1118,6 @@ function resolveExports(
   const result = exports(pkg, key, {
     browser: targetWeb && !conditions.includes('node'),
     require: options.isRequire && !conditions.includes('import'),
-    unsafe: options.isUnsafeExport,
     conditions,
   })
 

diff --git a/playground/css/css-dep-exports/package.json b/playground/css/css-dep-exports/package.json
@@ -4,10 +4,9 @@
   "version": "1.0.0",
   "exports": {
     ".": {
-      "import": "./index.js",
       "sass": "./style.scss",
-      "style": "./style.css"
-    },
-    "./package.json": "./package.json"
+      "style": "./style.css",
+      "import": "./index.js"
+    }
   }
 }