Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ const VirtualModules = require('./lib/virtual');

const hotApi = require.resolve('./lib/hot-api.js');

const { version } = require('svelte/package.json');
const major_version = +version[0];
const { compile, preprocess } = major_version >= 3
? require('svelte/compiler')
: require('svelte');
const {
major_version,
compile,
preprocess,
} = require('./lib/resolve-svelte');

const pluginOptions = {
externalDependencies: true,
Expand Down Expand Up @@ -106,7 +106,7 @@ module.exports = function(source, map) {
const virtualModules = virtualModuleInstances.get(this._compiler);

this.cacheable();

const options = Object.assign({}, getOptions(this));
const callback = this.async();

Expand Down
37 changes: 37 additions & 0 deletions lib/resolve-svelte.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
const path = require('path');

// Svelte location can be overriden by env variable. This can be needed
// to use some external tools targetting a whole app, during development
// of svelte-loader.

const resolveSvelte = () => {
const { SVELTE } = process.env;
if (SVELTE) {
const ensureAbsolute = name =>
path.isAbsolute(name) ? name : path.resolve(process.cwd(), name);
return {
req: require,
svelte: ensureAbsolute(SVELTE),
};
} else {
return {
req: require.main.require.bind(require.main),
svelte: 'svelte',
};
}
};

const { req, svelte } = resolveSvelte();

const { version } = req(`${svelte}/package.json`);

const major_version = +version[0];

const { compile, preprocess } =
major_version >= 3 ? req(`${svelte}/compiler`) : req(svelte);

module.exports = {
major_version,
compile,
preprocess,
};