Skip to content

Commit

Permalink
bump cli version (scttcper#23)
Browse files Browse the repository at this point in the history
* upgrade cli

* don't publish sourcemaps and ngfactory files
  • Loading branch information
scttcper authored Nov 17, 2016
1 parent 96ff03f commit 4d84372
Show file tree
Hide file tree
Showing 10 changed files with 396 additions and 2,245 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/.vscode
.project
.classpath
.c9/
*.launch
.settings/

Expand All @@ -25,6 +26,7 @@ npm-debug.log
testem.log
/typings
/deploy
/waste

# e2e
/e2e/*.js
Expand Down
2 changes: 1 addition & 1 deletion angular-cli.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"project": {
"version": "1.0.0-beta.19-3",
"version": "1.0.0-beta.20-4",
"name": "toastr-ng2"
},
"apps": [
Expand Down
3 changes: 3 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ module.exports = function (config) {
preprocessors: {
'./src/test.ts': ['angular-cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
},
remapIstanbulReporter: {
reports: {
html: 'coverage',
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"@angular/platform-browser-dynamic": "~2.2.0",
"@angular/router": "~3.2.0",
"core-js": "^2.4.1",
"lodash": "^4.17.1",
"rxjs": "5.0.0-beta.12",
"ts-helpers": "^1.1.1",
"zone.js": "^0.6.23"
Expand All @@ -40,8 +39,8 @@
"@types/jasmine": "^2.2.30",
"@types/lodash": "^4.14.39",
"@types/node": "^6.0.48",
"angular-cli": "1.0.0-beta.19-3",
"codelyzer": "1.0.0-beta.1",
"angular-cli": "1.0.0-beta.20-4",
"codelyzer": "~1.0.0-beta.3",
"jasmine-core": "2.4.1",
"jasmine-spec-reporter": "2.5.0",
"karma": "1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';

describe('App: ToastrNg2', () => {
describe('AppComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [
Expand Down
10 changes: 6 additions & 4 deletions src/lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": ["es6", "dom"],
"mapRoot": "./",
"module": "commonjs",
"moduleResolution": "node",
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
"outDir": "../../deploy",
"sourceMap": true,
"sourceMap": false,
"target": "es5",
"types": []
},
"angularCompilerOptions": {
"genDir": "../../deploy"
}
"genDir": "../../waste"
},
"exclude": [
"node_modules"
]
}
34 changes: 16 additions & 18 deletions src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import 'zone.js/dist/sync-test';
import 'zone.js/dist/jasmine-patch';
import 'zone.js/dist/async-test';
import 'zone.js/dist/fake-async-test';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
declare var __karma__: any;
Expand All @@ -14,21 +19,14 @@ declare var require: any;
// Prevent Karma from running prematurely.
__karma__.loaded = function () {};


Promise.all([
System.import('@angular/core/testing'),
System.import('@angular/platform-browser-dynamic/testing')
])
// First, initialize the Angular testing environment.
.then(([testing, testingBrowser]) => {
testing.getTestBed().initTestEnvironment(
testingBrowser.BrowserDynamicTestingModule,
testingBrowser.platformBrowserDynamicTesting()
);
})
// Then we find all the tests.
.then(() => require.context('./', true, /\.spec\.ts/))
// And load the modules.
.then(context => context.keys().map(context))
// Finally, start Karma to run the tests.
.then(__karma__.start, __karma__.error);
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);
// Then we find all the tests.
let context = require.context('./', true, /\.spec\.ts/);
// And load the modules.
context.keys().map(context);
// Finally, start Karma to run the tests.
__karma__.start();
1 change: 1 addition & 0 deletions src/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"baseUrl": "",
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand Down
2 changes: 0 additions & 2 deletions src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
// Typings reference file, you can add your own global typings here
// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html

declare var System: any;
Loading

0 comments on commit 4d84372

Please sign in to comment.