diff --git a/package.json b/package.json index a866ada110..a800221ec9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "ng": "ng", "start": "ng serve", "start:prod": "node server", - "build": "ng build -prod --aot", + "build": "ng build -prod --aot --stats-json", "test": "ng test", "test-build": "ng lint && npm run build && karma start karma.conf.js --single-run", "local-verify": "ng test --single-run && ng lint && ng e2e && yarn build", @@ -31,7 +31,7 @@ "make": "electron-forge make", "dist-electron": "build", "postinstall": "opencollective postinstall", - "publish-packages": "npm run build && lerna publish --skip-git --force-publish" + "publish-packages": "npm run build && lerna publish --skip-git --force-publish --conventional-commits --yes" }, "engines": { "node": ">= 6.9.1" diff --git a/packages/altair-express-middleware/CHANGELOG.md b/packages/altair-express-middleware/CHANGELOG.md new file mode 100644 index 0000000000..5acc090a8f --- /dev/null +++ b/packages/altair-express-middleware/CHANGELOG.md @@ -0,0 +1,81 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + + +## [1.0.5](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.5) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.4](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.4) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.3](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.3) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.2](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.2) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.3](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.3) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.2](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.2) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.2](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.2) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.4](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.4) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware + + + + + + +## [1.0.3](https://github.com/imolorhe/altair/compare/altair-express-middleware@0.1.0...altair-express-middleware@1.0.3) (2018-05-12) + +**Note:** Version bump only for package altair-express-middleware diff --git a/packages/altair-express-middleware/index.ts b/packages/altair-express-middleware/index.ts index cdab2329a8..8768aee559 100644 --- a/packages/altair-express-middleware/index.ts +++ b/packages/altair-express-middleware/index.ts @@ -2,15 +2,14 @@ const path = require('path'); const express = require('express'); +const altairStatic = require('altair-static'); module.exports = { altairExpress: (opts) => { const app = express(); - app.use(express.static(path.join(__dirname, '../dist'))); - app.get('*', (req, res) => { - return res.sendFile(path.join(__dirname, '../dist/index.html')); + return res.send(altairStatic.renderAltair()); }); return app; diff --git a/packages/altair-express-middleware/package.json b/packages/altair-express-middleware/package.json index b70036d28b..021d6e17fa 100644 --- a/packages/altair-express-middleware/package.json +++ b/packages/altair-express-middleware/package.json @@ -8,7 +8,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "prepare-dist": "node scripts/prepare_dist.js", "declarations": "tsc --declaration", - "prepare": "npm run prepare-dist; npm run declarations" + "prepare": "npm run declarations" }, "engines": { "node": ">= 6.9.1" diff --git a/packages/altair-static/CHANGELOG.md b/packages/altair-static/CHANGELOG.md new file mode 100644 index 0000000000..b7cc399db8 --- /dev/null +++ b/packages/altair-static/CHANGELOG.md @@ -0,0 +1,81 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + + +## 1.0.4 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.3 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.2 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.1 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.2 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.1 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.1 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.3 (2018-05-12) + +**Note:** Version bump only for package altair-static + + + + + + +## 1.0.2 (2018-05-12) + +**Note:** Version bump only for package altair-static diff --git a/packages/altair-static/scripts/prepare_dist.js b/packages/altair-static/scripts/prepare_dist.js index 773c599863..fe3d09c4c0 100644 --- a/packages/altair-static/scripts/prepare_dist.js +++ b/packages/altair-static/scripts/prepare_dist.js @@ -11,6 +11,8 @@ const buildDir = path.resolve(__dirname, '../build'); const indexHtmlFile = path.join(distDestination, 'index.html'); +const cdnFile = fileName => `https://cdn.jsdelivr.net/npm/altair-static/dist/${fileName}`; + ncp(distSrc, distDestination, function (err) { if (err) { return console.error(err); @@ -20,7 +22,8 @@ ncp(distSrc, distDestination, function (err) { let indexHtmlStr = fs.readFileSync(indexHtmlFile, 'utf8'); // Adjust the base URL to be relative to the current path - indexHtmlStr = indexHtmlStr.replace('', ''); + indexHtmlStr = indexHtmlStr.replace('', '' + /*''*/); // Write the new string back to file fs.writeFileSync(indexHtmlFile, indexHtmlStr, 'utf8'); @@ -29,6 +32,9 @@ ncp(distSrc, distDestination, function (err) { const stats = JSON.parse(fs.readFileSync(path.resolve(distSrc, 'stats.json'))); let buildIndexHtmlStr = fs.readFileSync(path.resolve(srcDir, 'index.html'), 'utf8'); + buildIndexHtmlStr = buildIndexHtmlStr.replace('', '' + /*''*/ + ); buildIndexHtmlStr = buildIndexHtmlStr.replace('[% STYLES_FILE %]', stats.assetsByChunkName.styles); buildIndexHtmlStr = buildIndexHtmlStr.replace('[% INLINE_SCRIPT %]', stats.assetsByChunkName.inline); buildIndexHtmlStr = buildIndexHtmlStr.replace('[% POLYFILLS_SCRIPT %]', stats.assetsByChunkName.polyfills); diff --git a/packages/altair-static/src/index.ts b/packages/altair-static/src/index.ts index 7c21ad52c7..752130bf4d 100644 --- a/packages/altair-static/src/index.ts +++ b/packages/altair-static/src/index.ts @@ -3,5 +3,6 @@ const path = require('path'); export const renderAltair = (opts) => { const altairHtml = fs.readFileSync(path.resolve(__dirname, 'index.html'), 'utf8'); - console.log(altairHtml); + // console.log(altairHtml); + return altairHtml; };