setup deploys

Author: cal-smith

.travis.yml

@@ -9,7 +9,7 @@ before_install:
 before_script:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
-script: npm test && npm run lint && npm run demo:build
+script: npm run lint && npm test
 sudo: false
 deploy:
   skip_cleanup: true

gulpfile.js

@@ -13,8 +13,7 @@ const path = require("path");
 const fs = require("fs");
 const es = require("event-stream");
 const runSequence = require("run-sequence");
-// const iconLoader = require("@peretz/icon-loader");
-// const through = require("through2");
+
 //
 // Variables
 // =================================
@@ -25,8 +24,6 @@ const dirs = {
 		"!src/**/*.stories.ts"
 	],
 	i18n: "src/i18n/**/*.json",
-	FONTS: "node_modules/@peretz/matter/fonts/**/*",
-	DEMO: "demo",
 	DIST: "dist"
 };
 
@@ -57,7 +54,6 @@ const licenseTemplate = `/*!
 gulp.task("build:angular", _ =>
 	gulp.src(dirs.TS)
 		.pipe(replaceTemplates())
-		// .pipe(replaceIcons())
 		.pipe(gulp.dest(`${dirs.DIST}/src`))
 );
 
@@ -83,7 +79,6 @@ gulp.task("build:license", _ =>
 
 gulp.task("build:package", _ =>
 	gulp.src("package.json")
-		.pipe(version())
 		.pipe(gulp.dest(dirs.DIST))
 );
 
@@ -97,14 +92,6 @@ gulp.task("build:changelog", _ =>
 		.pipe(gulp.dest(dirs.DIST))
 );
 
-//
-// Demo tasks
-// =================================
-gulp.task("demo:font", _ =>
-	gulp.src(dirs.FONTS)
-		.pipe(gulp.dest(`${dirs.DEMO}/fonts`))
-);
-
 //
 // Running tasks
 // =================================
@@ -114,8 +101,6 @@ gulp.task("build:meta", _ =>
 	runSequence("build:package", ["build:license", "build:readme", "build:changelog"])
 );
 
-gulp.task("demo", ["demo:font"]);
-
 //
 // Functions
 // =================================
@@ -130,48 +115,6 @@ function licenseHeaders() {
   });
 }
 
-function version() {
-	return tap(function(file) {
-		let packageJSON = JSON.parse(file.contents.toString("utf-8"));
-		if (process.env.TRAVIS) {
-			// assume beta release on cron
-			if (process.env.TRAVIS_EVENT_TYPE === "cron") {
-				const build = process.env.TRAVIS_BUILD_NUMBER; // we'll use the build number so we dont have to think about versions
-				packageJSON.version = `${packageJSON.version}-beta.${build}`;
-			// release to alpha unless it's building from a tag
-			} else if (!process.env.TRAVIS_TAG) {
-				const commit = process.env.TRAVIS_COMMIT; // we'll just slice up the commit a bit
-				packageJSON.version = `${packageJSON.version}-alpha.${commit.slice(0, 5)}`;
-			}
-		}
-		// otherwise we'll do a standard release with whatever version is in the package.json
-		file.contents = new Buffer(JSON.stringify(packageJSON));
-	});
-}
-
-// custom gulp plugin
-// TODO: add to icon-loader
-// function replaceIcons() {
-// 	return through.obj(function (file, enc, cb) {
-// 		if (file.isNull()) {
-// 			return cb(null, file);
-// 		}
-// 		let asyncTrue = false;
-// 		iconLoader.prototype.async = function () {
-// 			asyncTrue = true;
-// 		};
-// 		iconLoader.prototype.callback = function (error, result) {
-// 			file.contents = new Buffer(result);
-// 			cb(null, file);
-// 		};
-// 		new iconLoader(file.contents.toString());
-// 		// no async means no processing, means return the file!
-// 		if (!asyncTrue) {
-// 			cb(null, file);
-// 		}
-// 	});
-// }
-
 function replaceTemplates() {
 	// regex borrwed from https://github.com/TheLarkInn/angular2-template-loader/blob/1403302e985bf689ee49e9dd8bb953225f32737b/index.js#L5-L7
 	const templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`])/g;

package-lock.json

@@ -14,12 +14,15 @@
     "utils:add": "git subtree add --prefix=src/utils [email protected]:peretz/utils.git master --squash",
     "utils:update": "git subtree pull --prefix=src/utils [email protected]:peretz/utils.git master --squash",
     "prepush": "bash scripts/prepush.sh",
-    "build-storybook": "build-storybook",
-    "semantic-release": "semantic-release -d"
+    "build-storybook": "build-storybook -c .storybook -o dist/docs/storybook",
+    "semantic-release": "semantic-release"
+  },
+  "release": {
+    "pkgRoot": "dist"
   },
   "repository": {
     "type": "git",
-    "url": "[email protected]:ibm/carbon-components-angular.git"
+    "url": "git@github.ibm.com:peretz/carbon-components-angular.git"
   },
   "license": "Apache-2",
   "author": "IBM",
@@ -54,12 +57,12 @@
     "@angular/router": "6.1.0",
     "@compodoc/compodoc": "1.0.4",
     "@ngx-translate/core": "10.0.2",
-    "@storybook/addon-actions": "^3.4.8",
-    "@storybook/addon-knobs": "^3.4.8",
-    "@storybook/addon-links": "^3.4.8",
-    "@storybook/addon-notes": "^3.4.8",
-    "@storybook/addons": "^3.4.8",
-    "@storybook/angular": "^3.4.8",
+    "@storybook/addon-actions": "3.4.8",
+    "@storybook/addon-knobs": "3.4.8",
+    "@storybook/addon-links": "3.4.8",
+    "@storybook/addon-notes": "3.4.8",
+    "@storybook/addons": "3.4.8",
+    "@storybook/angular": "3.4.8",
     "@types/jasmine": "2.8.6",
     "@types/node": "8.5.2",
     "angular2-template-loader": "0.6.2",
@@ -102,7 +105,7 @@
     "stylelint-webpack-plugin": "0.10.4",
     "svgxuse": "1.2.6",
     "ts-helpers": "1.1.2",
-    "ts-loader": "4.3.0",
+    "ts-loader": "3.5.0",
     "tslint": "5.10.0",
     "tslint-loader": "3.6.0",
     "typescript": "2.9.2",
@@ -113,6 +116,5 @@
     "webpack-node-externals": "1.6.0",
     "whatwg-fetch": "2.0.3",
     "zone.js": "0.8.26"
-  },
-  "dependencies": {}
+  }
 }

package.json

@@ -8,6 +8,10 @@ ngc -p tsconfig-aot.json
 webpack --config webpack.build.js
 rm -rf dist/src dist/waste demo/bundle/documentation
 
+# move/generate/update meta files into dist
 gulp build:meta
 
-npm run docs:build && mv documentation demo/bundle/
+# generate ALL the documentation
+mkdir dist/docs
+npm run build-storybook
+npm run docs:build && mv documentation dist/docs/

scripts/build.sh

@@ -7,55 +7,4 @@ if [[ ${TRAVIS_TEST_RESULT=0} == 1 ]]; then
   exit 1;
 fi
 
-# exit if the branch is wrong
-if [[ ${TRAVIS_BRANCH} =~ (master$|beta$|^v?[0-9]*\.[0-9]*\.[0-9]*$) || ${TRAVIS_EVENT_TYPE} == 'cron' ]]; then
-	npm run build
-	cd dist
-
-	#setup npm publishing
-	npm publish
-
-	if [[ ${TRAVIS_BRANCH} =~ (master$|beta$|^v?[0-9]*\.[0-9]*\.[0-9]*$) ]]; then
-		# Move to the top level folder, and make a "deploy" directory
-		cd ../
-		mkdir deploy
-		cd deploy
-		git init
-
-		# Configure Git
-		git config user.name "Travis CI"
-		git config user.email "[email protected]"
-
-		# pull the upstream pages
-		git pull "[email protected]:ibm/carbon-components-angular.git" gh-pages
-
-		# copy to the master/alpha folder
-		if [[ ${TRAVIS_BRANCH} == "master" ]]; then
-			cp -R ../demo/bundle/* ./
-		# copy to the beta folder
-		elif [[ ${TRAVIS_EVENT_TYPE} == "cron" ]]; then
-			mkdir -p beta
-			cp -R ../demo/bundle/* beta
-		# copy to the version folder
-		elif [[ ${TRAVIS_BRANCH} =~ (^v?[0-9]*\.[0-9]*\.[0-9]*$) ]]; then
-			mkdir -p $TRAVIS_BRANCH
-			cp -R ../demo/bundle/* $TRAVIS_BRANCH
-		fi
-
-		# in this case we want the script to keep running, so we can actually check the $? (status) var
-		set +e
-		# Commit all the things into the repo
-		git add .
-		git commit -m "Deploy to GitHub Pages"
-
-		# Force push to gh-pages if there was something to commit
-		if [ $? -eq 0 ]; then
-			git push --force "[email protected]:ibm/carbon-components-angular.git" master:gh-pages > /dev/null 2>&1
-		fi
-		exit 0;
-	fi
-else
-	echo "Branch type not recognized";
-	echo "Skipping deploy";
-	exit 0;
-fi
+npm run semantic-release

scripts/deploy.sh

@@ -5,13 +5,13 @@ set -e
 [email protected]:ibm/carbon-components-angular.git
 
 # Refresh code
-git pull upstream master
+# git pull upstream master
 
-if [ $? -ne 0 ]
-then
-	echo "Error: Couldn't pull from upstream."
-	echo "Try running 'git remote add upstream $GITHUB_UPSTREAM' and try again."
-	exit 1
-fi
+# if [ $? -ne 0 ]
+# then
+# 	echo "Error: Couldn't pull from upstream."
+# 	echo "Try running 'git remote add upstream $GITHUB_UPSTREAM' and try again."
+# 	exit 1
+# fi
 
 #exit 1  # stops push from running, good for testing

scripts/prepush.sh

@@ -20,7 +20,6 @@ function rxjsExternal(context, request, cb) {
 }
 
 module.exports = [{
-	mode: "production",
 	devtool: "source-map",
 	entry: {
 		neutrino: "./src/index.ts",