diff --git a/packages/storybook/src/builders/storybook/storybook.impl.spec.ts b/packages/storybook/src/builders/storybook/storybook.impl.spec.ts index e69de29bb2..1dea1a8335 100644 --- a/packages/storybook/src/builders/storybook/storybook.impl.spec.ts +++ b/packages/storybook/src/builders/storybook/storybook.impl.spec.ts @@ -0,0 +1,5 @@ +describe('storybook builer', () => { + it('should have a test', () => { + expect(true).toBeTruthy(); + }); +}); diff --git a/packages/storybook/src/schematics/configuration/configuration.spec.ts b/packages/storybook/src/schematics/configuration/configuration.spec.ts index 96cd7b1c24..1e49f1b317 100644 --- a/packages/storybook/src/schematics/configuration/configuration.spec.ts +++ b/packages/storybook/src/schematics/configuration/configuration.spec.ts @@ -1,5 +1,9 @@ import { Tree } from '@angular-devkit/schematics'; -import { readJsonInTree } from '@nrwl/workspace'; +import { + readJsonInTree, + readWorkspaceJson, + getProjectConfig +} from '@nrwl/workspace'; import { createTestUILib, runSchematic } from '../../utils/testing'; import { StorybookConfigureSchema } from './schema'; @@ -24,17 +28,21 @@ describe('schematic:configuration', () => { ).toBeTruthy(); }); - it('should update `angular.json` file', async () => { + it('should update workspace file', async () => { const tree = await runSchematic( 'configuration', { name: 'test-ui-lib' }, appTree ); - const angularJson = readJsonInTree(tree, 'angular.json'); - const project = angularJson.projects['test-ui-lib']; + const project = getProjectConfig(tree, 'test-ui-lib'); expect(project.architect.storybook).toEqual({ builder: '@nrwl/storybook:storybook', + configurations: { + ci: { + quiet: true + } + }, options: { port: 4400, config: { diff --git a/packages/storybook/src/schematics/cypress-project/cypress-project.spec.ts b/packages/storybook/src/schematics/cypress-project/cypress-project.spec.ts index 4b6cfb84dc..77b543d31c 100644 --- a/packages/storybook/src/schematics/cypress-project/cypress-project.spec.ts +++ b/packages/storybook/src/schematics/cypress-project/cypress-project.spec.ts @@ -1,5 +1,5 @@ import { Tree } from '@angular-devkit/schematics'; -import { readJsonInTree } from '@nrwl/workspace'; +import { readJsonInTree, getProjectConfig } from '@nrwl/workspace'; import { createTestUILib, runSchematic } from '../../utils/testing'; describe('schematic:cypress-project', () => { @@ -30,8 +30,7 @@ describe('schematic:cypress-project', () => { { name: 'test-ui-lib' }, appTree ); - const angularJson = readJsonInTree(tree, 'angular.json'); - const project = angularJson.projects['test-ui-lib-e2e']; + const project = getProjectConfig(tree, 'test-ui-lib-e2e'); expect(project.architect.e2e.options.devServerTarget).toEqual( 'test-ui-lib:storybook' diff --git a/packages/storybook/src/schematics/ng-add/ng-add.spec.ts b/packages/storybook/src/schematics/ng-add/ng-add.spec.ts index 7862480f85..f991f0ce8e 100644 --- a/packages/storybook/src/schematics/ng-add/ng-add.spec.ts +++ b/packages/storybook/src/schematics/ng-add/ng-add.spec.ts @@ -18,9 +18,6 @@ describe('ng-add', () => { const packageJson = readJsonInTree(tree, 'package.json'); expect(packageJson.devDependencies['@storybook/angular']).toBeDefined(); expect(packageJson.devDependencies['@storybook/addon-knobs']).toBeDefined(); - expect( - packageJson.devDependencies['@types/storybook__addon-knobs'] - ).toBeDefined(); expect(packageJson.devDependencies['babel-loader']).toBeDefined(); expect(packageJson.devDependencies['@babel/core']).toBeDefined(); }); diff --git a/packages/tao/src/commands/migrate.spec.ts b/packages/tao/src/commands/migrate.spec.ts index 50c7a234eb..93c316a42b 100644 --- a/packages/tao/src/commands/migrate.spec.ts +++ b/packages/tao/src/commands/migrate.spec.ts @@ -307,6 +307,10 @@ describe('Migration', () => { '@nrwl/next': { version: '2.0.0', alwaysAddToPackageJson: false }, '@nrwl/node': { version: '2.0.0', alwaysAddToPackageJson: false }, '@nrwl/react': { version: '2.0.0', alwaysAddToPackageJson: false }, + '@nrwl/storybook': { + version: '2.0.0', + alwaysAddToPackageJson: false + }, '@nrwl/tao': { version: '2.0.0', alwaysAddToPackageJson: false }, '@nrwl/web': { version: '2.0.0', alwaysAddToPackageJson: false } } diff --git a/packages/tao/src/commands/migrate.ts b/packages/tao/src/commands/migrate.ts index 668b3fc04f..689d606f9a 100644 --- a/packages/tao/src/commands/migrate.ts +++ b/packages/tao/src/commands/migrate.ts @@ -183,6 +183,7 @@ export class Migrator { '@nrwl/next', '@nrwl/node', '@nrwl/react', + '@nrwl/storybook', '@nrwl/tao', '@nrwl/web' ].reduce( diff --git a/scripts/build.sh b/scripts/build.sh index 1611915344..b9ac54e494 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -49,6 +49,7 @@ cp README.md build/packages/next cp README.md build/packages/angular cp README.md build/packages/jest cp README.md build/packages/cypress +cp README.md build/packages/storybook cp README.md build/packages/cli cp README.md build/packages/tao cp README.md build/packages/eslint-plugin-nx @@ -68,6 +69,7 @@ cp LICENSE build/packages/next cp LICENSE build/packages/angular cp LICENSE build/packages/jest cp LICENSE build/packages/cypress +cp LICENSE build/packages/storybook cp LICENSE build/packages/cli cp LICENSE build/packages/tao cp LICENSE build/packages/eslint-plugin-nx diff --git a/scripts/nx-release.js b/scripts/nx-release.js index e5e20c394c..2331d5ce3b 100755 --- a/scripts/nx-release.js +++ b/scripts/nx-release.js @@ -150,6 +150,7 @@ const options = { 'build/npm/create-nx-workspace/package.json', 'build/npm/jest/package.json', 'build/npm/cypress/package.json', + 'build/npm/storybook/package.json', 'build/npm/angular/package.json', 'build/npm/react/package.json', 'build/npm/next/package.json', diff --git a/scripts/package.sh b/scripts/package.sh index ca81a0e412..0c7d211ba4 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -16,14 +16,14 @@ fi cd build/packages if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i "" "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" {react,next,web,jest,node,express,nest,cypress,angular,workspace}/src/utils/versions.js - sed -i "" "s|\*|$NX_VERSION|g" {schematics,react,next,web,jest,node,express,nest,cypress,angular,workspace,cli,linter,tao,eslint-plugin-nx,create-nx-workspace}/package.json + sed -i "" "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" {react,next,web,jest,node,express,nest,cypress,storybook,angular,workspace}/src/utils/versions.js + sed -i "" "s|\*|$NX_VERSION|g" {schematics,react,next,web,jest,node,express,nest,cypress,storybook,angular,workspace,cli,linter,tao,eslint-plugin-nx,create-nx-workspace}/package.json sed -i "" "s|NX_VERSION|$NX_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js sed -i "" "s|ANGULAR_CLI_VERSION|$ANGULAR_CLI_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js sed -i "" "s|TYPESCRIPT_VERSION|$TYPESCRIPT_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js else - sed -i "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" {react,next,web,jest,node,express,nest,cypress,angular,workspace}/src/utils/versions.js - sed -i "s|\*|$NX_VERSION|g" {schematics,react,next,web,jest,node,express,nest,cypress,angular,workspace,cli,linter,tao,eslint-plugin-nx,create-nx-workspace}/package.json + sed -i "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" {react,next,web,jest,node,express,nest,cypress,storybook,angular,workspace}/src/utils/versions.js + sed -i "s|\*|$NX_VERSION|g" {schematics,react,next,web,jest,node,express,nest,cypress,storybook,angular,workspace,cli,linter,tao,eslint-plugin-nx,create-nx-workspace}/package.json sed -i "s|NX_VERSION|$NX_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js sed -i "s|ANGULAR_CLI_VERSION|$ANGULAR_CLI_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js sed -i "s|TYPESCRIPT_VERSION|$TYPESCRIPT_VERSION|g" create-nx-workspace/bin/create-nx-workspace.js @@ -31,9 +31,9 @@ fi if [[ $NX_VERSION == "*" ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then - sed -E -i "" "s|\"@nrwl\/([^\"]+)\": \"\\*\"|\"@nrwl\/\1\": \"file:$PWD\/\1\"|" {schematics,jest,web,react,next,node,express,nest,cypress,angular,workspace,linter,cli,tao,eslint-plugin-nx,create-nx-workspace}/package.json + sed -E -i "" "s|\"@nrwl\/([^\"]+)\": \"\\*\"|\"@nrwl\/\1\": \"file:$PWD\/\1\"|" {schematics,jest,web,react,next,node,express,nest,cypress,storybook,angular,workspace,linter,cli,tao,eslint-plugin-nx,create-nx-workspace}/package.json else echo $PWD - sed -E -i "s|\"@nrwl\/([^\"]+)\": \"\\*\"|\"@nrwl\/\1\": \"file:$PWD\/\1\"|" {schematics,jest,web,react,next,node,express,nest,cypress,angular,workspace,linter,cli,tao,eslint-plugin-nx,create-nx-workspace}/package.json + sed -E -i "s|\"@nrwl\/([^\"]+)\": \"\\*\"|\"@nrwl\/\1\": \"file:$PWD\/\1\"|" {schematics,jest,web,react,next,node,express,nest,cypress,storybook,angular,workspace,linter,cli,tao,eslint-plugin-nx,create-nx-workspace}/package.json fi fi diff --git a/scripts/test.sh b/scripts/test.sh index 7ba5e5f7a4..66a6c003ac 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -3,5 +3,5 @@ if [ -n "$1" ]; then jest --maxWorkers=1 ./build/packages/$1.spec.js else - jest --maxWorkers=1 ./build/packages/{schematics,bazel,builders,react,jest,web,node,express,nest,cypress,angular,workspace,tao,eslint-plugin-nx,next} --passWithNoTests + jest --maxWorkers=1 ./build/packages/{schematics,bazel,builders,react,jest,web,node,express,nest,cypress,storybook,angular,workspace,tao,eslint-plugin-nx,next} --passWithNoTests fi