Merge pull request #936 from NativeScript/tachev/preview-ios-inspector

fix: do not add inspector_modules entry when core modules are an external module

Author: Dimitar Tachev

templates/webpack.angular.js

@@ -60,7 +60,8 @@ module.exports = env => {
  const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
  const entryPath = `.${sep}${entryModule}`;
  const entries = { bundle: entryPath };
- if (platform === "ios") {
+ const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+ if (platform === "ios" && !areCoreModulesExternal) {
  entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
  };
 

templates/webpack.config.spec.ts

@@ -115,6 +115,20 @@ describe('webpack.config.js', () => {
  expect(isCalled).toBe(true, 'Webpack.config.js must use the getConvertedExternals method');
  });
 
+ if (platform === "ios") {
+ it('has inspector_modules entry when tns-core-modules are not externals', () => {
+ const input = getInput({ platform, externals: ['nativescript-vue'] });
+ const config = webpackConfig(input);
+ expect(config.entry["tns_modules/tns-core-modules/inspector_modules"]).toEqual("inspector_modules");
+ });
+
+ it('does not have inspector_modules entry when tns-core-modules are externals', () => {
+ const input = getInput({ platform, externals: ['tns-core-modules'] });
+ const config = webpackConfig(input);
+ expect(config.entry["tns_modules/tns-core-modules/inspector_modules"]).toBeUndefined();
+ });
+ }
+
  [
  {
  input: ['nativescript-vue'],
@@ -343,4 +357,4 @@ describe('webpack.config.js', () => {
  });
  });
  });
-});
+});

templates/webpack.javascript.js

@@ -54,7 +54,8 @@ module.exports = env => {
  const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
  const entryPath = `.${sep}${entryModule}.js`;
  const entries = { bundle: entryPath };
- if (platform === "ios") {
+ const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+ if (platform === "ios" && !areCoreModulesExternal) {
  entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
  };
 

templates/webpack.typescript.js

@@ -58,7 +58,8 @@ module.exports = env => {
 
  const tsConfigPath = resolve(projectRoot, "tsconfig.tns.json");
 
- if (platform === "ios") {
+ const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+ if (platform === "ios" && !areCoreModulesExternal) {
  entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
  };
 

templates/webpack.vue.js

@@ -61,7 +61,8 @@ module.exports = env => {
  const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
  const entryPath = `.${sep}${entryModule}`;
  const entries = { bundle: entryPath };
- if (platform === "ios") {
+ const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+ if (platform === "ios" && !areCoreModulesExternal) {
  entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
  };
  console.log(`Bundling application for entryPath ${entryPath}...`);