CHANGE the now config

rmccue · Sep 10, 2019 · 3b4a784 · 3b4a784
1 parent 36aa74a
commit 3b4a784
Show file tree

Hide file tree

Showing 24 changed files with 152 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,5 @@ scripts/storage
 htpasswd
 /false
 storybook-out
-/addons/docs/common/config-*
+/addons/docs/common/config-*
+built-storybooks
diff --git a/addons/centered/src/rax.js b/addons/centered/src/rax.js
@@ -3,7 +3,7 @@
 import { createElement } from 'rax';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import View from 'rax-view';
-import { makeDecorator } from '@storybook/addons/src/make-decorator';
+import { makeDecorator } from '@storybook/addons';
 import parameters from './parameters';
 import styles from './styles';
 

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -5,10 +5,10 @@
   "license": "MIT",
   "scripts": {
     "build": "ng build",
-    "build-storybook": "npm run storybook:prebuild && build-storybook -s src/assets",
+    "prebuild-storybook": "npm run storybook:prebuild && cd ../.. && yarn add node-sass -W -s && cd examples/angular-cli",
+    "build-storybook": "build-storybook -s src/assets",
     "e2e": "ng e2e",
     "ng": "ng",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "start": "ng serve",
     "storybook": "npm run storybook:prebuild && start-storybook -p 9008 -s src/assets",
     "storybook:prebuild": "npm run test:generate-output",
@@ -26,6 +26,7 @@
     "@angular/platform-browser-dynamic": "^7.2.6",
     "@ngrx/store": "^7.2.0",
     "core-js": "^3.0.1",
+    "node-sass": "^4.12.0",
     "rxjs": "^6.3.3",
     "rxjs-compat": "^6.4.0",
     "zone.js": "^0.8.29"

diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
@@ -6,7 +6,6 @@
     "build": "react-scripts build",
     "build-storybook": "build-storybook -s public",
     "eject": "react-scripts eject",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "start": "react-scripts start",
     "storybook": "start-storybook -p 9010 -s public",
     "test": "react-scripts test --env=jsdom"

diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
@@ -14,7 +14,6 @@
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9009 -s public",
     "build-storybook": "build-storybook -s public"
   },

diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
@@ -5,7 +5,6 @@
   "scripts": {
     "build-storybook": "build-storybook -s public",
     "lint": "tslint src/**/*.ts{,x}",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9010 -s public",
     "test": "react-scripts test --env=jsdom"
   },

diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json
@@ -3,8 +3,7 @@
   "version": "5.2.0-rc.10",
   "private": true,
   "scripts": {
-    "build-storybook": "build-storybook -c ./ -s built-storybooks",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
+    "build-storybook": "build-storybook -c ./",
     "storybook": "start-storybook -p 9011 -c ./"
   },
   "devDependencies": {

diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "scripts": {
     "build": "ember build",
-    "build-storybook": "yarn build && cp -r public/* dist && build-storybook -s dist",
+    "prebuild-storybook": "yarn build && cp -r public/* dist",
+    "build-storybook": "build-storybook -s dist",
     "dev": "ember serve",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "yarn build && start-storybook -p 9009 -s dist",
     "storybook:dev": "yarn dev & start-storybook -p 9009 -s dist"
   },

diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json
@@ -10,7 +10,6 @@
   "scripts": {
     "build-storybook": "build-storybook",
     "generate-addon-jest-testresults": "jest --config=tests/addon-jest.config.json --json --outputFile=stories/addon-jest.testresults.json",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {

diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json
@@ -12,7 +12,6 @@
   "scripts": {
     "build": "NODE_ENV=production marko-starter build",
     "build-storybook": "build-storybook",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "prettier": "prettier src/**/*.{js,css,less} *.js --write",
     "serve-static": "NODE_ENV=production marko-starter serve-static",
     "start": "marko-starter server",

diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9007"
   },
   "dependencies": {

diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
@@ -3,13 +3,12 @@
   "version": "5.2.0-rc.10",
   "private": true,
   "scripts": {
-    "build-storybook": "build-storybook -c ./ -s built-storybooks",
+    "build-storybook": "build-storybook -c ./",
     "chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code ab7m45tp9p",
     "do-image-snapshots": "../../node_modules/.bin/jest --projects=./image-snapshots",
     "generate-addon-jest-testresults": "jest --config=tests/addon-jest.config.json --json --outputFile=stories/addon-jest.testresults.json",
     "graphql": "node ./graphql-server/index.js",
     "image-snapshots": "yarn run build-storybook && yarn run do-image-snapshots",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ -s built-storybooks --no-dll",
     "packtracker": "yarn storybook --smoke-test --quiet && cross-env PT_PROJECT_TOKEN=1af1d41b-d737-41d4-ac00-53c8f3913b53 packtracker-upload --stats=./node_modules/.cache/storybook/manager-stats.json"
   },

diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "start": "webpack-dev-server",
     "storybook": "start-storybook -p 9001 -c .storybook"
   },

diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json
@@ -6,7 +6,6 @@
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
     "build-storybook": "build-storybook -s public",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9009 -s public"
   },
   "dependencies": {

diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json
@@ -3,14 +3,13 @@
   "version": "5.2.0-rc.10",
   "private": true,
   "scripts": {
-    "test:generate-output": "jest --json --outputFile=jest-test-results.json --config=./jest-addon.config.js",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
+    "test:generate-output": "jest --json --outputFile=jest-test-results.json --config=./jest-addon.config.js -u",
     "test": "jest",
     "start": "rax-scripts start",
     "build": "rax-scripts build",
     "storybook": "start-storybook -p 9009 -s public",
     "prestorybook": "npm run test:generate-output",
-    "prebuild:storybook": "npm run test:generate-output",
+    "prebuild-storybook": "npm run test:generate-output",
     "build-storybook": "build-storybook -s public"
   },
   "dependencies": {

diff --git a/examples/rax-kitchen-sink/src/components/App/__snapshots__/App.test.js.snap b/examples/rax-kitchen-sink/src/components/App/__snapshots__/App.test.js.snap
@@ -17,7 +17,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 32,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",
@@ -46,7 +45,6 @@ Object {
         "flexDirection": "column",
         "flexShrink": 0,
         "fontSize": 32,
-        "position": "relative",
         "whiteSpace": "pre-wrap",
       },
       "tagName": "SPAN",

diff --git a/examples/rax-kitchen-sink/src/components/Welcome/__snapshots__/Welcome.test.js.snap b/examples/rax-kitchen-sink/src/components/Welcome/__snapshots__/Welcome.test.js.snap
@@ -17,7 +17,6 @@ Object {
         "fontSize": 40,
         "fontWeight": "bold",
         "lineHeight": 50,
-        "position": "relative",
         "whiteSpace": "pre-wrap",
       },
       "tagName": "SPAN",
@@ -57,7 +56,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 12,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",
@@ -89,7 +87,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 12,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",
@@ -121,7 +118,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 12,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",
@@ -158,7 +154,6 @@ Object {
                 "flexDirection": "column",
                 "flexShrink": 0,
                 "fontSize": 12,
-                "position": "relative",
                 "whiteSpace": "pre-wrap",
               },
               "tagName": "SPAN",
@@ -203,7 +198,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 12,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",
@@ -235,7 +229,6 @@ Object {
             "flexDirection": "column",
             "flexShrink": 0,
             "fontSize": 12,
-            "position": "relative",
             "whiteSpace": "pre-wrap",
           },
           "tagName": "SPAN",

diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json
@@ -6,7 +6,6 @@
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
     "build-storybook": "build-storybook -s public",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9009 -s public"
   },
   "dependencies": {

diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook -s public",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9009 -s public"
   },
   "dependencies": {

diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -6,7 +6,6 @@
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
     "build-storybook": "build-storybook -s public",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet",
     "storybook": "start-storybook -p 9009 -s public"
   },
   "dependencies": {

diff --git a/now.json b/now.json
@@ -4,78 +4,13 @@
   "public": true,
   "builds": [
     {
-      "src": "examples/angular-cli/package.json",
+      "src": "package.json",
       "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/cra-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/cra-ts-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/ember-cli/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/html-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/marko-cli/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/mithril-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/official-storybook/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/polymer-cli/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/preact-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/riot-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/svelte-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/vue-kitchen-sink/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
-    },
-    {
-      "src": "examples/cra-react15/package.json",
-      "use": "@now/static-build",
-      "config": { "distDir": "storybook-static" }
+      "config": { "distDir": "out" }
     }
   ],
   "routes": [
     { "src": "/docs", "dest": "https://storybook.js.org" },
-    { "src": "/(.*)", "dest": "/examples/$1" }
+    { "src": "/(.*)", "dest": "/out/$1" }
   ]
 }
diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json,.html,.ts,.tsx,.mjs --report-unused-disable-directives",
     "lint:md": "remark -q",
     "lint:package": "sort-package-json",
+    "now-build": "./scripts/now.js",
     "publish:crna": "yarn --cwd examples-native/crna-kitchen-sink expo publish",
     "publish:debug": "npm run publish:latest -- --npm-tag=debug --no-push",
     "publish:latest": "lerna publish --exact --concurrency 1 --force-publish",
@@ -210,6 +211,7 @@
     "react-dom": "^16.8.3",
     "react-test-renderer": "^16.8.3",
     "react-testing-library": "^6.0.0",
+    "recursive-copy": "^2.0.10",
     "regenerator-runtime": "^0.12.1",
     "remark-cli": "^6.0.1",
     "remark-lint": "^6.0.4",