Skip to content

Commit

Permalink
Merge pull request #2523 from microsoft/update-yarn
Browse files Browse the repository at this point in the history
Update yarn
  • Loading branch information
andrewbranch committed Sep 6, 2022
2 parents be4cd3b + 87508f0 commit a62e4ac
Show file tree
Hide file tree
Showing 10 changed files with 1,913 additions and 751 deletions.
340 changes: 259 additions & 81 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

550 changes: 550 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

591 changes: 0 additions & 591 deletions .yarn/releases/yarn-3.0.0-rc.1.cjs

This file was deleted.

783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.3.cjs

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ plugins:
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"

yarnPath: .yarn/releases/yarn-3.0.0-rc.1.cjs
yarnPath: .yarn/releases/yarn-3.2.3.cjs
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@
],
"onlyPublishWithReleaseLabel": true
},
"packageManager": "yarn@3.0.0-rc.1"
"packageManager": "yarn@3.2.3"
}
2 changes: 1 addition & 1 deletion packages/tsconfig-reference/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
"typescript": "*"
},
"type": "module"
}
}
23 changes: 12 additions & 11 deletions packages/typescriptlang-org/gatsby-node.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
const NodePolyfillPlugin = require("node-polyfill-webpack-plugin")
const { createPages } = require("./lib/bootup/createPages")
const NodePolyfillPlugin = require("node-polyfill-webpack-plugin");
const { createPages } = require("./lib/bootup/createPages");
const {
addPathToSite,
writeAllPathsToFixture,
} = require("./lib/bootup/pathsOnSiteTracker")
} = require("./lib/bootup/pathsOnSiteTracker");

/** @type { import("gatsby").GatsbyNode } */
const config = {}
exports.config = config
const config = {};
exports.config = config;

config.createPages = createPages
config.createPages = createPages;

// So we don't need to query for all pages
config.onCreatePage = p => addPathToSite(p.page.path)
config.onPostBootstrap = () => writeAllPathsToFixture()
config.onCreatePage = p => addPathToSite(p.page.path);
config.onPostBootstrap = () => writeAllPathsToFixture();

// To ensure canvas (used by JSDom) doesn't break builds during SSR
// see: https://github.com/gatsbyjs/gatsby/issues/17661
Expand All @@ -31,6 +31,7 @@ config.onCreateWebpackConfig = ({ loaders, actions, plugins, stage }) => {
externals: {
pnpapi: "commonjs pnpapi",
fs: "commonjs fs",
module: "commonjs module",
},
resolve: {
fallback: {
Expand All @@ -49,7 +50,7 @@ config.onCreateWebpackConfig = ({ loaders, actions, plugins, stage }) => {
}),
new NodePolyfillPlugin(),
],
})
}
});
};

module.exports = config
module.exports = config;

0 comments on commit a62e4ac

Please sign in to comment.