Testing some changes to fix issues with angular 2.3.1

Signed-off-by: Carlos Vega <clmvega@gmail.com>
storybookjs · Oct 10, 2017 · b604123 · b604123
1 parent 8cf821b
commit b604123
Show file tree

Hide file tree

Showing 11 changed files with 1,022 additions and 801 deletions.
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -36,7 +36,7 @@
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
     "style-loader": "^0.17.0",
-    "typescript": "^2.4.0",
+    "typescript": "^2.5.3",
     "typescript-definition-tester": "^0.0.5",
     "vue": "^2.4.2"
   },

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -89,6 +89,6 @@
     "codelyzer": "^3.1.2",
     "mock-fs": "^4.3.0",
     "nodemon": "^1.12.0",
-    "typescript": "^2.4.0"
+    "typescript": "^2.5.3"
   }
 }
diff --git a/examples/angular-cli/e2e/app.e2e-spec.ts b/examples/angular-cli/e2e/app.e2e-spec.ts
@@ -1,4 +1,5 @@
 import { FixturePage } from './app.po';
+import 'jasmine';
 
 describe('fixture App', function() {
   let page: FixturePage;

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -29,6 +29,11 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "^2.3.1",
+    "@storybook/angular": "^3.3.0-alpha.0",
+    "@storybook/addon-actions": "^3.3.0-alpha.0",
+    "@storybook/addon-links": "^3.3.0-alpha.0",
+    "@storybook/addon-notes": "^3.3.0-alpha.0",
+    "@storybook/addons": "^3.3.0-alpha.0",
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
     "angular-cli": "1.0.0-beta.28.3",
@@ -40,10 +45,9 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
     "karma-remap-istanbul": "^0.2.1",
-    "protractor": "~4.0.13",
+    "protractor": "~5.1.0",
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
-    "typescript": "~2.0.3",
-    "@storybook/angular": "^3.3.0-alpha.0"
+    "typescript": "~2.5.3"
   }
 }
diff --git a/examples/angular-cli/src/app/app.component.spec.ts b/examples/angular-cli/src/app/app.component.spec.ts
@@ -1,6 +1,7 @@
 /* tslint:disable:no-unused-variable */
 
 import { TestBed, async } from '@angular/core/testing';
+import 'jasmine';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {

diff --git a/examples/angular-cli/src/tsconfig.json b/examples/angular-cli/src/tsconfig.json
@@ -1,18 +1,3 @@
 {
-  "compilerOptions": {
-    "baseUrl": "",
-    "declaration": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc",
-    "sourceMap": true,
-    "target": "es5",
-    "typeRoots": [
-      "../node_modules/@types"
-    ]
-  }
+  "extends": "../tsconfig.json"
 }
diff --git a/examples/angular-cli/stories/index.ts b/examples/angular-cli/stories/index.ts
@@ -1,10 +1,12 @@
 import { storiesOf } from '@storybook/angular';
-import { addonNotes } from '@storybook/addon-notes';
+import { withNotes } from '@storybook/addon-notes';
 import { action } from '@storybook/addon-actions'
 import { linkTo } from '@storybook/addon-links'
 
 import { Welcome, Button } from '@storybook/angular/demo';
 
+declare let module;
+
 storiesOf('Welcome', module)
   .add('to Storybook', () => ({
     component: Welcome,
@@ -18,13 +20,13 @@ storiesOf('Button', module)
       text: 'Hello Button'
     }
   }))
-  .add('with some emoji', addonNotes({ notes: 'My notes on a button with emojis' })(() => ({
+  .add('with some emoji', withNotes({ notes: 'My notes on a button with emojis' })(() => ({
     component: Button,
     props: {
       text: '😀 😎 👍 💯'
     }
   })))
-  .add('with some emoji and action', addonNotes({ notes: 'My notes on a button with emojis' })(() => ({
+  .add('with some emoji and action', withNotes({ notes: 'My notes on a button with emojis' })(() => ({
     component: Button,
     props: {
       text: '😀 😎 👍 💯',
@@ -39,4 +41,4 @@ storiesOf('Another Button', module)
       text: 'Go to Welcome Story',
       onClick: linkTo('Welcome')
     }
-  }))
+  }))
diff --git a/examples/angular-cli/tsconfig.json b/examples/angular-cli/tsconfig.json
@@ -0,0 +1,22 @@
+
+{
+  "compilerOptions": {
+    "baseUrl": "",
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["es6", "dom"],
+    "mapRoot": "./",
+    "module": "es6",
+    "moduleResolution": "node",
+    "outDir": "../dist/out-tsc",
+    "sourceMap": true,
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/lib/cli/test/fixtures/angular-cli/package.json b/lib/cli/test/fixtures/angular-cli/package.json
@@ -38,9 +38,9 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
     "karma-remap-istanbul": "^0.2.1",
-    "protractor": "~4.0.13",
+    "protractor": "~5.1.0",
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
-    "typescript": "~2.0.3"
+    "typescript": "~2.5.3"
   }
 }
diff --git a/lib/cli/test/snapshots/angular-cli/package.json b/lib/cli/test/snapshots/angular-cli/package.json
@@ -40,10 +40,10 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
     "karma-remap-istanbul": "^0.2.1",
-    "protractor": "~4.0.13",
+    "protractor": "~5.1.0",
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
-    "typescript": "~2.0.3",
+    "typescript": "~2.5.3",
     "@storybook/angular": "^3.3.0-alpha.0"
   }
 }