Comparing version 0.1.7 to 0.1.8
@@ -267,2 +267,39 @@ "use strict"; | ||
}; | ||
var createCssPreprocessorRules = function (dev, platform) { | ||
var createRule; | ||
if (platform.hasAny('server')) { | ||
createRule = function (prep, ext) { return ({ | ||
test: new RegExp("." + ext + "$"), | ||
use: dev ? [ | ||
{ loader: 'isomorphic-style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } }, | ||
{ loader: prep + "-loader", options: { sourceMap: true } } | ||
] : | ||
[{ loader: 'ignore-loader' }], | ||
}); }; | ||
} | ||
else if (platform.hasAny('web')) { | ||
createRule = function (prep, ext) { return ({ | ||
test: new RegExp("." + ext + "$"), | ||
use: dev ? [ | ||
{ loader: 'style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true, importLoaders: 1 } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } }, | ||
{ loader: prep + "-loader", options: { sourceMap: true } }, | ||
] : ExtractTextPlugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader', prep + "-loader"], | ||
}), | ||
}); }; | ||
} | ||
var rules = []; | ||
if (createRule && platform.hasAny('sass')) { | ||
rules.push(createRule('sass', 'scss')); | ||
} | ||
if (createRule && platform.hasAny('less')) { | ||
rules.push(createRule('less', 'less')); | ||
} | ||
return rules; | ||
}; | ||
var createConfig = function (node, nodes, dev, opts, depPlatforms) { | ||
@@ -288,11 +325,2 @@ var platform = node.platform; | ||
} | ||
var cssPrep, cssPrepExt; | ||
if (platform.hasAny('sass')) { | ||
cssPrep = 'sass'; | ||
cssPrepExt = 'scss'; | ||
} | ||
else if (platform.hasAny('less')) { | ||
cssPrep = 'less'; | ||
cssPrepExt = 'less'; | ||
} | ||
var plugins = createPlugins(node, nodes, dev, options); | ||
@@ -329,14 +357,2 @@ if (platform.hasAny('server')) { | ||
}, plugins: plugins }); | ||
if (cssPrep) { | ||
config.module.rules = config.module.rules.concat([{ | ||
test: new RegExp("." + cssPrepExt + "$"), | ||
use: dev ? [ | ||
{ loader: 'isomorphic-style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } }, | ||
{ loader: cssPrep + "-loader", options: { sourceMap: true } } | ||
] : | ||
[{ loader: 'ignore-loader' }], | ||
}]); | ||
} | ||
} | ||
@@ -362,16 +378,2 @@ else if (platform.hasAny('web')) { | ||
} }) }); | ||
if (cssPrep) { | ||
config.module.rules = config.module.rules.concat([{ | ||
test: new RegExp("." + cssPrepExt + "$"), | ||
use: dev ? [ | ||
{ loader: 'style-loader' }, | ||
{ loader: 'css-loader', options: { sourceMap: true, importLoaders: 1 } }, | ||
{ loader: 'postcss-loader', options: { sourceMap: true } }, | ||
{ loader: cssPrep + "-loader", options: { sourceMap: true } }, | ||
] : ExtractTextPlugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader', cssPrep + "-loader"], | ||
}), | ||
}]); | ||
} | ||
} | ||
@@ -402,2 +404,3 @@ else if (platform.hasAny(['android', 'ios'])) { | ||
} | ||
config.module.rules = config.module.rules.concat(createCssPreprocessorRules(dev, platform)); | ||
if (platform.hasAny('dll')) { | ||
@@ -404,0 +407,0 @@ var name = "vendor_" + node.parentName; |
{ | ||
"name": "spinjs", | ||
"version": "0.1.7", | ||
"version": "0.1.8", | ||
"scripts": { | ||
@@ -5,0 +5,0 @@ "compile": "tsc", |
@@ -276,2 +276,43 @@ import * as path from 'path'; | ||
const createCssPreprocessorRules = (dev, platform): Array<Object> => { | ||
let createRule; | ||
if (platform.hasAny('server')) { | ||
createRule = (prep, ext) => ({ | ||
test: new RegExp(`\.${ext}$`), | ||
use: dev ? [ | ||
{loader: 'isomorphic-style-loader'}, | ||
{loader: 'css-loader', options: {sourceMap: true}}, | ||
{loader: 'postcss-loader', options: {sourceMap: true}}, | ||
{loader: `${prep}-loader`, options: {sourceMap: true}}] : | ||
[{loader: 'ignore-loader'}], | ||
}); | ||
} else if (platform.hasAny('web')) { | ||
createRule = (prep, ext) => ({ | ||
test: new RegExp(`\.${ext}$`), | ||
use: dev ? [ | ||
{loader: 'style-loader'}, | ||
{loader: 'css-loader', options: {sourceMap: true, importLoaders: 1}}, | ||
{loader: 'postcss-loader', options: {sourceMap: true}}, | ||
{loader: `${prep}-loader`, options: {sourceMap: true}}, | ||
] : ExtractTextPlugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader', `${prep}-loader`], | ||
}), | ||
}); | ||
} | ||
const rules = []; | ||
if (createRule && platform.hasAny('sass')) { | ||
rules.push(createRule('sass', 'scss')); | ||
} | ||
if (createRule && platform.hasAny('less')) { | ||
rules.push(createRule('less', 'less')); | ||
} | ||
return rules; | ||
}; | ||
const createConfig = (node, nodes, dev, opts, depPlatforms?) => { | ||
@@ -303,11 +344,2 @@ const platform = node.platform; | ||
let cssPrep, cssPrepExt; | ||
if (platform.hasAny('sass')) { | ||
cssPrep = 'sass'; | ||
cssPrepExt = 'scss'; | ||
} else if (platform.hasAny('less')) { | ||
cssPrep = 'less'; | ||
cssPrepExt = 'less'; | ||
} | ||
const plugins = createPlugins(node, nodes, dev, options); | ||
@@ -351,13 +383,2 @@ if (platform.hasAny('server')) { | ||
}; | ||
if (cssPrep) { | ||
config.module.rules = config.module.rules.concat([{ | ||
test: new RegExp(`\.${cssPrepExt}$`), | ||
use: dev ? [ | ||
{loader: 'isomorphic-style-loader'}, | ||
{loader: 'css-loader', options: {sourceMap: true}}, | ||
{loader: 'postcss-loader', options: {sourceMap: true}}, | ||
{loader: `${cssPrep}-loader`, options: {sourceMap: true}}] : | ||
[{loader: 'ignore-loader'}], | ||
}]); | ||
} | ||
} else if (platform.hasAny('web')) { | ||
@@ -393,16 +414,2 @@ const backendUrl = options.backendUrl.replace('{ip}', ip.address()); | ||
}; | ||
if (cssPrep) { | ||
config.module.rules = config.module.rules.concat([{ | ||
test: new RegExp(`\.${cssPrepExt}$`), | ||
use: dev ? [ | ||
{loader: 'style-loader'}, | ||
{loader: 'css-loader', options: {sourceMap: true, importLoaders: 1}}, | ||
{loader: 'postcss-loader', options: {sourceMap: true}}, | ||
{loader: `${cssPrep}-loader`, options: {sourceMap: true}}, | ||
] : ExtractTextPlugin.extract({ | ||
fallback: 'style-loader', | ||
use: ['css-loader', 'postcss-loader', `${cssPrep}-loader`], | ||
}), | ||
}]); | ||
} | ||
} else if (platform.hasAny(['android', 'ios'])) { | ||
@@ -441,2 +448,3 @@ const AssetResolver = requireModule('haul/src/resolvers/AssetResolver'); | ||
} | ||
config.module.rules = config.module.rules.concat(createCssPreprocessorRules(dev, platform)); | ||
@@ -443,0 +451,0 @@ if (platform.hasAny('dll')) { |
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
205854
3291