From 9cf33e474a3d9895171f8dfd16877d9a46d07e5d Mon Sep 17 00:00:00 2001 From: Jose Berardo Cunha Date: Sat, 2 Sep 2017 21:55:56 +1000 Subject: [PATCH] Add support for platform specific mainSheet --- templates/webpack.angular.js | 11 ++++++++++- templates/webpack.javascript.js | 11 ++++++++++- templates/webpack.typescript.js | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js index f27904a0..2baf7961 100644 --- a/templates/webpack.angular.js +++ b/templates/webpack.angular.js @@ -1,4 +1,5 @@ const { resolve, join } = require("path"); +const fs = require('fs'); const webpack = require("webpack"); const nsWebpack = require("nativescript-dev-webpack"); @@ -11,11 +12,13 @@ const { AotPlugin } = require("@ngtools/webpack"); const ngToolsWebpackOptions = { tsConfigPath: "tsconfig.aot.json" }; -const mainSheet = `app.css`; +let mainSheet = ''; module.exports = env => { const platform = getPlatform(env); + mainSheet = getMainSheet(platform); + // Default destination inside platforms//... const path = resolve(nsWebpack.getAppPath(platform)); @@ -83,6 +86,12 @@ module.exports = env => { }; +function getMainSheet(platform) { + const mainSheet = `app.${platform}.css`; + return fs.existsSync(join(__dirname, 'app', mainSheet)) ? + mainSheet : 'app.css'; +} + function getPlatform(env) { return env.android ? "android" : env.ios ? "ios" : diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js index 2d934356..1b31d3fa 100644 --- a/templates/webpack.javascript.js +++ b/templates/webpack.javascript.js @@ -1,4 +1,5 @@ const { resolve, join } = require("path"); +const fs = require('fs'); const webpack = require("webpack"); const nsWebpack = require("nativescript-dev-webpack"); @@ -8,11 +9,13 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin"); const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer"); -const mainSheet = `app.css`; +let mainSheet = ''; module.exports = env => { const platform = getPlatform(env); + mainSheet = getMainSheet(platform); + // Default destination inside platforms//... const path = resolve(nsWebpack.getAppPath(platform)); @@ -80,6 +83,12 @@ module.exports = env => { }; +function getMainSheet(platform) { + const mainSheet = `app.${platform}.css`; + return fs.existsSync(join(__dirname, 'app', mainSheet)) ? + mainSheet : 'app.css'; +} + function getPlatform(env) { return env.android ? "android" : env.ios ? "ios" : diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js index 9d182107..6bdcc2a9 100644 --- a/templates/webpack.typescript.js +++ b/templates/webpack.typescript.js @@ -1,4 +1,5 @@ const { resolve, join } = require("path"); +const fs = require('fs'); const webpack = require("webpack"); const nsWebpack = require("nativescript-dev-webpack"); @@ -8,11 +9,13 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin"); const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer"); -const mainSheet = `app.css`; +let mainSheet = ''; module.exports = env => { const platform = getPlatform(env); + mainSheet = getMainSheet(platform); + // Default destination inside platforms//... const path = resolve(nsWebpack.getAppPath(platform)); @@ -80,6 +83,12 @@ module.exports = env => { }; +function getMainSheet(platform) { + const mainSheet = `app.${platform}.css`; + return fs.existsSync(join(__dirname, 'app', mainSheet)) ? + mainSheet : 'app.css'; +} + function getPlatform(env) { return env.android ? "android" : env.ios ? "ios" :