Merge pull request #4409 from storybooks/pksunkara/maintenance

Change crna-kitchen-sink path and Some CI maintenance

.circleci/config.yml

@@ -36,21 +36,11 @@ jobs:
           root: .
           paths:
             - node_modules
-            - examples/angular-cli/node_modules
-            - examples/ember-cli/node_modules
-            - examples/cra-kitchen-sink/node_modules
-            - examples/mithril-kitchen-sink/node_modules
-            - examples/official-storybook/node_modules
-            - examples/polymer-cli/node_modules
-            - examples/vue-kitchen-sink/node_modules
-            - examples/svelte-kitchen-sink/node_modules
-            - examples/marko-cli/node_modules
-            - examples/html-kitchen-sink/node_modules
-            - examples/riot-kitchen-sink/node_modules
+            - examples
             - addons
             - app
             - lib
-  example-kitchen-sinks:
+  examples:
     <<: *defaults
     steps:
       - checkout
@@ -176,7 +166,7 @@ jobs:
           command: |
             cd examples/riot-kitchen-sink
             yarn storybook --smoke-test
-  react-native:
+  native-smoke-tests:
     <<: *defaults
     steps:
       - checkout
@@ -188,7 +178,7 @@ jobs:
       - run:
           name: Run React-Native-App example
           command: |
-            cd examples/crna-kitchen-sink
+            cd examples-native/crna-kitchen-sink
             yarn storybook --smoke-test
   docs:
     <<: *defaults
@@ -227,7 +217,7 @@ jobs:
       - run:
           name: Lint
           command: yarn lint
-  unit-test:
+  test:
     <<: *defaults
     steps:
       - checkout
@@ -249,7 +239,7 @@ jobs:
       - run:
           name: Upload coverage
           command: yarn coverage
-  cli:
+  cli-test:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -261,7 +251,7 @@ jobs:
           name: Test
           command: yarn test --cli
           no_output_timeout: 1800
-  cli-latest-cra:
+  cli-test-latest-cra:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -282,24 +272,24 @@ workflows:
           requires:
             - docs
             - build
-      - example-kitchen-sinks:
+      - examples:
           requires:
             - build
       - smoke-tests:
           requires:
             - build
-      - react-native:
+      - native-smoke-tests:
           requires:
             - build
-      - unit-test:
+      - test:
           requires:
             - build
       - coverage:
           requires:
-            - unit-test
-      - cli:
+            - test
+      - cli-test:
           requires:
             - build
-      - cli-latest-cra:
+      - cli-test-latest-cra:
           requires:
             - build

.eslintrc.js

@@ -57,6 +57,7 @@ module.exports = {
       {
         devDependencies: [
           'examples/**',
+          'examples-native/**',
           '**/example/**',
           '*.js',
           '**/*.test.js',

.github/CODEOWNERS

@@ -28,12 +28,13 @@
 
 /examples/angular-cli/ @igor-dv @alterx
 /examples/cra-kitchen-sink/ @ndelangen @UsulPro @hypnosphi
-/examples/crna-kitchen-sink/ @Gongreg @danielduan
 /examples/official-storybook/ @hypnosphi @danielduan @UsulPro
 /examples/polymer-cli/ @naipath @igor-dv
 /examples/vue-kitchen-sink/ @igor-dv @alexandrebodin
 /examples/svelte-kitchen-sink/ @plumpNation
 
+/examples-native/crna-kitchen-sink/ @Gongreg @danielduan
+
 /lib/addons/ @ndelangen @theinterned
 /lib/channel-postmessage/ @mnmtanish @ndelangen
 /lib/channel-websocket/ @mnmtanish @ndelangen

.teamcity/OpenSourceProjects_Storybook/Project.kt

@@ -21,7 +21,7 @@ object Project : Project({
     buildType(OpenSourceProjects_Storybook_CliTestLatestCra)
     buildType(OpenSourceProjects_Storybook_Examples)
     buildType(OpenSourceProjects_Storybook_Danger)
-    buildType(OpenSourceProjects_Storybook_ReactNative)
+    buildType(OpenSourceProjects_Storybook_NativeSmokeTests)
     buildType(OpenSourceProjects_Storybook_Docs)
     buildType(OpenSourceProjects_Storybook_Build_2)
     buildType(OpenSourceProjects_Storybook_CliTest)

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt

@@ -32,7 +32,6 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
-                +:dependencies.io-*
                 +:snyk-fix-*
             """.trimIndent()
         }
@@ -65,7 +64,6 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
         }
         merge {
             branchFilter = """
-                +:dependencies.io-*
                 +:snyk-fix-*
             """.trimIndent()
             destinationBranch = "<default>"
@@ -89,7 +87,7 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
         }
-        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_ReactNative) {
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_NativeSmokeTests) {
             snapshot {
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt → .teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_NativeSmokeTests.kt

@@ -4,10 +4,10 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.*
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
 
-object OpenSourceProjects_Storybook_ReactNative : BuildType({
+object OpenSourceProjects_Storybook_NativeSmokeTests : BuildType({
     uuid = "ac276912-df1a-44f1-8de2-056276193ce8"
-    id = "OpenSourceProjects_Storybook_ReactNative"
-    name = "React Native"
+    id = "OpenSourceProjects_Storybook_NativeSmokeTests"
+    name = "Native Smoke Tests"
 
     params {
         param("env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD", "true")
@@ -31,7 +31,7 @@ object OpenSourceProjects_Storybook_ReactNative : BuildType({
         script {
             name = "crna-kitchen-sink"
             scriptContent = """
-                cd examples/crna-kitchen-sink
+                cd examples-native/crna-kitchen-sink
                 yarn storybook --smoke-test
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"

package.json

@@ -11,19 +11,12 @@
     "addons/storyshots/*",
     "app/*",
     "lib/*",
-    "examples/*-cli",
-    "examples/cra-kitchen-sink",
-    "examples/html-kitchen-sink",
-    "examples/mithril-kitchen-sink",
-    "examples/official-storybook",
-    "examples/riot-kitchen-sink",
-    "examples/svelte-kitchen-sink",
-    "examples/vue-kitchen-sink",
+    "examples/*",
     "lib/cli/test/run/*"
   ],
   "scripts": {
     "bootstrap": "node ./scripts/bootstrap.js",
-    "bootstrap:crna-kitchen-sink": "npm --prefix examples/crna-kitchen-sink install",
+    "bootstrap:crna-kitchen-sink": "npm --prefix examples-native/crna-kitchen-sink install",
     "bootstrap:docs": "yarn install --cwd docs",
     "build-packs": "lerna exec --scope '@storybook/*' --parallel -- \\$LERNA_ROOT_PATH/scripts/build-pack.sh \\$LERNA_ROOT_PATH/packs",
     "build-storybooks": "./scripts/build-storybooks.sh",

scripts/netlify-build.sh

@@ -84,14 +84,6 @@ elif [ "$BUILD_CONTEXT" = "OFFICIAL" ]; then
   yarn build-storybook
   mv storybook-static ../../netlify-build
   popd
-elif [ "$BUILD_CONTEXT" = "HYPERAPP" ]; then
-  # TEMP so we don't get broken builds from netlify
-  echo "netlify-build hyperapp examples"
-  pushd examples/official-storybook
-  yarn
-  yarn build-storybook
-  mv storybook-static ../../netlify-build
-  popd
 elif [ "$BUILD_CONTEXT" = "RIOT" ]; then
   echo "netlify-build riot examples"
   pushd examples/riot-kitchen-sink

scripts/test.js

@@ -63,7 +63,7 @@ const tasks = {
   //   )}`,
   //   defaultValue: false,
   //   option: '--reactnativeapp',
-  //   projectLocation: './examples/crna-kitchen-sink',
+  //   projectLocation: './examples-native/crna-kitchen-sink',
   //   isJest: true,
   // }),
   cli: createProject({