Improvements to config handling

Author: Ives van Hoorne

packages/app/config/webpack.common.js

@@ -217,6 +217,9 @@ module.exports = {
     ],
   },
 
+  // To make jsonlint work
+  externals: ['file', 'system'],
+
   resolve: {
     mainFields: ['browser', 'module', 'jsnext:main', 'main'],
     modules: ['node_modules', 'src', 'standalone-packages'],

packages/app/package.json

@@ -115,7 +115,7 @@
     "cerebral": "^4.0.0",
     "circular-json": "^0.4.0",
     "codemirror": "^5.27.4",
-    "codesandbox-api": "^0.0.14",
+    "codesandbox-api": "^0.0.17",
     "codesandbox-import-utils": "^1.2.3",
     "color": "^0.11.4",
     "compare-versions": "^3.1.0",

packages/app/src/sandbox/compile.js

@@ -312,11 +312,15 @@ async function compile({
       .filter(x => x.error);
 
     if (errors.length) {
-      throw new Error(
+      const e = new Error(
         `We weren't able to parse: '${errors[0].path}': ${
           errors[0].error.message
         }`
       );
+
+      e.fileName = errors[0].path;
+
+      throw e;
     }
 
     const packageJSON = modules['/package.json'];

packages/app/src/sandbox/errors/index.js

@@ -57,25 +57,25 @@ function buildErrorMessage(e: TModuleError) {
   };
 }
 
+const wrappedResolveModule = (manager, path) => {
+  try {
+    return manager && manager.resolveTranspiledModule(path, '/');
+  } catch (e) {
+    return null;
+  }
+};
+
 function buildDynamicError(ref: ErrorRecord) {
   const manager = getCurrentManager();
 
-  const relevantFrame = ref.enhancedFrames.find(r => {
-    try {
-      return (
-        manager &&
-        !!manager.resolveTranspiledModule(
-          (r._originalFileName || r.fileName || '')
-            .replace(location.origin, '')
-            .replace('file://', ''),
-          '/'
-        )
-      );
-    } catch (e) {
-      /* don't do anything */
-      return false;
-    }
-  });
+  const relevantFrame = ref.enhancedFrames.find(r =>
+    wrappedResolveModule(
+      manager,
+      (r._originalFileName || r.fileName || '')
+        .replace(location.origin, '')
+        .replace('file://', '')
+    )
+  );
 
   if (relevantFrame && manager) {
     const fileName = relevantFrame._originalFileName || relevantFrame.fileName;
@@ -102,11 +102,19 @@ function buildDynamicError(ref: ErrorRecord) {
     }
   } else {
     const error: TModuleError = ref.error;
-    const tModule = error.tModule;
+    const tModule =
+      error.tModule ||
+      wrappedResolveModule(
+        manager,
+        (error.fileName || '')
+          .replace(location.origin, '')
+          .replace('file://', '')
+      );
 
     if (tModule) {
       const newError = {
         ...buildErrorMessage(error),
+        path: error.fileName,
         type: 'action',
         action: 'show-error',
       };
@@ -121,6 +129,7 @@ function buildDynamicError(ref: ErrorRecord) {
 /* eslint-disable no-underscore-dangle */
 export default function showError(ref: ErrorRecord) {
   const errorToSend = buildDynamicError(ref);
+
   if (errorToSend) {
     dispatch(
       actions.error.show(errorToSend.title, errorToSend.message, {
@@ -130,5 +139,13 @@ export default function showError(ref: ErrorRecord) {
         payload: errorToSend.payload,
       })
     );
+  } else {
+    // Show based on error
+    actions.error.show(ref.error.name, ref.error.message, {
+      line: ref.error.lineNumber,
+      column: ref.error.columnNumber,
+      path: ref.error.fileName,
+      payload: {},
+    });
   }
 }

packages/app/src/sandbox/eval/transpilers/babel/babel-parser.js

@@ -29,9 +29,17 @@ const DEFAULT_BABEL_CONFIG = {
 /**
  * Parses the .babelrc if it exists, if it doesn't it will return a default config
  */
-export default function getBabelConfig(config?: Object, path: string) {
+export default function getBabelConfig(
+  config?: Object,
+  loaderOptions,
+  path: string
+) {
   const resolvedConfig = config || DEFAULT_BABEL_CONFIG;
 
+  if (loaderOptions.disableCodeSandboxPlugins) {
+    return resolvedConfig;
+  }
+
   return {
     ...resolvedConfig,
     sourceMaps: 'inline',

packages/app/src/sandbox/eval/transpilers/babel/index.js

@@ -45,7 +45,11 @@ class BabelTranspiler extends WorkerTranspiler {
         foundConfig = loaderContext.options.configurations.babel.parsed;
       }
 
-      const babelConfig = getBabelConfig(foundConfig, path);
+      const babelConfig = getBabelConfig(
+        foundConfig,
+        loaderContext.options,
+        path
+      );
 
       this.queueTask(
         {

packages/common/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "image-extensions": "^1.1.0",
+    "jsonlint": "^1.6.3",
     "react-tippy": "^0.14.0",
     "styled-components": "^3.2.1"
   }

packages/common/templates/configuration/parse.js

@@ -2,6 +2,8 @@
 import type { ConfigurationFile } from 'common/templates/configuration/types';
 import type { Sandbox } from 'common/types';
 
+import { parse } from 'jsonlint';
+
 type ConfigurationFiles = {
   [path: string]: ConfigurationFile,
 };
@@ -41,7 +43,7 @@ export default function parseConfigurations(
         path,
       };
       try {
-        const parsed = JSON.parse(code);
+        const parsed = parse(code);
 
         configurations[configurationFile.type] = {
           ...baseObject,

yarn.lock

@@ -683,6 +683,10 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+JSV@^4.0.x:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
+
 abab@^1.0.3, abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -953,6 +957,10 @@ ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.0:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+
 [email protected]:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
@@ -3581,6 +3589,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.2.0"
 
+chalk@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 character-entities-html4@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.1.tgz#359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"
@@ -8220,6 +8236,10 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
+has-color@~0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+
 [email protected]:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -10650,6 +10670,13 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonlint@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988"
+  dependencies:
+    JSV "^4.0.x"
+    nomnom "^1.5.x"
+
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -12518,6 +12545,13 @@ nodemon@^1.11.0:
     undefsafe "0.0.3"
     update-notifier "^2.2.0"
 
+nomnom@^1.5.x:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
 [email protected]:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
@@ -17195,6 +17229,10 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+
 strip-bom-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
@@ -18229,6 +18267,10 @@ underscore@^1.7.0:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
 
+underscore@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
+
 unherit@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"