Use local require for @babel/core and postcss

packages/core/integration-tests/test/transpilation.js

@@ -148,7 +148,6 @@ describe('transpilation', function() {
     );
 
     let file = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8');
-    console.log(file);
     assert(file.includes('React.createElement("div"'));
     assert(file.includes('...a'));
     assert(!file.includes('@swc/helpers'));

packages/core/package-manager/src/JSONParseStream.js

@@ -1,6 +1,8 @@
 // @flow strict-local
 
 import type {JSONObject} from '@parcel/types';
+
+import logger from '@parcel/logger';
 import {Transform} from 'stream';
 
 // Transforms chunks of json strings to parsed objects.
@@ -17,7 +19,19 @@ export default class JSONParseStream extends Transform {
     callback: (err: ?Error, parsed: ?JSONObject) => mixed,
   ) {
     try {
-      callback(null, JSON.parse(chunk.toString()));
+      let parsed;
+      try {
+        parsed = JSON.parse(chunk.toString());
+      } catch (e) {
+        // Be permissive and ignoreJSON parse errors in case there was
+        // a non-JSON line in the package manager's stdout.
+        logger.verbose({
+          message: 'Ignored invalid JSON message: ' + chunk.toString(),
+          origin: '@parcel/package-manager',
+        });
+        return;
+      }
+      callback(null, parsed);
     } catch (err) {
       callback(err);
     }

packages/transformers/babel/package.json

@@ -20,15 +20,12 @@
     "parcel": "^2.0.0-beta.1"
   },
   "dependencies": {
+    "@babel/core": "^7.12.0",
     "@babel/generator": "^7.9.0",
     "@babel/helper-compilation-targets": "^7.8.4",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.4.5",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/preset-react": "^7.0.0",
     "@babel/traverse": "^7.0.0",
     "@parcel/babel-ast-utils": "2.0.0-beta.2",
-    "@parcel/babel-preset-env": "2.0.0-beta.2",
     "@parcel/plugin": "2.0.0-beta.2",
     "@parcel/source-map": "2.0.0-alpha.4.21",
     "@parcel/utils": "2.0.0-beta.2",
@@ -39,9 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.0",
+    "@babel/preset-env": "^7.0.0",
     "@parcel/types": "2.0.0-beta.2"
-  },
-  "peerDependencies": {
-    "@babel/core": "^7.12.0"
   }
 }

packages/transformers/babel/src/babel7.js

@@ -3,7 +3,7 @@
 import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
 
 import invariant from 'assert';
-import * as babel from '@babel/core';
+import * as internalBabelCore from '@babel/core';
 import {relativeUrl} from '@parcel/utils';
 
 import packageJson from '../package.json';
@@ -17,6 +17,14 @@ export default async function babel7(
   babelOptions: any,
   additionalPlugins: Array<any> = [],
 ): Promise<?AST> {
+  const babelCore = babelOptions.internal
+    ? internalBabelCore
+    : await options.packageManager.require('@babel/core', asset.filePath, {
+        range: '^7.12.0',
+        saveDev: true,
+        shouldAutoInstall: options.shouldAutoInstall,
+      });
+
   let config = {
     ...babelOptions.config,
     plugins: additionalPlugins.concat(babelOptions.config.plugins),
@@ -53,13 +61,13 @@ export default async function babel7(
   let ast = await asset.getAST();
   let res;
   if (ast) {
-    res = await babel.transformFromAstAsync(
+    res = await babelCore.transformFromAstAsync(
       ast.program,
       asset.isASTDirty() ? undefined : await asset.getCode(),
       config,
     );
   } else {
-    res = await babel.transformAsync(await asset.getCode(), config);
+    res = await babelCore.transformAsync(await asset.getCode(), config);
   }
 
   if (res.ast) {

packages/transformers/babel/src/config.js

@@ -2,9 +2,10 @@
 
 import type {Config, PluginOptions} from '@parcel/types';
 import type {PluginLogger} from '@parcel/logger';
+import typeof * as BabelCore from '@babel/core';
 
 import path from 'path';
-import * as babelCore from '@babel/core';
+import * as internalBabelCore from '@babel/core';
 import {md5FromObject, relativePath, resolveConfig} from '@parcel/utils';
 
 import isJSX from './jsx';
@@ -59,6 +60,20 @@ export async function load(
     return;
   }
 
+  const babelCore: BabelCore = await options.packageManager.require(
+    '@babel/core',
+    config.searchPath,
+    {
+      range: '^7.12.0',
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall,
+    },
+  );
+  config.addDevDependency({
+    moduleSpecifier: '@babel/core',
+    resolveFrom: config.searchPath,
+  });
+
   let babelOptions = {
     filename: config.searchPath,
     cwd: options.projectRoot,
@@ -197,13 +212,13 @@ async function buildDefaultBabelConfig(options: PluginOptions, config: Config) {
   }
 
   babelOptions.presets = (babelOptions.presets || []).map(preset =>
-    babelCore.createConfigItem(preset, {
+    internalBabelCore.createConfigItem(preset, {
       type: 'preset',
       dirname: BABEL_TRANSFORMER_DIR,
     }),
   );
   babelOptions.plugins = (babelOptions.plugins || []).map(plugin =>
-    babelCore.createConfigItem(plugin, {
+    internalBabelCore.createConfigItem(plugin, {
       type: 'plugin',
       dirname: BABEL_TRANSFORMER_DIR,
     }),

packages/transformers/postcss/package.json

@@ -31,8 +31,5 @@
   },
   "devDependencies": {
     "postcss": "^8.2.1"
-  },
-  "peerDependencies": {
-    "postcss": "^8.2.1"
   }
 }

packages/transformers/postcss/src/PostCSSTransformer.js

@@ -1,6 +1,6 @@
 // @flow
 
-import type {FilePath, MutableAsset} from '@parcel/types';
+import type {FilePath, MutableAsset, PluginOptions} from '@parcel/types';
 
 import {md5FromString} from '@parcel/utils';
 import {Transformer} from '@parcel/plugin';
@@ -9,8 +9,8 @@ import nullthrows from 'nullthrows';
 import path from 'path';
 import semver from 'semver';
 import valueParser from 'postcss-value-parser';
-import postcss from 'postcss';
 import postcssModules from 'postcss-modules';
+import typeof * as Postcss from 'postcss';
 
 import {load} from './loadConfig';
 
@@ -26,11 +26,13 @@ export default (new Transformer({
     return ast.type === 'postcss' && semver.satisfies(ast.version, '^8.2.1');
   },
 
-  async parse({asset, config}) {
+  async parse({asset, config, options}) {
     if (!config) {
       return;
     }
 
+    const postcss = await loadPostcss(options, asset.filePath);
+
     return {
       type: 'postcss',
       version: '8.2.1',
@@ -48,6 +50,8 @@ export default (new Transformer({
       return [asset];
     }
 
+    const postcss: Postcss = await loadPostcss(options, asset.filePath);
+
     let plugins = [...config.hydrated.plugins];
     let cssModules: ?{|[string]: string|} = null;
     if (config.hydrated.modules) {
@@ -149,7 +153,9 @@ export default (new Transformer({
     return assets;
   },
 
-  generate({ast}) {
+  async generate({asset, ast, options}) {
+    const postcss: Postcss = await loadPostcss(options, asset.filePath);
+
     let code = '';
     postcss.stringify(postcss.fromJSON(ast.program), c => {
       code += c;
@@ -192,3 +198,11 @@ function createLoader(
     }
   };
 }
+
+function loadPostcss(options: PluginOptions, from: FilePath): Promise<Postcss> {
+  return options.packageManager.require('postcss', from, {
+    range: '^8.2.1',
+    saveDev: true,
+    shouldAutoInstall: options.shouldAutoInstall,
+  });
+}

packages/transformers/postcss/src/loadConfig.js

@@ -96,6 +96,11 @@ export async function load({
 
   let contents = null;
   if (configFile) {
+    config.addDevDependency({
+      moduleSpecifier: 'postcss',
+      resolveFrom: config.searchPath,
+    });
+
     contents = configFile.contents;
     let isDynamic = configFile && path.extname(configFile.filePath) === '.js';
     if (isDynamic) {

yarn.lock

@@ -545,13 +545,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-typescript@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
-  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
 "@babel/plugin-transform-arrow-functions@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
@@ -838,15 +831,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-typescript@^7.4.5":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
-  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-typescript" "^7.12.13"
-
 "@babel/plugin-transform-unicode-escapes@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"