webpack-version works except the semantic-ui-css stylesheets; see angular/angular-cli#1459

Author: d-koppenhagen

.clang-format

@@ -11,4 +11,4 @@ trim_trailing_whitespace = true
 
 [*.md]
 max_line_length = 0
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.editorconfig

@@ -10,7 +10,10 @@
 
 # IDEs and editors
 /.idea
-/.vscode
+.project
+.classpath
+*.launch
+.settings/
 
 # misc
 /.sass-cache
@@ -26,4 +29,5 @@ testem.log
 /e2e/*.map
 
 #System Files
-.DS_Store
+.DS_Store
+Thumbs.db

.gitignore

@@ -1,6 +1,6 @@
 {
   "project": {
-    "version": "1.0.0-beta.6",
+    "version": "1.0.0-beta.11-webpack",
     "name": "book-monkey"
   },
   "apps": [

angular-cli-build.js

@@ -1,13 +1,15 @@
-// Karma configuration file, see link for more information
+// Karma configuration file, see link for more information		
 // https://karma-runner.github.io/0.13/config/configuration-file.html
 
 module.exports = function (config) {
   config.set({
     basePath: '..',
-    frameworks: ['jasmine'],
+    frameworks: ['jasmine', 'angular-cli'],
     plugins: [
       require('karma-jasmine'),
-      require('karma-chrome-launcher')
+      require('karma-chrome-launcher'),
+      require('karma-coverage'),
+      require('angular-cli/plugins/karma')
     ],
     customLaunchers: {
       // chrome setup for travis CI using chromium
@@ -17,25 +19,13 @@ module.exports = function (config) {
       }
     },
     files: [
-      { pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false },
-      { pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false },
-      { pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false },
-      { pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false },
-      { pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false },
-      { pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false },
-      { pattern: 'dist/vendor/zone.js/dist/fake-async-test.js', included: true, watched: false },
-
-      { pattern: 'config/karma-test-shim.js', included: true, watched: true },
-
-      // Distribution folder.
-      { pattern: 'dist/**/*', included: false, watched: true }
+      { pattern: './src/test.ts', watched: false }
     ],
-    exclude: [
-      // Vendor packages might include spec files. We don't want to use those.
-      'dist/vendor/**/*.spec.js'
-    ],
-    preprocessors: {},
-    reporters: ['progress'],
+    preprocessors: {
+      './src/test.ts': ['angular-cli']
+    },
+    angularCliConfig: './angular-cli.json',
+    reporters: ['coverage', 'progress'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

angular-cli.json

@@ -29,4 +29,4 @@ exports.config = {
   onPrepare: function() {
     jasmine.getEnv().addReporter(new SpecReporter());
   }
-};
+};

config/environment.js

@@ -5,10 +5,10 @@ describe('book-monkey App', function() {
 
   beforeEach(() => {
     page = new BookMonkeyPage();
-  })
+  });
 
   it('should display message saying app works', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('book-monkey works!');
+    expect(page.getParagraphText()).toEqual('app works!');
   });
 });

config/karma-test-shim.js

@@ -4,6 +4,6 @@ export class BookMonkeyPage {
   }
 
   getParagraphText() {
-    return element(by.css('book-monkey-app h1')).getText();
+    return element(by.css('app-root h1')).getText();
   }
 }

config/karma.conf.js

@@ -4,14 +4,13 @@
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "mapRoot": "",
     "module": "commonjs",
     "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": false,
-    "rootDir": ".",
+    "outDir": "../dist/out-tsc-e2e",
     "sourceMap": true,
-    "sourceRoot": "/",
-    "target": "es5"
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
   }
-}
+}

config/protractor.conf.js

@@ -4,9 +4,7 @@
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
-    "start": "ng server",
-    "ng": "ng",
-    "postinstall": "typings install",
+    "start": "ng serve",
     "lint": "tslint \"src/**/*.ts\"",
     "test": "ng test",
     "pree2e": "webdriver-manager update",
@@ -22,29 +20,28 @@
     "@angular/platform-browser": "2.0.0-rc.4",
     "@angular/platform-browser-dynamic": "2.0.0-rc.4",
     "@angular/router": "3.0.0-beta.2",
-    "es6-shim": "0.35.1",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "semantic-ui-css": "2.1.8",
-    "systemjs": "0.19.26",
+    "semantic-ui-css": "2.2.2",
+    "ts-helpers": "^1.1.1",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
-    "angular-cli": "1.0.0-beta.10",
-    "angular-cli-ghpages": "*",
+    "@types/jasmine": "^2.2.30",
+    "@types/protractor": "^1.5.16",
+    "angular-cli": "1.0.0-beta.11-webpack",
     "book-monkey2-api": "*",
-    "codelyzer": "0.0.20",
-    "ember-cli-inject-live-reload": "1.4.0",
-    "exists-sync": "0.0.3",
+    "codelyzer": "0.0.26",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
     "karma": "0.13.22",
     "karma-chrome-launcher": "0.2.3",
+    "karma-coverage": "^1.0.0",
     "karma-jasmine": "0.3.8",
     "protractor": "3.3.0",
-    "ts-node": "0.5.5",
-    "tslint": "3.11.0",
-    "typescript": "1.8.10",
-    "typings": "0.8.1"
+    "ts-node": "1.2.1",
+    "tslint": "3.13.0",
+    "typescript": "^2.0.0"
   }
 }

e2e/app.e2e.ts renamed to e2e/app.e2e-spec.ts

@@ -1,24 +1,20 @@
 /*
-import {
-  beforeEachProviders,
-  describe,
-  expect,
-  it,
-  inject
-} from '@angular/core/testing';
-import { AppComponent } from '../app/book-monkey.component';
-
-beforeEachProviders(() => [AppComponent]);
+import { addProviders, async, inject } from '@angular/core/testing';
+import { AppComponent } from './app.component';
 
 describe('App: BookMonkey', () => {
+  beforeEach(() => {
+    addProviders([AppComponent]);
+  });
+
   it('should create the app',
-      inject([AppComponent], (app: AppComponent) => {
-    expect(app).toBeTruthy();
-  }));
+    inject([AppComponent], (app: AppComponent) => {
+      expect(app).toBeTruthy();
+    }));
 
-  it('should have as title \'book-monkey works!\'',
-      inject([AppComponent], (app: AppComponent) => {
-    expect(app.title).toEqual('book-monkey works!');
-  }));
+  it('should have as title \'app works!\'',
+    inject([AppComponent], (app: AppComponent) => {
+      expect(app.title).toEqual('app works!');
+    }));
 });
 */

e2e/app.po.ts

@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 import { ROUTER_DIRECTIVES } from '@angular/router';
 
 @Component({
-  moduleId: module.id,
   selector: 'app-root',
   templateUrl: 'app.component.html',
+  styleUrls: ['app.component.css'],
   directives: [ROUTER_DIRECTIVES]
 })
 export class AppComponent { }

e2e/tsconfig.json

@@ -0,0 +1,8 @@
+// The file for the current environment will overwrite this one during build.
+// Different environments can be found in ./environment.{dev|prod}.ts, and
+// you can create your own and use it with the --env flag.
+// The build system defaults to the dev environment.
+
+export const environment = {
+  production: false
+};

e2e/typings.d.ts

@@ -1,4 +1,4 @@
-export * from './environment';
+export * from './environments/environment';
 export * from './app.component';
 export * from './app.routes';
 

package.json

@@ -5,20 +5,13 @@
   <title>BookMonkey</title>
   <base href="/">
 
-  {{#unless environment.production}}
-  <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
-  {{/unless}}
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="stylesheet" href="vendor/semantic-ui-css/semantic.min.css">
+  <style>
+    @import '../../../node_modules/semantic-ui-css/semantic.min.css';
+  </style>
 </head>
 <body>
   <app-root>Loading...</app-root>
-      {{#each scripts.polyfills}}<script src="{{.}}"></script>{{/each}}
-      <script>
-        System.import('system-config.js').then(function () {
-          System.import('main');
-        }).catch(console.error.bind(console));
-      </script>
 </body>
- </html>
+</html>