From 1f58aaa5d63b244cddfda7038754fd04fb9d05b8 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 15 Feb 2017 14:29:20 -0600 Subject: [PATCH] fix(config): node_modules directory should not be configurable (users were finding it confusing) --- README.md | 1 - src/util/config.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 73d9bfba..52cf9484 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,6 @@ npm run build --rollup ./config/rollup.config.js | www directory | `ionic_www_dir` | `--wwwDir` | `www` | The deployable directory containing everything needed to run the app | | build directory | `ionic_build_dir` | `--buildDir` | `build` | The build process uses this directory to store generated files, etc | | temp directory | `ionic_tmp_dir` | `--tmpDir` | `.tmp` | Temporary directory for writing files for debugging and various build tasks | -| node_modules directory | `ionic_node_modules_dir` | `--nodeModulesDir` | `node_modules` | Node modules directory | | ionic-angular directory | `ionic_angular_dir` | `--ionicAngularDir` | `ionic-angular` | ionic-angular directory | | ionic-angular entry point | `ionic_angular_entry_point` | `--ionicAngularEntryPoint` | `index.js` | entry point file for ionic-angular | | bundler | `ionic_bundler` | `--bundler` | `webpack` | Chooses which bundler to use: `webpack` or `rollup` | diff --git a/src/util/config.ts b/src/util/config.ts index 781223c0..647697ca 100644 --- a/src/util/config.ts +++ b/src/util/config.ts @@ -83,7 +83,7 @@ export function generateContext(context?: BuildContext): BuildContext { setProcessEnvVar(Constants.ENV_VAR_BUILD_DIR, context.buildDir); Logger.debug(`buildDir set to ${context.buildDir}`); - context.nodeModulesDir = resolve(context.nodeModulesDir || getConfigValue(context, '--nodeModulesDir', null, Constants.ENV_VAR_NODE_MODULES_DIR, Constants.ENV_VAR_NODE_MODULES_DIR.toLowerCase(), join(context.rootDir, Constants.NODE_MODULES))); + context.nodeModulesDir = join(context.rootDir, Constants.NODE_MODULES); setProcessEnvVar(Constants.ENV_VAR_NODE_MODULES_DIR, context.nodeModulesDir); Logger.debug(`nodeModulesDir set to ${context.nodeModulesDir}`);