From debd88b664e3703294b2df4ecabf1767b0f03b7a Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 17 Feb 2017 15:48:36 -0600 Subject: [PATCH] fix(source-maps): source map must correspond to .js file name with a .map at the end --- README.md | 4 ---- config/uglifyjs.config.js | 4 ++-- src/util/config.spec.ts | 2 -- src/util/config.ts | 8 -------- src/util/constants.ts | 2 -- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 52cf9484..65245c05 100644 --- a/README.md +++ b/README.md @@ -125,9 +125,7 @@ npm run build --rollup ./config/rollup.config.js | app ng module class | `ionic_app_ng_module_class` | `--appNgModuleClass` | `AppModule` | Exported class name for app's primary `NgModule` | | clean before copy | `ionic_clean_before_copy` | `--cleanBeforeCopy` | `false` | clean out existing files before copy task runs | | output js file | `ionic_output_js_file_name` | `--outputJsFileName` | `main.js` | name of js file generated in `buildDir` | -| output js map file | `ionic_output_js_map_file_name` | `--outputJsMapFileName` | `main.js.map` | name of js source map file generated in `buildDir` | | output css file | `ionic_output_css_file_name` | `--outputCssFileName` | `main.css` | name of css file generated in `buildDir` | -| output css map file | `ionic_output_css_map_file_name` | `--outputCssMapFileName` | `main.css.map` | name of css source map file generated in `buildDir` | | bail on lint error | `ionic_bail_on_lint_error` | `--bailOnLintError` | `null` | Set to `true` to make stand-alone lint commands fail with non-zero status code | | write AoT files to disk | `ionic_aot_write_to_disk` | `--aotWriteToDisk` | `null` | Set to `true` to write files to disk for debugging | | print dependency tree | `ionic_print_original_dependency_tree` | `--printOriginalDependencyTree` | `null` | Set to `true` to print out the original dependency tree calculated during the optimize step | @@ -169,9 +167,7 @@ These environment variables are automatically set to [Node's `process.env`](http | `IONIC_CLEAN_BEFORE_COPY` | Attempt to clean existing directories before copying files. | | `IONIC_CLOSURE_JAR` | The absolute path ot the closure compiler jar file | | `IONIC_OUTPUT_JS_FILE_NAME` | The file name of the generated javascript file | -| `IONIC_OUTPUT_JS_MAP_FILE_NAME` | The file name of the generated javascript source map file | | `IONIC_OUTPUT_CSS_FILE_NAME` | The file name of the generated css file | -| `IONIC_OUTPUT_CSS_MAP_FILE_NAME` | The file name of the generated css source map file | | `IONIC_WEBPACK_FACTORY` | The absolute path to Ionic's `webpack-factory` script | | `IONIC_WEBPACK_LOADER` | The absolute path to Ionic's custom webpack loader | | `IONIC_BAIL_ON_LINT_ERROR` | Boolean determining whether to exit with a non-zero status code on error | diff --git a/config/uglifyjs.config.js b/config/uglifyjs.config.js index 96bf035f..d4d0cd9d 100644 --- a/config/uglifyjs.config.js +++ b/config/uglifyjs.config.js @@ -16,12 +16,12 @@ module.exports = { /** * inSourceMap: file name for the input source map */ - inSourceMap: process.env.IONIC_OUTPUT_JS_MAP_FILE_NAME, + inSourceMap: process.env.IONIC_OUTPUT_JS_FILE_NAME + '.map', /** * outSourceMap: file name for the output source map */ - outSourceMap: process.env.IONIC_OUTPUT_JS_MAP_FILE_NAME, + outSourceMap: process.env.IONIC_OUTPUT_JS_FILE_NAME + '.map', /** * mangle: uglify 2's mangle option diff --git a/src/util/config.spec.ts b/src/util/config.spec.ts index bdac7750..d6ee6f1e 100644 --- a/src/util/config.spec.ts +++ b/src/util/config.spec.ts @@ -90,9 +90,7 @@ describe('config', () => { expect(fakeConfig[Constants.ENV_CLEAN_BEFORE_COPY]).toBeFalsy(); expect(fakeConfig[Constants.ENV_CLOSURE_JAR]).toEqual(join(fakeConfig[Constants.ENV_VAR_APP_SCRIPTS_DIR], 'bin', 'closure-compiler.jar')); expect(fakeConfig[Constants.ENV_OUTPUT_JS_FILE_NAME]).toEqual('main.js'); - expect(fakeConfig[Constants.ENV_OUTPUT_JS_MAP_FILE_NAME]).toEqual('main.js.map'); expect(fakeConfig[Constants.ENV_OUTPUT_CSS_FILE_NAME]).toEqual('main.css'); - expect(fakeConfig[Constants.ENV_OUTPUT_CSS_MAP_FILE_NAME]).toEqual('main.css.map'); expect(fakeConfig[Constants.ENV_WEBPACK_FACTORY]).toEqual(join(fakeConfig[Constants.ENV_VAR_APP_SCRIPTS_DIR], 'dist', 'webpack', 'ionic-webpack-factory.js')); expect(fakeConfig[Constants.ENV_WEBPACK_LOADER]).toEqual(join(fakeConfig[Constants.ENV_VAR_APP_SCRIPTS_DIR], 'dist', 'webpack', 'loader.js')); expect(fakeConfig[Constants.ENV_OPTIMIZATION_LOADER]).toEqual(join(fakeConfig[Constants.ENV_VAR_APP_SCRIPTS_DIR], 'dist', 'webpack', 'optimization-loader.js')); diff --git a/src/util/config.ts b/src/util/config.ts index e71fe409..e38d2cff 100644 --- a/src/util/config.ts +++ b/src/util/config.ts @@ -151,18 +151,10 @@ export function generateContext(context?: BuildContext): BuildContext { setProcessEnvVar(Constants.ENV_OUTPUT_JS_FILE_NAME, outputJsFileName); Logger.debug(`outputJsFileName set to ${outputJsFileName}`); - const outputJsMapFileName = getConfigValue(context, '--outputJsMapFileName', null, Constants.ENV_OUTPUT_JS_MAP_FILE_NAME, Constants.ENV_OUTPUT_JS_MAP_FILE_NAME.toLowerCase(), 'main.js.map'); - setProcessEnvVar(Constants.ENV_OUTPUT_JS_MAP_FILE_NAME, outputJsMapFileName); - Logger.debug(`outputJsMapFileName set to ${outputJsMapFileName}`); - const outputCssFileName = getConfigValue(context, '--outputCssFileName', null, Constants.ENV_OUTPUT_CSS_FILE_NAME, Constants.ENV_OUTPUT_CSS_FILE_NAME.toLowerCase(), 'main.css'); setProcessEnvVar(Constants.ENV_OUTPUT_CSS_FILE_NAME, outputCssFileName); Logger.debug(`outputCssFileName set to ${outputCssFileName}`); - const outputCssMapFileName = getConfigValue(context, '--outputCssMapFileName', null, Constants.ENV_OUTPUT_CSS_MAP_FILE_NAME, Constants.ENV_OUTPUT_CSS_MAP_FILE_NAME.toLowerCase(), 'main.css.map'); - setProcessEnvVar(Constants.ENV_OUTPUT_CSS_MAP_FILE_NAME, outputCssMapFileName); - Logger.debug(`outputCssMapFileName set to ${outputCssMapFileName}`); - const webpackFactoryPath = join(getProcessEnvVar(Constants.ENV_VAR_APP_SCRIPTS_DIR), 'dist', 'webpack', 'ionic-webpack-factory.js'); setProcessEnvVar(Constants.ENV_WEBPACK_FACTORY, webpackFactoryPath); Logger.debug(`webpackFactoryPath set to ${webpackFactoryPath}`); diff --git a/src/util/constants.ts b/src/util/constants.ts index 2d84a132..83fa9822 100644 --- a/src/util/constants.ts +++ b/src/util/constants.ts @@ -41,9 +41,7 @@ export const ENV_CLOSURE_JAR = 'IONIC_CLOSURE_JAR'; export const ENV_READ_CONFIG_JSON = 'IONIC_READ_CONFIG_JSON'; export const ENV_OUTPUT_JS_FILE_NAME = 'IONIC_OUTPUT_JS_FILE_NAME'; -export const ENV_OUTPUT_JS_MAP_FILE_NAME = 'IONIC_OUTPUT_JS_MAP_FILE_NAME'; export const ENV_OUTPUT_CSS_FILE_NAME = 'IONIC_OUTPUT_CSS_FILE_NAME'; -export const ENV_OUTPUT_CSS_MAP_FILE_NAME = 'IONIC_OUTPUT_CSS_MAP_FILE_NAME'; export const ENV_WEBPACK_FACTORY = 'IONIC_WEBPACK_FACTORY'; export const ENV_WEBPACK_LOADER = 'IONIC_WEBPACK_LOADER'; export const ENV_OPTIMIZATION_LOADER = 'IONIC_OPTIMIZATION_LOADER';