Skip to content

Commit

Permalink
WCC v0.12.0 upgrade and removing patches directory
Browse files Browse the repository at this point in the history
  • Loading branch information
thescientist13 committed Mar 10, 2024
1 parent a7f2528 commit 236e43f
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 1,033 deletions.
4 changes: 1 addition & 3 deletions package.json
Expand Up @@ -27,8 +27,7 @@
"lint:js": "eslint \"*.{js,md}\" \"./packages/**/**/*.{js,md}\" \"./test/*.js\" \"./www/**/**/*.{js,md}\"",
"lint:ts": "eslint \"./packages/**/**/*.ts\"",
"lint:css": "stylelint \"./www/**/*.js\", \"./www/**/*.css\"",
"lint": "ls-lint && yarn lint:js && yarn lint:ts && yarn lint:css",
"postinstall": "patch-package"
"lint": "ls-lint && yarn lint:js && yarn lint:ts && yarn lint:css"
},
"resolutions": {
"lit": "^3.1.0"
Expand All @@ -49,7 +48,6 @@
"jsdom": "^16.5.0",
"lerna": "^3.16.4",
"mocha": "^9.1.3",
"patch-package": "^8.0.0",
"rimraf": "^2.6.3",
"stylelint": "^13.8.0",
"stylelint-a11y": "^1.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Expand Up @@ -52,7 +52,7 @@
"remark-rehype": "^7.0.0",
"rollup": "^3.29.4",
"unified": "^9.2.0",
"wc-compiler": "~0.11.0"
"wc-compiler": "~0.12.0"
},
"devDependencies": {
"@babel/runtime": "^7.10.4",
Expand Down
12 changes: 7 additions & 5 deletions packages/cli/src/config/rollup.config.js
Expand Up @@ -8,7 +8,7 @@ import * as walk from 'acorn-walk';
// https://github.com/rollup/rollup/issues/2121
// would be nice to get rid of this
function cleanRollupId(id) {
return id.replace('\x00', '');
return id.replace('\x00', '').replace('?commonjs-proxy', '');
}

function greenwoodResourceLoader (compilation) {
Expand Down Expand Up @@ -355,10 +355,11 @@ const getRollupConfigForApis = async (compilation) => {
},
plugins: [
greenwoodResourceLoader(compilation),
// support ESM favorable export conditions
// support node export conditions for API routes
// https://github.com/ProjectEvergreen/greenwood/issues/1118
// https://github.com/rollup/plugins/issues/362#issuecomment-873448461
nodeResolve({
exportConditions: ['default', 'module', 'import', 'node'],
exportConditions: ['node'],
preferBuiltins: true
}),
commonjs(),
Expand All @@ -381,10 +382,11 @@ const getRollupConfigForSsr = async (compilation, input) => {
},
plugins: [
greenwoodResourceLoader(compilation),
// support ESM favorable export conditions
// support node export conditions for SSR pages
// https://github.com/ProjectEvergreen/greenwood/issues/1118
// https://github.com/rollup/plugins/issues/362#issuecomment-873448461
nodeResolve({
exportConditions: ['default', 'module', 'import', 'node'],
exportConditions: ['node'],
preferBuiltins: true
}),
commonjs(),
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-import-jsx/package.json
Expand Up @@ -27,7 +27,7 @@
"@greenwood/cli": "^0.28.0-alpha.4"
},
"dependencies": {
"wc-compiler": "~0.11.0"
"wc-compiler": "~0.12.0"
},
"devDependencies": {
"@greenwood/cli": "^0.29.2"
Expand Down

0 comments on commit 236e43f

Please sign in to comment.