Merge remote-tracking branch 'origin/next' into typescript-poc

# Conflicts: # addons/notes/package.json # package.json # yarn.lock
mcaj-admin · Dec 8, 2018 · 73f4715 · 73f4715
2 parents 2d00ee6 + aac9138
commit 73f4715
Show file tree

Hide file tree

Showing 312 changed files with 14,431 additions and 6,046 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.babelrc.js b/.babelrc.js
@@ -0,0 +1,50 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', modules: false }],
+    '@babel/preset-react',
+    '@babel/preset-flow',
+  ],
+  plugins: [
+    'babel-plugin-emotion',
+    'babel-plugin-macros',
+    '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-proposal-object-rest-spread',
+    '@babel/plugin-proposal-export-default-from',
+  ],
+  env: {
+    test: {
+      presets: [['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage' }]],
+      plugins: ['babel-plugin-require-context-hook', 'babel-plugin-dynamic-import-node'],
+    },
+  },
+  overrides: [
+    {
+      test: './examples/vue-kitchen-sink',
+      presets: ['babel-preset-vue'],
+    },
+    {
+      test: [
+        './lib/core/src/server',
+        './lib/node-logger',
+        './lib/codemod',
+        './addons/storyshots',
+        './addons/storysource/src/loader',
+        './app/**/src/server/**',
+        './app/**/src/bin/**',
+        './dangerfile.js',
+      ],
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            shippedProposals: true,
+            useBuiltIns: 'usage',
+            targets: {
+              node: '8.11',
+            },
+          },
+        ],
+      ],
+    },
+  ],
+};
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,5 @@
 dist
+lib/**/dll
 build
 coverage
 node_modules

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -123,6 +123,12 @@ module.exports = {
     ],
   },
   overrides: [
+    {
+      files: ['**/__tests__/**', '**/*.test.js/**', '**/*.spec.js/**'],
+      rules: {
+        'import/no-extraneous-dependencies': ignore,
+      },
+    },
     {
       files: ['**/react-native*/**', '**/REACT_NATIVE*/**', '**/crna*/**'],
       rules: {

diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ integration/__image_snapshots__/__diff_output__
 .jest-test-results.json
 /examples/cra-kitchen-sink/src/__image_snapshots__/__diff_output__/
 lib/*.jar
+lib/**/dll
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt
@@ -17,6 +17,7 @@ object OpenSourceProjects_Storybook_Bootstrap : BuildType({
         addons/storyshots/*/dist/** => dist.zip/addons/storyshots
         app/*/dist/** => dist.zip/app
         lib/*/dist/** => dist.zip/lib
+        lib/core/dll/** => dist.zip/lib/core/dll
     """.trimIndent()
 
     vcs {

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
@@ -12,10 +12,10 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
     name = "Examples"
 
     artifactRules = """
-${StorybookApp.values().map { it.artifactPath }.joinToString("\n")}
-examples/official-storybook/storybook-static => official.zip
-examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapshots
-""".trimIndent()
+        ${StorybookApp.values().map { it.artifactPath }.joinToString("\n")}
+        examples/official-storybook/storybook-static => official.zip
+        examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapshots
+    """.trimIndent()
 
     vcs {
         root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt
@@ -82,7 +82,9 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
                 }
 
                 artifacts {
-                    artifactRules = "dist.zip!**"
+                    artifactRules = """
+                        dist.zip!**
+                    """.trimIndent()
                 }
             }
         }

diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -15,6 +15,7 @@
 |[links](addons/links)                       |+|+|+|+|+|+|+| |+|+|+|
 |[notes](addons/notes)                       |+|+*|+|+|+|+|+| |+|+|+|
 |[options](addons/options)                   |+|+|+|+|+|+|+| |+|+|+|
+|[cssresources](addons/cssresources)         |+| |+|+|+|+|+|+|+|+|+|
 |[storyshots](addons/storyshots)             |+|+|+|+| | |+| |+|+| |
 |[storysource](addons/storysource)           |+| |+|+|+|+|+|+|+|+|+|
 |[viewport](addons/viewport)                 |+| |+|+|+|+|+|+|+|+|+|