Comparing version 0.4.13 to 0.4.14
@@ -41,3 +41,3 @@ "use strict"; | ||
test: /\.graphqls/, | ||
use: 'raw-loader' | ||
use: requireModule_1.default.resolve('raw-loader') | ||
}, | ||
@@ -47,3 +47,3 @@ { | ||
exclude: /node_modules/, | ||
use: ['graphql-tag/loader'].concat(persistGraphQL ? ['persistgraphql-webpack-plugin/graphql-loader'] : []) | ||
use: [requireModule_1.default.resolve('graphql-tag/loader')].concat(persistGraphQL ? [requireModule_1.default.resolve('persistgraphql-webpack-plugin/graphql-loader')] : []) | ||
} | ||
@@ -57,3 +57,3 @@ ] | ||
var jsRule = jsRuleFinder.rule; | ||
jsRule.use = spin.merge(jsRule.use, persistGraphQL ? ['persistgraphql-webpack-plugin/js-loader'] : []); | ||
jsRule.use = spin.merge(jsRule.use, persistGraphQL ? [requireModule_1.default.resolve('persistgraphql-webpack-plugin/js-loader')] : []); | ||
builder.config = spin.merge(builder.config, { | ||
@@ -60,0 +60,0 @@ plugins: [new webpack.DefinePlugin({ __PERSIST_GQL__: persistGraphQL })].concat(builder.stack.hasAny('dll') |
@@ -13,2 +13,3 @@ "use strict"; | ||
var rules = []; | ||
var postCssLoader_1 = requireModule_1.default.probe('postcss-loader'); | ||
if (stack.hasAny('server')) { | ||
@@ -19,7 +20,8 @@ createRule = function (ext, ruleList) { return ({ | ||
? [ | ||
{ loader: 'isomorphic-style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } } | ||
].concat(ruleList) | ||
: [{ loader: 'ignore-loader' }] | ||
{ loader: requireModule_1.default.resolve('isomorphic-style-loader') }, | ||
{ loader: requireModule_1.default.resolve('css-loader'), options: { sourceMap: true } } | ||
] | ||
.concat(postCssLoader_1 ? { loader: postCssLoader_1, options: { sourceMap: true } } : []) | ||
.concat(ruleList) | ||
: [{ loader: requireModule_1.default.resolve('ignore-loader') }] | ||
}); }; | ||
@@ -42,9 +44,10 @@ } | ||
? [ | ||
{ loader: 'style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true, importLoaders: 1 } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } } | ||
].concat(ruleList) | ||
{ loader: requireModule_1.default.resolve('style-loader') }, | ||
{ loader: requireModule_1.default.resolve('css-loader'), options: { sourceMap: true, importLoaders: 1 } } | ||
] | ||
.concat(postCssLoader_1 ? { loader: postCssLoader_1, options: { sourceMap: true } } : []) | ||
.concat(ruleList) | ||
: plugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader'].concat(ruleList ? ruleList.map(function (rule) { return rule.loader; }) : []) | ||
fallback: requireModule_1.default.resolve('style-loader'), | ||
use: [requireModule_1.default.resolve('css-loader'), requireModule_1.default.resolve('postcss-loader')].concat(ruleList ? ruleList.map(function (rule) { return rule.loader; }) : []) | ||
}) | ||
@@ -58,6 +61,6 @@ }; | ||
if (createRule && stack.hasAny('sass')) { | ||
rules.push(createRule('scss', [{ loader: "sass-loader", options: { sourceMap: true } }])); | ||
rules.push(createRule('scss', [{ loader: requireModule_1.default.resolve("sass-loader"), options: { sourceMap: true } }])); | ||
} | ||
if (createRule && stack.hasAny('less')) { | ||
rules.push(createRule('less', [{ loader: "less-loader", options: { sourceMap: true } }])); | ||
rules.push(createRule('less', [{ loader: requireModule_1.default.resolve("less-loader"), options: { sourceMap: true } }])); | ||
} | ||
@@ -64,0 +67,0 @@ builder.config = spin.merge(builder.config, { |
@@ -36,3 +36,3 @@ "use strict"; | ||
test: /\.html$/, | ||
loader: 'html-loader' | ||
loader: requireModule_1.default.resolve('html-loader') | ||
} | ||
@@ -39,0 +39,0 @@ ] |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
var requireModule_1 = require("../requireModule"); | ||
var WebAssetsPlugin = (function () { | ||
@@ -15,3 +16,3 @@ function WebAssetsPlugin() { | ||
use: { | ||
loader: 'url-loader', | ||
loader: requireModule_1.default.resolve('url-loader'), | ||
options: { | ||
@@ -26,3 +27,3 @@ name: '[hash].[ext]', | ||
use: { | ||
loader: 'url-loader', | ||
loader: requireModule_1.default.resolve('url-loader'), | ||
options: { | ||
@@ -37,3 +38,3 @@ name: './assets/[hash].[ext]', | ||
use: { | ||
loader: 'file-loader', | ||
loader: requireModule_1.default.resolve('file-loader'), | ||
options: { | ||
@@ -49,2 +50,3 @@ name: './assets/[hash].[ext]' | ||
else if (stack.hasAll(['webpack', 'server']) && !spin.options.ssr) { | ||
var ignoreLoader = requireModule_1.default.resolve('ignore-loader'); | ||
builder.config = spin.merge(builder.config, { | ||
@@ -56,3 +58,3 @@ module: { | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -63,3 +65,3 @@ }, | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -70,3 +72,3 @@ }, | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -73,0 +75,0 @@ } |
@@ -12,3 +12,11 @@ "use strict"; | ||
}; | ||
requireModule.probe = function (name) { | ||
try { | ||
return requireModule.resolve(name); | ||
} | ||
catch (e) { | ||
return false; | ||
} | ||
}; | ||
exports.default = requireModule; | ||
//# sourceMappingURL=requireModule.js.map |
{ | ||
"name": "spinjs", | ||
"version": "0.4.13", | ||
"version": "0.4.14", | ||
"scripts": { | ||
@@ -5,0 +5,0 @@ "clean": "rm -rf ./lib", |
@@ -44,3 +44,3 @@ import * as path from 'path'; | ||
test: /\.graphqls/, | ||
use: 'raw-loader' | ||
use: requireModule.resolve('raw-loader') | ||
}, | ||
@@ -50,3 +50,5 @@ { | ||
exclude: /node_modules/, | ||
use: ['graphql-tag/loader'].concat(persistGraphQL ? ['persistgraphql-webpack-plugin/graphql-loader'] : []) | ||
use: [requireModule.resolve('graphql-tag/loader')].concat( | ||
persistGraphQL ? [requireModule.resolve('persistgraphql-webpack-plugin/graphql-loader')] : [] | ||
) | ||
} | ||
@@ -61,3 +63,6 @@ ] | ||
const jsRule = jsRuleFinder.rule; | ||
jsRule.use = spin.merge(jsRule.use, persistGraphQL ? ['persistgraphql-webpack-plugin/js-loader'] : []); | ||
jsRule.use = spin.merge( | ||
jsRule.use, | ||
persistGraphQL ? [requireModule.resolve('persistgraphql-webpack-plugin/js-loader')] : [] | ||
); | ||
@@ -64,0 +69,0 @@ builder.config = spin.merge(builder.config, { |
@@ -14,2 +14,3 @@ import { Builder } from '../Builder'; | ||
const rules = []; | ||
const postCssLoader = requireModule.probe('postcss-loader'); | ||
if (stack.hasAny('server')) { | ||
@@ -20,7 +21,8 @@ createRule = (ext, ruleList) => ({ | ||
? [ | ||
{ loader: 'isomorphic-style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } } | ||
].concat(ruleList) | ||
: [{ loader: 'ignore-loader' }] | ||
{ loader: requireModule.resolve('isomorphic-style-loader') }, | ||
{ loader: requireModule.resolve('css-loader'), options: { sourceMap: true } } | ||
] | ||
.concat(postCssLoader ? { loader: postCssLoader, options: { sourceMap: true } } : []) | ||
.concat(ruleList) | ||
: [{ loader: requireModule.resolve('ignore-loader') }] | ||
}); | ||
@@ -42,9 +44,12 @@ } else if (stack.hasAny('web')) { | ||
? [ | ||
{ loader: 'style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true, importLoaders: 1 } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } } | ||
].concat(ruleList) | ||
{ loader: requireModule.resolve('style-loader') }, | ||
{ loader: requireModule.resolve('css-loader'), options: { sourceMap: true, importLoaders: 1 } } | ||
] | ||
.concat(postCssLoader ? { loader: postCssLoader, options: { sourceMap: true } } : []) | ||
.concat(ruleList) | ||
: plugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader'].concat(ruleList ? ruleList.map(rule => rule.loader) : []) | ||
fallback: requireModule.resolve('style-loader'), | ||
use: [requireModule.resolve('css-loader'), requireModule.resolve('postcss-loader')].concat( | ||
ruleList ? ruleList.map(rule => rule.loader) : [] | ||
) | ||
}) | ||
@@ -60,7 +65,11 @@ }; | ||
if (createRule && stack.hasAny('sass')) { | ||
rules.push(createRule('scss', [{ loader: `sass-loader`, options: { sourceMap: true } }])); | ||
rules.push( | ||
createRule('scss', [{ loader: requireModule.resolve(`sass-loader`), options: { sourceMap: true } }]) | ||
); | ||
} | ||
if (createRule && stack.hasAny('less')) { | ||
rules.push(createRule('less', [{ loader: `less-loader`, options: { sourceMap: true } }])); | ||
rules.push( | ||
createRule('less', [{ loader: requireModule.resolve(`less-loader`), options: { sourceMap: true } }]) | ||
); | ||
} | ||
@@ -67,0 +76,0 @@ |
@@ -31,3 +31,3 @@ import * as fs from 'fs'; | ||
test: /\.html$/, | ||
loader: 'html-loader' | ||
loader: requireModule.resolve('html-loader') | ||
} | ||
@@ -34,0 +34,0 @@ ] |
import { Builder } from '../Builder'; | ||
import { ConfigPlugin } from '../ConfigPlugin'; | ||
import requireModule from '../requireModule'; | ||
import Spin from '../Spin'; | ||
@@ -16,3 +17,3 @@ | ||
use: { | ||
loader: 'url-loader', | ||
loader: requireModule.resolve('url-loader'), | ||
options: { | ||
@@ -27,3 +28,3 @@ name: '[hash].[ext]', | ||
use: { | ||
loader: 'url-loader', | ||
loader: requireModule.resolve('url-loader'), | ||
options: { | ||
@@ -38,3 +39,3 @@ name: './assets/[hash].[ext]', | ||
use: { | ||
loader: 'file-loader', | ||
loader: requireModule.resolve('file-loader'), | ||
options: { | ||
@@ -49,2 +50,3 @@ name: './assets/[hash].[ext]' | ||
} else if (stack.hasAll(['webpack', 'server']) && !spin.options.ssr) { | ||
const ignoreLoader = requireModule.resolve('ignore-loader'); | ||
builder.config = spin.merge(builder.config, { | ||
@@ -56,3 +58,3 @@ module: { | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -63,3 +65,3 @@ }, | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -70,3 +72,3 @@ }, | ||
use: { | ||
loader: 'ignore-loader' | ||
loader: ignoreLoader | ||
} | ||
@@ -73,0 +75,0 @@ } |
@@ -13,2 +13,10 @@ import * as path from 'path'; | ||
requireModule.probe = name => { | ||
try { | ||
return requireModule.resolve(name); | ||
} catch (e) { | ||
return false; | ||
} | ||
}; | ||
export default requireModule; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
291170
4889