From b3dd8a66ed213bf735d8bbcf32ba5e745ebbd5d9 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 25 Jan 2016 00:43:21 +0100 Subject: [PATCH] Modified the production bundles location (fixes #91) --- CHANGELOG.MD | 34 ++++++++++++++++++---------------- package.json | 2 +- src/gulp/config.js | 23 +++++++++++++---------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 10251cf..7711f9f 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,28 +1,30 @@ +* 0.3.2 + * Fixed production bundles paths (css, js) (fixes #91) * 0.3.1 * made JSPM optional (closes #77) - * JSPM remains used by default but you can now customize the behavior by setting the useJSPM option to false - * if you disable JSPM then you can provide a custom name for the configuration file (the build defaults to jspm.conf.js) + * JSPM remains used by default but you can now customize the behavior by setting the useJSPM option to false + * if you disable JSPM then you can provide a custom name for the configuration file (the build defaults to jspm.conf.js) * fixed an issue with the tasks chaining (callbacks were used needlessly) (closes #89) * upgraded the version of SystemJS-builder (closes #87) * 0.3.0 * Breaking change: improved integration with tsconfig.json (see #72) - * this might impact existing projects - * before, the list of folders to include in TS compilation were hardcoded. Now, the tsconfig.json file is used, thus you have more control (but also more responsibility) + * this might impact existing projects + * before, the list of folders to include in TS compilation were hardcoded. Now, the tsconfig.json file is used, thus you have more control (but also more responsibility) * removed mentions of tsd. My current recommendation is to use `typings`, although there's nothing forcing you to with the build - * https://github.com/typings/typings - * https://angularclass.com/the-state-of-typescript-packages/ + * https://github.com/typings/typings + * https://angularclass.com/the-state-of-typescript-packages/ * upgraded dependencies - * Babel dependencies 6.3.x to 6.4.x - * autoprefixer 6.1.x to 6.2.x + * Babel dependencies 6.3.x to 6.4.x + * autoprefixer 6.1.x to 6.2.x * Known issues - * #76: there is an issue with the way that gulp-typescript (the plugin used within the scripts-typescript gulp task) handles the 'rootDir' property, which is inconsistent with tsc. - * to solve this, for now you need to add a reference to the main typings file of your project; Example: - ``` - /// - ``` - * the final solution might come via the following issues and might require a new release of this project - * https://github.com/ivogabe/gulp-typescript/issues/190 - * https://github.com/typings/typings/issues/69 + * #76: there is an issue with the way that gulp-typescript (the plugin used within the scripts-typescript gulp task) handles the 'rootDir' property, which is inconsistent with tsc. + * to solve this, for now you need to add a reference to the main typings file of your project; Example: + ``` + /// + ``` + * the final solution might come via the following issues and might require a new release of this project + * https://github.com/ivogabe/gulp-typescript/issues/190 + * https://github.com/typings/typings/issues/69 * 0.2.3 * fixed sourcemap generation issues (see #69) * sourcemaps sometime require a browser refresh before actually working: this might be due to a related issue (timing issue?) diff --git a/package.json b/package.json index e516dc5..25ad421 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "modern-web-dev-build", "description": "Modern Web Development Build.", - "version": "0.3.1", + "version": "0.3.2", "author": { "name": "Sebastien Dubois", "email": "seb@dsebastien.net", diff --git a/src/gulp/config.js b/src/gulp/config.js index b04d63c..71bc090 100644 --- a/src/gulp/config.js +++ b/src/gulp/config.js @@ -21,9 +21,9 @@ let folders = { dist: "./dist", temp: "./.tmp", app: "./app", - styles: "/styles", - scripts: "/scripts", - images: "/images", + styles: "./styles", + scripts: "./scripts", + images: "./images", typings: "./typings", nodeModules: "./node_modules", jspmPackages: "./jspm_packages" @@ -77,8 +77,8 @@ let javascript = { ], srcDist: folders.temp + "/core/boot.js", dest: folders.temp, - destDist: folders.dist + folders.scripts + "/" + finalJsBundleName, - finalJsBundlePath: folders.scripts + "/" + finalJsBundleName + destDist: folders.dist + "/" + finalJsBundleName, + finalJsBundlePath: finalJsBundleName }; let typescript = { @@ -88,6 +88,9 @@ let typescript = { dest: folders.temp // JavaScript code is emitted in the temp folder }; +let finalCSSBundleName = "bundle.min.css"; +let finalCSSVendorBundleName = "vendor.min.css"; + let styles = { src: [ folders.app + globs.styles.css, @@ -103,11 +106,11 @@ let styles = { ], dest: folders.temp, // for DEV destFiles: folders.temp + globs.styles.css, // for DEV - destDist: folders.dist + folders.styles, // for PROD - finalCssBundleFilename: "bundle.min.css", - finalCssBundlePath: folders.styles + "/bundle.min.css", - finalVendorCssBundleFilename: "vendor.min.css", - finalVendorCssBundlePath: folders.styles + "/vendor.min.css" + destDist: folders.dist, // for PROD + finalCssBundleFilename: finalCSSBundleName, + finalCssBundlePath: finalCSSBundleName, + finalVendorCssBundleFilename: finalCSSVendorBundleName, + finalVendorCssBundlePath: finalCSSVendorBundleName }; let images = {