Merge branch 'release/0.0.1-rc.3'

CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [0.0.1-rc.3](https://github.com/groupe-sii/clea-cli/compare/0.0.1-beta.rc.2...0.0.1-rc.3) - 2017-04-11
+
+### Breaking changes
+
+- There is now a dedicated entry for the main module file, between `root` and `environmentSource` in `.clea-cli.json`:
+
+  ```json
+  {
+    "root": "src",
+    "main": "app/app.module.ts",
+    "environmentSource": "config/config.json"
+  }
+  ```
+
+- There is now a dedicated entry for the main styles files, between `main` and `environmentSource` in `.clea-cli.json`:
+
+  ```json
+  {
+    "main": "app/app.module.ts",
+    "styles": [
+      "styles/main.scss"
+    ],
+    "environmentSource": "config/config.json"
+  }
+  ```
+
+### Fixed
+
+- **webpack**: duplicate declaration of `config` variable was causing build errors [@ValentinGot]
+
 ## [0.0.1-rc.2](https://github.com/groupe-sii/clea-cli/compare/0.0.1-beta.rc.1...0.0.1-rc.2) - 2017-04-06
 
 ### Added

README.md

@@ -6,7 +6,7 @@
 
 <p align="center">
   <a href="https://travis-ci.org/groupe-sii/clea-cli"><img alt="Travis Status" src="https://travis-ci.org/groupe-sii/clea-cli.svg"></a>
-  <a href="https://npmjs.org/package/clea"><img alt="NPM version" src="https://badge.fury.io/js/clea.svg"></a>
+  <a href="https://npmjs.org/package/@clea/cli"><img alt="NPM version" src="https://badge.fury.io/js/clea.svg"></a>
   <a href="https://david-dm.org/groupe-sii/clea-cli"><img src="https://david-dm.org/groupe-sii/clea-cli.svg" alt="npm dependencies"></a>
   <a href="http://opensource.org/licenses/MIT"><img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT badge"></a>
 </p>

lib/models/webpack-configs-app/common.js

@@ -15,15 +15,13 @@ module.exports = (project, options) => {
     config = JSON.parse(fs.readFileSync(configPath, 'utf8')),
     nodeModules = path.resolve(project.root, 'node_modules');
 
-  let config = {
+  let webpackConfig = {
 
     entry: {
       main  : [
-        path.join(rootPath, 'app/app.module.ts')
+        path.join(rootPath, project.clea.main)
       ],
-      styles: [
-        path.join(rootPath, 'styles/main.scss')
-      ]
+      styles: project.clea.styles.map((style) => path.join(rootPath, style))
     },
 
     resolve: {
@@ -153,8 +151,8 @@ module.exports = (project, options) => {
   };
 
   if (options.progress) {
-    config.plugins.push(new ProgressPlugin());
+    webpackConfig.plugins.push(new ProgressPlugin());
   }
 
-  return config;
+  return webpackConfig;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clea/cli",
-  "version": "0.0.1-rc.2",
+  "version": "0.0.1-rc.3",
   "description": "CLI tool for AngularJS & Typescript projects",
   "scripts": {
     "lint": "eslint .",

templates/application/README.md

@@ -19,7 +19,7 @@ $ npm install --production  # Production (only `dependencies`)
 
 - `npm start` to launch a webpack-dev-server server on your source files
 - `npm run build` to build an optimized version of your application in /dist
-- `npm run build:prod` to build an optimized version of your application in /dist in a **production** environment
+- `npm run build:prod` to build an optimized version of your application in /dist in a **production** environment & generate documentation
 - `npm run test` to launch your unit tests with Karma
 - `npm run lint` to launch linting process
 - `npm run sonar:reporters` to create the linters reporters for SonarQube plugin
@@ -28,22 +28,6 @@ $ npm install --production  # Production (only `dependencies`)
 
 See [commits convention](COMMITS-CONVENTION.md).
 
-## Documentation
-
-Angular documentation is generated with [DGeni](https://github.com/angular/dgeni)
-
-Docs generation is performed by [webpack-angular-dgeni-plugin](https://github.com/groupe-sii/webpack-angular-dgeni-plugin/)
-
-Please refer to [Angular documentation](https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation) for documentation comments.
-
-### Launch
-
-Documentation is launched by adding `--doc` argument to the build command. Which is already done by default by `build:prod` NPM script.
-
-```bash
-clea build --doc
-```
-
 ## Styling
 
 See styling [guidelines](src/styles/README.md).

templates/application/_.clea-cli.json

@@ -2,6 +2,10 @@
   "type": "application",
   "name": "<%= appName %>",
   "root": "src",
+  "main": "app/app.module.ts",
+  "styles": [
+    "styles/main.scss"
+  ],
   "environmentSource": "config/config.json",
   "environments": {
     "development": "config/config.dev.json",

templates/application/_package.json

@@ -30,7 +30,7 @@
     "restangular": "^1.6.1"
   },
   "devDependencies": {
-    "@clea/cli": "^0.0.1-rc.2",
+    "@clea/cli": "^0.0.1-rc.3",
     "@types/angular": "^1.6.5",<% if (ngMaterial) { %>
     "@types/angular-material": "^1.1.46",<% } %>
     "@types/angular-mocks": "^1.5.9",

templates/library/_package.json

@@ -14,7 +14,7 @@
     "bootstrap": "^3.3.7"
   },
   "devDependencies": {
-    "@clea/cli": "^0.0.1-rc.2",
+    "@clea/cli": "^0.0.1-rc.3",
     "@types/angular": "^1.6.5",
     "@types/core-js": "^0.9.36",
     "@types/angular-mocks": "^1.5.9",