diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js index 976aa8dd..fbf01903 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"); @@ -12,11 +13,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)); @@ -93,6 +96,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 864e25b1..90ecda37 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"); @@ -9,11 +10,13 @@ const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer"); const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin"); -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)); @@ -90,6 +93,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 c9396d31..d5ac6f6a 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"); @@ -9,11 +10,13 @@ const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer"); const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin"); -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)); @@ -90,6 +93,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" :