Deduplicate acorn import (#3929)

rollup · Jan 20, 2021 · 1ca0404 · 1ca0404
1 parent f051067
commit 1ca0404
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/rollup.config.js b/rollup.config.js
@@ -49,7 +49,8 @@ const moduleAliases = {
 	resolve: ['.js', '.json', '.md'],
 	entries: [
 		{ find: 'help.md', replacement: path.resolve('cli/help.md') },
-		{ find: 'package.json', replacement: path.resolve('package.json') }
+		{ find: 'package.json', replacement: path.resolve('package.json') },
+		{ find: 'acorn', replacement: path.resolve('node_modules/acorn/dist/acorn.mjs') }
 	]
 };
 

diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts
@@ -1,3 +1,4 @@
+import * as acorn from 'acorn';
 import injectClassFields from 'acorn-class-fields';
 import injectStaticClassFeatures from 'acorn-static-class-features';
 import {

diff --git a/typings/declarations.d.ts b/typings/declarations.d.ts
@@ -1,5 +1,4 @@
 // internal
-declare module 'rollup';
 declare module 'help.md' {
 	const str: string;
 	export default str;
@@ -16,16 +15,6 @@ declare module 'acorn-class-fields' {
 	export default plugin;
 }
 
-declare module 'acorn-import-meta' {
-	const plugin: (BaseParser: typeof acorn.Parser) => typeof acorn.Parser;
-	export default plugin;
-}
-
-declare module 'acorn-export-ns-from' {
-	const plugin: (BaseParser: typeof acorn.Parser) => typeof acorn.Parser;
-	export default plugin;
-}
-
 declare module 'fsevents' {
 	export default {};
 }