From bfc14380bc99bbf47514fce98f662230fb74226b Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Tue, 24 Jul 2018 13:03:34 -0400 Subject: [PATCH] fix(build): package adjustments for semantic release update (#426) --- gulpfile.js | 7 ++-- package-lock.json | 58 ++++++++++++++--------------- src/scripts/bundle/rollup.config.js | 2 +- tsconfig-prod.json | 2 +- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 92a54d869..93b2c2dc5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,6 +45,7 @@ function copyExamples() { // Copy package files to dist function copyPkgFiles() { return copyToDist([ + './LICENSE.txt', './README.md', './package.json' ]); @@ -124,14 +125,14 @@ function copyAssetsLess() { return '@import \''; })) .pipe(rename({dirname: ''})) - .pipe(gulp.dest(libraryDist + '/less')); + .pipe(gulp.dest(libraryDist + '/dist/less')); } // Copy component LESS to dist/less in a flattened directory function copyLess() { return gulp.src(['./src/app/**/*.less'].concat(globalExcludes)) .pipe(rename({dirname: ''})) - .pipe(gulp.dest(libraryDist + '/less')); + .pipe(gulp.dest(libraryDist + '/dist/less')); } /** @@ -142,7 +143,7 @@ function copyLess() { function copyCss() { return gulp.src(['./src/assets/stylesheets/*.css'], {base: './src/assets/stylesheets'}) .pipe(gulp.dest(function (file) { - return libraryDist + '/css' + file.base.slice(__dirname.length); // save directly to dist + return libraryDist + '/dist/css' + file.base.slice(__dirname.length); // save directly to dist })); } diff --git a/package-lock.json b/package-lock.json index bf04ed70f..525896803 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1344,6 +1344,16 @@ } } }, + "JSONStream": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz", + "integrity": "sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==", + "dev": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -3567,8 +3577,8 @@ "integrity": "sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==", "dev": true, "requires": { - "is-text-path": "1.0.1", "JSONStream": "1.3.3", + "is-text-path": "1.0.1", "lodash": "4.17.10", "meow": "4.0.1", "split2": "2.2.0", @@ -6573,15 +6583,6 @@ "dev": true, "optional": true }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -6592,6 +6593,15 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "strip-ansi": { "version": "3.0.1", "bundled": true, @@ -9636,16 +9646,6 @@ "dev": true, "optional": true }, - "JSONStream": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz", - "integrity": "sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==", - "dev": true, - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -16649,15 +16649,6 @@ } } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -16680,6 +16671,15 @@ "function-bind": "1.1.1" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + }, "stringify-entities": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz", diff --git a/src/scripts/bundle/rollup.config.js b/src/scripts/bundle/rollup.config.js index a19040887..6ed22186f 100644 --- a/src/scripts/bundle/rollup.config.js +++ b/src/scripts/bundle/rollup.config.js @@ -8,7 +8,7 @@ const resolve = require('rollup-plugin-node-resolve'); const rollup = require('rollup'); export const LIB_NAME = 'patternfly-ng'; -export const PATH_SRC = 'dist/app/'; +export const PATH_SRC = 'dist/'; export const PATH_DIST = 'dist/bundles/'; export const config = { diff --git a/tsconfig-prod.json b/tsconfig-prod.json index fc800bf2c..6ae23ec58 100644 --- a/tsconfig-prod.json +++ b/tsconfig-prod.json @@ -4,7 +4,7 @@ "module": "es2015", "moduleResolution": "node", "baseUrl": ".", - "rootDir": "build/src", + "rootDir": "build/src/app", "outDir": "dist", "allowSyntheticDefaultImports": true, "allowUnreachableCode": false,