source-loader: separate server and client code (#7510)

source-loader: separate server and client code
storybookjs · Jul 21, 2019 · 8a21f97 · 8a21f97 · vercel · Jul 21, 2019
2 parents 3fdc615 + 08ac213
commit 8a21f97
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 17 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -54,7 +54,6 @@ module.exports = {
     },
     {
       test: './lib',
-      exclude: './addons/storysource/src/loader',
       presets: [
         ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
         '@babel/preset-react',
@@ -75,14 +74,11 @@ module.exports = {
     },
     {
       test: [
-        './lib/core/src/server',
         './lib/node-logger',
         './lib/codemod',
-        './lib/source-loader/src',
         './addons/storyshots',
-        './addons/storysource/src/loader',
-        './app/**/src/server/**',
-        './app/**/src/bin/**',
+        '**/src/server/**',
+        '**/src/bin/**',
       ],
       presets: [
         [

diff --git a/lib/source-loader/package.json b/lib/source-loader/package.json
@@ -16,8 +16,8 @@
     "directory": "lib/source-loader"
   },
   "license": "MIT",
-  "main": "dist/index.js",
-  "jsnext:main": "src/index.js",
+  "main": "dist/server/index.js",
+  "jsnext:main": "src/server/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },

diff --git a/lib/source-loader/preview.js b/lib/source-loader/preview.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/preview');
diff --git a/lib/source-loader/src/events.js → lib/source-loader/src/client/events.js b/lib/source-loader/src/events.js → lib/source-loader/src/client/events.js
diff --git a/lib/source-loader/src/preview.js → lib/source-loader/src/client/preview.js b/lib/source-loader/src/preview.js → lib/source-loader/src/client/preview.js
diff --git a/lib/source-loader/src/index.js b/lib/source-loader/src/index.js
diff --git a/...snapshots__/inject-decorator.test.js.snap → ...snapshots__/inject-decorator.test.js.snap b/...snapshots__/inject-decorator.test.js.snap → ...snapshots__/inject-decorator.test.js.snap
@@ -866,7 +866,7 @@ storiesOf('Foo', module)
 `;
 
 exports[`inject-decorator will not change the source when there are no "storiesOf" functions 1`] = `
-"var addSourceDecorator = require(\\"@storybook/source-loader/dist/preview\\").addSource;
+"var addSourceDecorator = require(\\"@storybook/source-loader/preview\\").addSource;
 while(true) {
   console.log(\\"it's a kind of magic\\");
 }"

diff --git a/...c/abstract-syntax-tree/default-options.js → ...r/abstract-syntax-tree/default-options.js b/...c/abstract-syntax-tree/default-options.js → ...r/abstract-syntax-tree/default-options.js
diff --git a/.../abstract-syntax-tree/generate-helpers.js → .../abstract-syntax-tree/generate-helpers.js b/.../abstract-syntax-tree/generate-helpers.js → .../abstract-syntax-tree/generate-helpers.js
@@ -68,7 +68,7 @@ const STORY_DECORATOR_STATEMENT =
 const ADD_PARAMETERS_STATEMENT =
   '.addParameters({ storySource: { source: __STORY__, locationsMap: __ADDS_MAP__ } })';
 const IMPORT_DECLARATION_FOR_EXPORTED_STORIES_DECORATOR =
-  'var addSourceDecorator = require("@storybook/source-loader/dist/preview").addSource;\n';
+  'var addSourceDecorator = require("@storybook/source-loader/preview").addSource;\n';
 const applyExportDecoratorStatement = part =>
   ` addSourceDecorator(${part}, {__STORY__, __ADDS_MAP__,__MAIN_FILE_LOCATION__,__MODULE_DEPENDENCIES__,__LOCAL_DEPENDENCIES__,__SOURCE_PREFIX__,__IDS_TO_FRAMEWORKS__});`;
 

diff --git a/.../abstract-syntax-tree/inject-decorator.js → .../abstract-syntax-tree/inject-decorator.js b/.../abstract-syntax-tree/inject-decorator.js → .../abstract-syntax-tree/inject-decorator.js
diff --git a/...ract-syntax-tree/inject-decorator.test.js → ...ract-syntax-tree/inject-decorator.test.js b/...ract-syntax-tree/inject-decorator.test.js → ...ract-syntax-tree/inject-decorator.test.js
diff --git a/...src/abstract-syntax-tree/parse-helpers.js → ...ver/abstract-syntax-tree/parse-helpers.js b/...src/abstract-syntax-tree/parse-helpers.js → ...ver/abstract-syntax-tree/parse-helpers.js
diff --git a/...src/abstract-syntax-tree/parsers/index.js → ...ver/abstract-syntax-tree/parsers/index.js b/...src/abstract-syntax-tree/parsers/index.js → ...ver/abstract-syntax-tree/parsers/index.js
diff --git a/...stract-syntax-tree/parsers/parser-flow.js → ...stract-syntax-tree/parsers/parser-flow.js b/...stract-syntax-tree/parsers/parser-flow.js → ...stract-syntax-tree/parsers/parser-flow.js
diff --git a/...abstract-syntax-tree/parsers/parser-js.js → ...abstract-syntax-tree/parsers/parser-js.js b/...abstract-syntax-tree/parsers/parser-js.js → ...abstract-syntax-tree/parsers/parser-js.js
diff --git a/...abstract-syntax-tree/parsers/parser-ts.js → ...abstract-syntax-tree/parsers/parser-ts.js b/...abstract-syntax-tree/parsers/parser-ts.js → ...abstract-syntax-tree/parsers/parser-ts.js
diff --git a/.../abstract-syntax-tree/traverse-helpers.js → .../abstract-syntax-tree/traverse-helpers.js b/.../abstract-syntax-tree/traverse-helpers.js → .../abstract-syntax-tree/traverse-helpers.js
diff --git a/lib/source-loader/src/build.js → lib/source-loader/src/server/build.js b/lib/source-loader/src/build.js → lib/source-loader/src/server/build.js
@@ -15,7 +15,7 @@ export function transform(inputSource) {
         localDependencies,
         idsToFrameworks,
       }) => `
-  var withSourceLoader = require('@storybook/source-loader/dist/preview').withSource;
+  var withSourceLoader = require('@storybook/source-loader/preview').withSource;
   var __SOURCE_PREFIX__ = "${prefix.replace(/\\([^\\ ])/g, '\\\\$1')}";
   var __STORY__ = ${sourceJson};
   var __ADDS_MAP__ = ${JSON.stringify(addsMap)};

diff --git a/...ies-lookup/getRidOfUselessFilePrefixes.js → ...ies-lookup/getRidOfUselessFilePrefixes.js b/...ies-lookup/getRidOfUselessFilePrefixes.js → ...ies-lookup/getRidOfUselessFilePrefixes.js
diff --git a/...r/src/dependencies-lookup/readAsObject.js → ...erver/dependencies-lookup/readAsObject.js b/...r/src/dependencies-lookup/readAsObject.js → ...erver/dependencies-lookup/readAsObject.js
diff --git a/lib/source-loader/src/server/index.js b/lib/source-loader/src/server/index.js
@@ -0,0 +1,3 @@
+import { transform } from './build';
+
+export default transform;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('./dist/client/preview');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { transform } from './build';

		export default transform;