GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-03-20 05:02:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updating angular version to latest beta and fixing errors regarding @types/node dependencies

Browse Source 
Downgraded the version of `@types/node` used for the knobs addon. There's a well known issue with TS + lerna repositories (hoisted deps and symlinks). This fixes the issue for the time being.

Signed-off-by: Carlos Vega <clmvega@gmail.com>
This commit is contained in:
Carlos Vega 2017-08-11 15:15:33 -06:00 committed by Norbert de Langen
parent fe1abbc8c6
commit c05e5303ca
17 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/knobs/package.json
View File

@ -29,7 +29,7 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/node": "^7.0.12",
"@types/node": "~6.0.60",
"@types/react": "^15.0.21",
"git-url-parse": "^6.2.2",
"raw-loader": "^0.5.1",

4
app/angular/README.md
View File

@ -33,8 +33,6 @@ For more information visit: [storybook.js.org](https://storybook.js.org)
Storybook also comes with a lot of [addons](https://storybook.js.org/addons/introduction) and a great API to customize as you wish.
You can also build a [static version](https://storybook.js.org/basics/exporting-storybook) of your storybook and deploy it anywhere you want.
## Angular Notes
- This is currently at a very experimental stage!
- This is currently at a very experimental stage!

14
app/angular/package.json
View File

@ -22,11 +22,11 @@
"prepublish": "node ../../scripts/prepublish.js"
},
"dependencies": {
"@angular/common": "^4.2.0",
"@angular/compiler": "^4.2.0",
"@angular/core": "^4.2.0",
"@angular/platform-browser": "^4.2.0",
"@angular/platform-browser-dynamic": "^4.2.0",
"@angular/common": "^5.0.0-beta.3",
"@angular/compiler": "^5.0.0-beta.3",
"@angular/core": "^5.0.0-beta.3",
"@angular/platform-browser": "^5.0.0-beta.3",
"@angular/platform-browser-dynamic": "^5.0.0-beta.3",
"@storybook/addon-actions": "^3.2.0-alpha.7",
"@storybook/addon-links": "^3.2.0-alpha.5",
"@storybook/addons": "^3.1.6",
@ -68,7 +68,7 @@
"react-modal": "^1.7.7",
"redux": "^3.6.0",
"request": "^2.81.0",
"rxjs": "^5.1.0",
"rxjs": "^5.4.2",
"serve-favicon": "^2.4.3",
"shelljs": "^0.7.8",
"style-loader": "^0.17.0",
@ -79,7 +79,7 @@
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0",
"zone.js": "^0.8.4"
"zone.js": "^0.8.14"
},
"devDependencies": {
"babel-cli": "^6.24.1",

11
examples/angular-cli/.angular-cli.json
View File

@ -1,7 +1,7 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "angular-test"
"name": "ng5test"
},
"apps": [
{
@ -36,13 +36,16 @@
},
"lint": [
{
"project": "src/tsconfig.app.json"
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json"
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json"
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {

1
examples/angular-cli/.gitignore vendored
View File

@ -32,6 +32,7 @@
npm-debug.log
testem.log
/typings
yarn-error.log
# e2e
/e2e/*.js

6
examples/angular-cli/README.md
View File

@ -1,6 +1,6 @@
# AngularTest
# Ng5test
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.0.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.3.0.
## Development server
@ -8,7 +8,7 @@ Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app w
## Code scaffolding
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
## Build

10
examples/angular-cli/e2e/app.e2e-spec.ts
View File

@ -1,14 +1,14 @@
import { AngularTestPage } from './app.po';
import { AppPage } from './app.po';
describe('angular-test App', () => {
let page: AngularTestPage;
describe('ng5test App', () => {
let page: AppPage;
beforeEach(() => {
page = new AngularTestPage();
page = new AppPage();
});
it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to app!!');
expect(<any>(page.getParagraphText())).toEqual('Welcome to app!');
});
});

2
examples/angular-cli/e2e/app.po.ts
View File

@ -1,6 +1,6 @@
import { browser, by, element } from 'protractor';
export class AngularTestPage {
export class AppPage {
navigateTo() {
return browser.get('/');
}

1
examples/angular-cli/e2e/tsconfig.e2e.json
View File

@ -2,6 +2,7 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
"module": "commonjs",
"target": "es5",
"types": [

35
examples/angular-cli/package.json
View File

@ -1,5 +1,5 @@
{
"name": "angular-test",
"name": "ng5test",
"version": "0.0.0",
"license": "MIT",
"scripts": {
@ -14,30 +14,31 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.0.0",
"@angular/common": "^4.2.0",
"@angular/compiler": "^4.2.0",
"@angular/core": "^4.2.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/platform-browser": "^4.2.0",
"@angular/platform-browser-dynamic": "^4.2.0",
"@angular/router": "^4.0.0",
"@angular/animations": "^5.0.0-beta.3",
"@angular/common": "^5.0.0-beta.3",
"@angular/compiler": "^5.0.0-beta.3",
"@angular/core": "^5.0.0-beta.3",
"@angular/forms": "^5.0.0-beta.3",
"@angular/http": "^5.0.0-beta.3",
"@angular/platform-browser": "^5.0.0-beta.3",
"@angular/platform-browser-dynamic": "^5.0.0-beta.3",
"@angular/router": "^5.0.0-beta.3",
"core-js": "^2.4.1",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
},
"devDependencies": {
"@angular/cli": "1.2.0",
"@angular/compiler-cli": "^4.0.0",
"@angular/language-service": "^4.0.0",
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "^5.0.0-beta.3",
"@angular/language-service": "^5.0.0-beta.3",
"@storybook/addon-actions": "^3.2.0",
"@storybook/addon-links": "^3.2.0",
"@storybook/addon-notes": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/angular": "3.2.0-alpha.7",
"@types/jasmine": "2.5.45",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
"codelyzer": "^3.1.2",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
@ -48,7 +49,7 @@
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2",
"ts-node": "~3.0.4",
"ts-node": "~3.2.0",
"tslint": "~5.3.2",
"typescript": "^2.4.0"
}

4
examples/angular-cli/src/app/app.component.html
View File

@ -1,7 +1,7 @@
<!--The content below is only a placeholder and can be replaced.-->
<div style="text-align:center">
<h1>
Welcome to {{title}}!!
Welcome to {{title}}!
</h1>
<img width="300" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo=">
</div>
@ -14,7 +14,7 @@
<h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
</li>
<li>
<h2><a target="_blank" href="http://angularjs.blogspot.ca/">Angular blog</a></h2>
<h2><a target="_blank" href="https://blog.angular.io//">Angular blog</a></h2>
</li>
</ul>

4
examples/angular-cli/src/app/app.component.spec.ts
View File

@ -1,5 +1,5 @@
import { TestBed, async } from '@angular/core/testing';
import 'jasmine';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
@ -27,6 +27,6 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!');
expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
}));
});

2
examples/angular-cli/src/index.html
View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>AngularTest</title>
<title>Ng5test</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">

2
examples/angular-cli/src/tsconfig.app.json
View File

@ -2,8 +2,8 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015",
"baseUrl": "",
"types": []
},
"exclude": [

2
examples/angular-cli/src/tsconfig.spec.json
View File

@ -2,9 +2,9 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
"module": "commonjs",
"target": "es5",
"baseUrl": "",
"types": [
"jasmine",
"node"

3
examples/angular-cli/tsconfig.json
View File

@ -2,7 +2,6 @@
"compileOnSave": false,
"compilerOptions": {
"outDir": "./dist/out-tsc",
"baseUrl": "src",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
@ -13,7 +12,7 @@
"node_modules/@types"
],
"lib": [
"es2016",
"es2017",
"dom"
]
}

11
examples/angular-cli/tslint.json
View File

@ -31,8 +31,14 @@
"member-access": false,
"member-ordering": [
true,
"static-before-instance",
"variables-before-functions"
{
"order": [
"static-field",
"instance-field",
"static-method",
"instance-method"
]
}
],
"no-arg": true,
"no-bitwise": true,
@ -80,6 +86,7 @@
],
"radix": true,
"semicolon": [
true,
"always"
],
"triple-equals": [