wip(core): createCJSModule is now an option (that defaults to defaultCreateCJSModule)

Author: Franck Freiburger

src/createVue2SFCModule.ts

@@ -25,7 +25,6 @@ import {
 	interopRequireDefault,
 	transformJSCode,
 	loadDeps,
-	createCJSModule,
 	loadModuleInternal,
 } from './tools'
 
@@ -70,7 +69,7 @@ export async function createSFCModule(source : string, filename : AbstractPath,
 
 	const component = {};
 
-	const { delimiters, whitespace, moduleCache, compiledCache, getResource, addStyle, log, additionalBabelParserPlugins = [], additionalBabelPlugins = {}, customBlockHandler, devMode = false } = options;
+	const { delimiters, whitespace, moduleCache, compiledCache, getResource, addStyle, log, additionalBabelParserPlugins = [], additionalBabelPlugins = {}, customBlockHandler, devMode = false, createCJSModule } = options;
 
 	const descriptor = sfc_parse({
 		source,

src/createVue3SFCModule.ts

@@ -24,7 +24,6 @@ import {
 	interopRequireDefault,
 	transformJSCode,
 	loadDeps,
-	createCJSModule,
 	loadModuleInternal,
 } from './tools'
 
@@ -68,7 +67,7 @@ export async function createSFCModule(source : string, filename : AbstractPath,
 
 	const component : { [key: string]: any } = {};
 
-	const { delimiters, whitespace, isCustomElement, moduleCache, compiledCache, getResource, addStyle, log, additionalBabelParserPlugins = [], additionalBabelPlugins = {}, customBlockHandler, devMode = false } = options;
+	const { delimiters, whitespace, isCustomElement, moduleCache, compiledCache, getResource, addStyle, log, additionalBabelParserPlugins = [], additionalBabelPlugins = {}, customBlockHandler, devMode = false, createCJSModule } = options;
 
 	// vue-loader next: https://github.com/vuejs/vue-loader/blob/next/src/index.ts#L91
 	const { descriptor, errors } = sfc_parse(source, {

src/index.ts

@@ -3,7 +3,8 @@ import {
 } from 'path'
 
 import {
-	loadModuleInternal
+	loadModuleInternal,
+	defaultCreateCJSModule,
 } from './tools'
 
 import {
@@ -31,8 +32,6 @@ export const version : string = process.env.VERSION as string;
 export const vueVersion : string = process.env.VUE_VERSION as string;
 
 
-export { createCJSModule } from './tools'
-
 /**
  * @internal
  */
@@ -161,6 +160,7 @@ export async function loadModule(path : AbstractPath, options : Options = throwN
 		addStyle = throwNotDefined('options.addStyle()'),
 		pathResolve = defaultPathResolve,
 		getResource = defaultGetResource,
+		createCJSModule = defaultCreateCJSModule,
 	} = options;
 
 	// moduleCache should be defined with Object.create(null). require('constructor') etc... should not be a default module
@@ -174,6 +174,8 @@ export async function loadModule(path : AbstractPath, options : Options = throwN
 		pathResolve,
 		//@ts-ignore: is specified more than once, so this usage will be overwritten.ts(2783)
 		getResource,
+		//@ts-ignore: is specified more than once, so this usage will be overwritten.ts(2783)
+		createCJSModule,
 		...options,
 	};
 

src/tools.ts

@@ -324,7 +324,7 @@ export async function loadModuleInternal(pathCx : PathContext, options : Options
  * Create a cjs module
  * @internal
  */
-export function createCJSModule(refPath : AbstractPath, source : string, options : Options) : Module {
+export function defaultCreateCJSModule(refPath : AbstractPath, source : string, options : Options) : Module {
 
 	const { moduleCache, pathResolve, getResource } = options;
 
@@ -360,7 +360,7 @@ export function createCJSModule(refPath : AbstractPath, source : string, options
  */
 export async function createJSModule(source : string, moduleSourceType : boolean, filename : AbstractPath, options : Options) : Promise<ModuleExport> {
 
-	const { compiledCache, additionalBabelParserPlugins, additionalBabelPlugins, log } = options;
+	const { compiledCache, additionalBabelParserPlugins, additionalBabelPlugins, createCJSModule, log } = options;
 
 	const [depsList, transformedSource] =
 		await withCache(

src/types.ts

@@ -373,6 +373,13 @@ export type Options = {
 	loadModule?(path : AbstractPath, options : Options) : Promise<ModuleExport | undefined>,
 
 
+/**
+ * 
+ */
+	createCJSModule(refPath : AbstractPath, source : string, options : Options) : Module,
+
+
+
 /**
  * Abstact path handling
  *