Use angular-cli#1.0.0-rc.1 #984

Author: l-lin

demo/angular-cli.json renamed to demo/.angular-cli.json

@@ -1,7 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.0-beta.32.3",
     "name": "angular-datatables-demo"
   },
   "apps": [
@@ -18,7 +17,8 @@
       "main": "main.ts",
       "polyfills": "polyfills.ts",
       "test": "test.ts",
-      "tsconfig": "tsconfig.json",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
         "../node_modules/datatables.net-dt/css/jquery.dataTables.css",
@@ -44,12 +44,13 @@
   },
   "lint": [
     {
-      "files": "src/**/*.ts",
-      "project": "src/tsconfig.json"
+      "project": "src/tsconfig.app.json"
     },
     {
-      "files": "e2e/**/*.ts",
-      "project": "e2e/tsconfig.json"
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
     }
   ],
   "test": {

demo/karma.conf.js

@@ -29,7 +29,6 @@ module.exports = function (config) {
       fixWebpackSourcePaths: true
     },
     angularCli: {
-      config: './.angular-cli.json',
       environment: 'dev'
     },
     reporters: config.angularCli && config.angularCli.codeCoverage

demo/package.json

@@ -2,7 +2,6 @@
   "name": "angular-datatables-demo",
   "version": "2.0.2-dev",
   "license": "MIT",
-  "angular-cli": {},
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -38,7 +37,7 @@
     "zone.js": "0.7.7"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0-beta.32.3",
+    "@angular/cli": "1.0.0-rc.1",
     "@angular/compiler-cli": "2.4.8",
     "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",

demo/protractor.conf.js

@@ -1,7 +1,6 @@
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
-/*global jasmine */
 const { SpecReporter } = require('jasmine-spec-reporter');
 
 exports.config = {
@@ -22,7 +21,7 @@ exports.config = {
   },
   beforeLaunch: function() {
     require('ts-node').register({
-      project: 'e2e'
+      project: 'e2e/tsconfig.e2e.json'
     });
   },
   onPrepare() {

demo/src/app/advanced/row-click-event.component.html

@@ -28,7 +28,7 @@ <h4 class="header">Preview</h4>
           <br />
           <table datatable [dtOptions]="dtOptions" class="row-border hover"></table>
         </div>
-        <ap-row-click-event-snippet></app-row-click-event-snippet>
+        <app-row-click-event-snippet></app-row-click-event-snippet>
       </div>
     </div>
   </div>

demo/src/app/getting-started.component.html

@@ -19,10 +19,10 @@ <h2 class="header">Installation</h2>
           The documentation will only deal with projects that use <a href="https://github.com/angular/angular-cli">angular-cli</a>. Indeed, the front-end ecosystem is evolving at a pace I can't follow anymore. Thus, there will only have a tutorial for angular-cli's project. If you managed to make it work in, for example, SystemJS projects, please submit a pull request to improve this documentation. Thanks!
         </p>
         <div class="col s12">
-          <h4>Angular-CLI version 1.0.0-beta.32.3</h4>
+          <h4>Angular-CLI version 1.0.0-rc.1</h4>
           <p>I recommend using <a href="https://github.com/angular/angular-cli">angular-cli</a> to create and manage your angular2 project</p>
           <p>
-            Since Angular-CLI is still in beta, I prefer to warn you the demo was developpped in version <b>1.0.0-beta.32.3</b> and newer version of Angular-CLI may need to have different configuration.
+            Since Angular-CLI is still in beta, I prefer to warn you the demo was developpped in version <b>1.0.0-rc1</b> and newer version of Angular-CLI may need to have different configuration.
           </p>
         </div>
         <div class="col s12">
@@ -35,7 +35,7 @@ <h4>NPM</h4>
       <div class="section">
         <h2 class="header" id="setup">Setup</h2>
         <div class="col s12">
-          <h4 id="angular-cli">angular-cli.json</h4>
+          <h4 id="angular-cli">.angular-cli.json</h4>
           <p>Add the dependencies in the scripts and styles attributes:</p>
           <section [innerHTML]="angularCliJsonSnippet" highlight-js-content=".json"></section>
         </div>

demo/src/app/getting-started.component.ts

@@ -18,13 +18,15 @@ npm install angular-datatables --save</code>
   <code class="json highlight">{
   "apps": [
     {
+      ...
       "styles": [
         "../node_modules/datatables.net-dt/css/jquery.dataTables.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.js",
         "../node_modules/datatables.net/js/jquery.dataTables.js"
-      ]
+      ],
+      ...
     }
   ]
 }</code>

demo/src/tsconfig.app.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016",
+      "dom"
+    ],
+    "outDir": "../out-tsc/app",
+    "target": "es5",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}

demo/src/tsconfig.spec.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016"
+    ],
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es6",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts"
+  ]
+}

demo/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "lib": [
+      "es2016",
+      "dom"
+    ]
+  }
+}

deploy-doc.sh

@@ -3,20 +3,32 @@
 # Exit the script if a command fails
 set -e
 
-gitmessage=${1:-'Deploy documentation to gh-pages'}
-
 function info {
-  echo "[-] $1"
+    echo "[-] $1"
+}
+
+function help {
+    echo "[x] Missing arguments..."
+    info "Usage: $  deploy-doc.sh <version>"
+    info "Example:"
+    info "  $ deploy-doc.sh 2.0.0"
 }
 
+if [ -z "$1" ]; then
+    help
+    exit 1
+fi
+
+version=${1}
+gitmessage="Deploy documentation $version to gh-pages"
 cwd=$(pwd)
 project_name=${PWD##*/}
 
 info "Deloying the documentation to the GH pages from $cwd (project name is $project_name)"
 
 info "Building documentation..."
 cd $cwd/demo
-ng build --prod --aot --base-href /angular-datatables/
+npm run ng build -prod -aot --base-href /angular-datatables/
 
 info "Copying the doc folder to /tmp"
 rm -rf /tmp/angular-datatables-demo