Skip to content

Commit

Permalink
berry
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Feb 9, 2020
1 parent 6694e4f commit c44a362
Show file tree
Hide file tree
Showing 9 changed files with 20,998 additions and 162,496 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ yarn-error.log*
junit.xml

*.tsbuildinfo

/.pnp.js
/.yarn/unplugged/
/.yarn/build-state.yml
147,315 changes: 0 additions & 147,315 deletions .yarn/releases/yarn-1.21.1.js

This file was deleted.

58 changes: 58 additions & 0 deletions .yarn/releases/yarn-rc.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@


lastUpdateCheck 1576854265612
yarn-path ".yarn/releases/yarn-1.21.1.js"
yarn-path ".yarn/releases/yarn-berry.js"
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: .yarn/releases/yarn-rc.js
enableGlobalCache: true
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"mocha": "^7.0.0",
"mock-fs": "^4.4.1",
"opencollective": "^1.0.3",
"pnp-webpack-plugin": "^1.6.0",
"prettier": "^1.19.0",
"prettylint": "^1.0.0",
"progress": "^2.0.0",
Expand Down
5 changes: 5 additions & 0 deletions scripts/browserBuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const path = require('path');
const webpack = require('webpack');
const camelCase = require('camelcase');
const rimraf = require('rimraf');
const PnpWebpackPlugin = require('pnp-webpack-plugin');

const transformOptions = require('../babel.config.js');

Expand Down Expand Up @@ -65,11 +66,15 @@ function browserBuild(pkgName, entryPath, destination) {
'../packages/expect/build/fakeChalk.js'
),
},
plugins: [PnpWebpackPlugin],
extensions: ['.js', '.json', '.ts'],
},
node: {
fs: 'empty',
},
resolveLoader: {
plugins: [PnpWebpackPlugin.moduleLoader(module)],
},
},
/* eslint-enable */
(err, stats) => {
Expand Down
9 changes: 2 additions & 7 deletions scripts/buildTs.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@ const packagesWithTs = packages.filter(p =>
);

const args = [
'--max-old-space-size=4096',
path.resolve(
require.resolve('typescript/package.json'),
'..',
require('typescript/package.json').bin.tsc
),
'tsc',
'-b',
...packagesWithTs,
...process.argv.slice(2),
Expand All @@ -35,7 +30,7 @@ const args = [
console.log(chalk.inverse('Building TypeScript definition files'));

try {
execa.sync('node', args, {stdio: 'inherit'});
execa.sync('yarn', args, {stdio: 'inherit'});
console.log(
chalk.inverse.green('Successfully built TypeScript definition files')
);
Expand Down
36,098 changes: 20,925 additions & 15,173 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit c44a362

Please sign in to comment.