fix: only include the relevant node_modules directory for different build types

Author: edeustace

src/apps/catalog/index.ts

@@ -121,7 +121,8 @@ export default class CatalogApp
 
     const config = _.merge(
       webpackConfig(
-        dirs,
+        [dirs.root, dirs.configure, dirs.controllers],
+        dirs.root,
         this.support,
         CatalogApp.ENTRY,
         CatalogApp.BUNDLE,

src/apps/common.ts

@@ -1,9 +1,7 @@
 import * as _ from 'lodash';
 import * as webpack from 'webpack';
 
-import { join, resolve } from "path";
-
-import { Dirs } from '@pie-cli-libs/installer';
+import { join, resolve } from 'path';
 
 import { SupportConfig } from '../framework-support/index';
 import baseConfig from '../question/build/base-config';
@@ -15,7 +13,6 @@ const logger = buildLogger();
 export type Compiler = webpack.compiler.Compiler;
 
 export class Tag {
-
   constructor(readonly name: string, readonly path?: string) {
     this.path = this.path || `./${this.name}.js`;
   }
@@ -26,30 +23,35 @@ export class Tag {
 }
 
 export function removeFiles(dir, files: string[]): Promise<string[]> {
-  const p: Promise<string>[] = _.map(files, (f) => new Promise((res, reject) => {
-    remove(join(dir, f), (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        res(f);
-      }
-    });
-  }));
+  const p: Promise<string>[] = _.map(
+    files,
+    f =>
+      new Promise((res, reject) => {
+        remove(join(dir, f), err => {
+          if (err) {
+            reject(err);
+          } else {
+            res(f);
+          }
+        });
+      })
+  );
   return Promise.all(p);
 }
 
 export function webpackConfig(
-  dirs: Dirs,
+  resolveModules: string[],
+  root: string,
   support: SupportConfig,
   entry: string,
   bundle: string,
   outpath?: string,
-  sourceMaps: boolean = false) {
-
-  outpath = outpath || dirs.root;
+  sourceMaps: boolean = false
+) {
+  outpath = outpath || root;
   const modules = (d: string) => resolve(join(d, 'node_modules'));
 
-  const base = baseConfig(dirs.root);
+  const base = baseConfig(root);
 
   logger.debug('support modules: ', support.modules);
 
@@ -58,18 +60,18 @@ export function webpackConfig(
     resolve(join(__dirname, '../../node_modules'))
   ].concat(_.compact(support.modules));
 
-  const resolveModules = [
-    modules(dirs.configure),
-    modules(dirs.controllers),
-    modules(dirs.root),
-  ].concat(coreModules);
+  // const resolveModules = [
+  //   modules(dirs.configure),
+  //   modules(dirs.controllers),
+  //   modules(dirs.root),
+  // ].concat(coreModules);
 
-  const resolveLoaderModules = [
-    modules(dirs.root),
-  ].concat(coreModules);
+  resolveModules = resolveModules.concat(coreModules);
+
+  const resolveLoaderModules = [modules(root)].concat(coreModules);
 
   const out = _.extend(base, {
-    context: dirs.root,
+    context: root,
     entry: `./${entry}`,
     module: {
       rules: base.module.rules.concat(support.rules)
@@ -80,7 +82,7 @@ export function webpackConfig(
     },
     resolve: {
       extensions: _.uniq(['.js'].concat(support.extensions)),
-      modules: resolveModules,
+      modules: resolveModules
     },
     resolveLoader: {
       modules: resolveLoaderModules
@@ -94,10 +96,10 @@ export function webpackConfig(
   return out;
 }
 
-export const clientDependencies = (args: any) => args.configuration.app.dependencies;
+export const clientDependencies = (args: any) =>
+  args.configuration.app.dependencies;
 
 export class Out {
-
   public static build(args) {
     return new Out(
       args.questionItemTagName ? new Tag(args.questionItemTagName) : undefined,
@@ -113,16 +115,16 @@ export class Out {
     readonly viewElements: string = 'pie-view.js',
     readonly controllers: string = 'pie-controller.js',
     readonly example: string = 'example.html',
-    readonly archive: string = 'pie-item.tar.gz') { }
-
+    readonly archive: string = 'pie-item.tar.gz'
+  ) {}
 }
 
 /**
  * @deprecated This should be removed
  */
 export type Names = {
-  build: BuildNames,
-  out: Out
+  build: BuildNames;
+  out: Out;
 };
 
 type BuildNames = {

src/apps/default/index.ts

@@ -147,7 +147,8 @@ export default class DefaultApp
     writeFile(join(dirs.root, DefaultApp.CONFIGURE_ENTRY), js);
 
     const config = webpackConfig(
-      dirs,
+      [dirs.configure, dirs.root],
+      dirs.root,
       this.support,
       DefaultApp.CONFIGURE_ENTRY,
       DefaultApp.CONFIGURE_BUNDLE,
@@ -176,7 +177,8 @@ export default class DefaultApp
 
     writeFile(join(dirs.root, 'client.entry.js'), js);
     const config = webpackConfig(
-      dirs,
+      [dirs.root],
+      dirs.root,
       this.support,
       'client.entry.js',
       'pie-view.js',
@@ -198,7 +200,8 @@ export default class DefaultApp
     const js = generators.controllers(controllers);
     writeFile(join(dirs.root, 'controllers.entry.js'), js);
     const config = webpackConfig(
-      dirs,
+      [dirs.controllers, dirs.root],
+      dirs.root,
       this.support,
       'controllers.entry.js',
       'pie-controllers.js',
@@ -240,7 +243,8 @@ export default class DefaultApp
 
     writeFile(join(dirs.root, 'all-in-one.entry.js'), js);
     const config = webpackConfig(
-      dirs,
+      [dirs.root, dirs.configure, dirs.controllers],
+      dirs.root,
       this.support,
       'all-in-one.entry.js',
       'pie-item.js',

src/apps/info/index.ts

@@ -22,22 +22,26 @@ const logger = buildLogger();
 const templatePath = join(__dirname, 'views/index.pug');
 
 export default class InfoApp implements App, Servable {
-
   public static generatedFiles: string[] = [];
 
-  public static build(args: any, loadSupport: (JsonConfig) => Promise<SupportConfig>): Promise<App> {
-
+  public static build(
+    args: any,
+    loadSupport: (JsonConfig) => Promise<SupportConfig>
+  ): Promise<App> {
     const dir = resolve(args.dir || process.cwd());
 
     if (!existsSync(join(dir, 'docs/demo'))) {
-      throw new Error(`Can't find a 'docs/demo' directory in path: ${dir}. Is this a pie directory?`);
+      throw new Error(
+        `Can't find a 'docs/demo' directory in path: ${dir}. Is this a pie directory?`
+      );
     }
 
     const config = JsonConfig.build(join(dir, 'docs/demo'), args);
     const session = Session.build(join(dir, 'docs/demo'), args);
 
-    return loadSupport(config)
-      .then(support => new InfoApp(dir, config, support, session));
+    return loadSupport(config).then(
+      support => new InfoApp(dir, config, support, session)
+    );
   }
 
   private static BUNDLE = 'info.bundle.js';
@@ -46,11 +50,12 @@ export default class InfoApp implements App, Servable {
   private template: any;
   private installer: Install;
 
-  constructor(private pieRoot: string,
+  constructor(
+    private pieRoot: string,
     readonly config: JsonConfig,
     private support: SupportConfig,
-    readonly session: Session) {
-
+    readonly session: Session
+  ) {
     this.template = pug.compileFile(templatePath);
 
     this.installer = new Install(config.dir, config.raw);
@@ -62,7 +67,7 @@ export default class InfoApp implements App, Servable {
   public watchableFiles(): string[] {
     return [
       resolve(join(this.pieRoot, 'README.md')),
-      resolve(join(this.pieRoot, 'package.json')),
+      resolve(join(this.pieRoot, 'package.json'))
     ];
   }
 
@@ -74,35 +79,42 @@ export default class InfoApp implements App, Servable {
 
     await writeEntryJs(join(dirs.root, InfoApp.ENTRY), js);
 
-    const config = webpackConfig(dirs, this.support, InfoApp.ENTRY, InfoApp.BUNDLE, null, opts.sourceMaps);
+    const resolveModules = [dirs.root, dirs.configure, dirs.controllers];
+    const config = webpackConfig(
+      resolveModules,
+      dirs.root,
+      this.support,
+      InfoApp.ENTRY,
+      InfoApp.BUNDLE,
+      null,
+      opts.sourceMaps
+    );
 
     const cssRule = config.module.rules.find(u => {
       const match = u.test.source === '\\.css$';
       return match;
     });
 
-    cssRule.exclude = [
-      /.*highlight\.js.*/,
-    ];
+    cssRule.exclude = [/.*highlight\.js.*/];
 
     // load in raw css for markdown element
-    config.module.rules = [{
-      test: /.*highlight\.js.*default\.css$/,
-      use: [
-        'raw-loader',
-      ],
-    },
-    {
-      test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2|otf)$/,
-      use: [
-        {
-          loader: 'url-loader',
-          options: {
-            limit: 10000
+    config.module.rules = [
+      {
+        test: /.*highlight\.js.*default\.css$/,
+        use: ['raw-loader']
+      },
+      {
+        test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2|otf)$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000
+            }
           }
-        }
-      ]
-    }].concat(config.module.rules);
+        ]
+      }
+    ].concat(config.module.rules);
 
     writeConfig(join(dirs.root, 'info.webpack.config.js'), config);
 
@@ -115,7 +127,7 @@ export default class InfoApp implements App, Servable {
 
     linkCompilerToServer('main', compiler, server);
 
-    const reload = (name) => {
+    const reload = name => {
       logger.info('File Changed: ', name);
       this.config.reload();
       this.session.reload();
@@ -126,12 +138,11 @@ export default class InfoApp implements App, Servable {
       dirs,
       pkgs,
       reload,
-      server: server.httpServer,
+      server: server.httpServer
     };
   }
 
   private router(compiler: webpack.Compiler): express.Router {
-
     const router = express.Router();
 
     const middleware = webpackMiddleware(compiler, {
@@ -147,12 +158,10 @@ export default class InfoApp implements App, Servable {
     router.use(middleware);
 
     router.get('/', (req, res) => {
-
       const pkg = readJsonSync(join(this.pieRoot, 'package.json'));
       const readme = readFileSync(join(this.pieRoot, 'README.md'), 'utf8');
 
       const page = this.template({
-
         demo: {
           config: {
             langs: this.config.langs,
@@ -174,7 +183,7 @@ export default class InfoApp implements App, Servable {
           `/${InfoApp.BUNDLE}`
         ]),
         orgRepo: {
-          repo: pkg.name,
+          repo: pkg.name
         }
       });