diff --git a/.changeset/friendly-turtles-join.md b/.changeset/friendly-turtles-join.md new file mode 100644 index 000000000..268513ad5 --- /dev/null +++ b/.changeset/friendly-turtles-join.md @@ -0,0 +1,5 @@ +--- +'@linaria/react': minor +--- + +Fix for extending imported component #1378 diff --git a/examples/astro-solid/package.json b/examples/astro-solid/package.json index 938b05d3a..2ad48357b 100644 --- a/examples/astro-solid/package.json +++ b/examples/astro-solid/package.json @@ -8,7 +8,7 @@ "@astrojs/solid-js": "^1.2.3", "@babel/core": "^7.23.5", "@linaria/core": "workspace:^", - "@wyw-in-js/vite": "^0.4.0", + "@wyw-in-js/vite": "^0.5.3", "astro": "^1.6.10", "solid-js": "^1.6.2", "vite": "^3", diff --git a/examples/esbuild/package.json b/examples/esbuild/package.json index aaa7cb8c2..ccee89bc3 100644 --- a/examples/esbuild/package.json +++ b/examples/esbuild/package.json @@ -7,7 +7,7 @@ "linaria-website": "workspace:^" }, "devDependencies": { - "@wyw-in-js/esbuild": "^0.4.0", + "@wyw-in-js/esbuild": "^0.5.3", "esbuild": "^0.15.16" }, "scripts": { diff --git a/examples/rollup/package.json b/examples/rollup/package.json index ebd452425..d63d01070 100644 --- a/examples/rollup/package.json +++ b/examples/rollup/package.json @@ -9,11 +9,11 @@ "devDependencies": { "@babel/core": "^7.23.5", "@babel/preset-react": "^7.23.3", - "@wyw-in-js/rollup": "^0.4.0", "@rollup/plugin-babel": "^6.0.3", "@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-image": "^3.0.2", "@rollup/plugin-node-resolve": "^15.2.1", + "@wyw-in-js/rollup": "^0.5.3", "rollup": "^3.11.0", "rollup-plugin-css-only": "^4.3.0" }, diff --git a/examples/vite/package.json b/examples/vite/package.json index 28cc9c3ed..08bc515c1 100644 --- a/examples/vite/package.json +++ b/examples/vite/package.json @@ -9,9 +9,9 @@ "linaria-website": "workspace:^" }, "devDependencies": { - "@wyw-in-js/vite": "^0.4.0", "@rollup/plugin-node-resolve": "^15.2.1", "@vitejs/plugin-react": "^2.1.0", + "@wyw-in-js/vite": "^0.5.3", "vite": "^3.2.10" }, "scripts": { diff --git a/examples/webpack5/package.json b/examples/webpack5/package.json index 1fe2af2b1..7c8d11561 100644 --- a/examples/webpack5/package.json +++ b/examples/webpack5/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@babel/core": "^7.23.5", - "@wyw-in-js/webpack-loader": "^0.4.0", + "@wyw-in-js/webpack-loader": "^0.5.3", "babel-loader": "^9.1.0", "cross-env": "^7.0.3", "css-hot-loader": "^1.4.4", diff --git a/package.json b/package.json index 21d384609..21c79c9c8 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,7 @@ "@typescript-eslint/experimental-utils": "^4.28.0", "git-raw-commits": "^2.0.3" }, - "dependencies": { - "git-raw-commits": "^2.0.3" - }, + "dependencies": {}, "devDependencies": { "@babel/cli": "^7.23.4", "@babel/core": "^7.23.5", @@ -55,6 +53,7 @@ "@definitelytyped/dtslint": "^0.0.176", "@types/jest": "^28.1.0", "@types/node": "^17.0.39", + "@types/resolve": "^1.20.6", "@typescript-eslint/eslint-plugin": "^6.6.0", "@typescript-eslint/parser": "^6.6.0", "all-contributors-cli": "^6.20.0", @@ -72,6 +71,7 @@ "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", + "git-raw-commits": "^2.0.3", "husky": "^1.3.1", "jest": "^29.6.2", "prettier": "^3.0.3", @@ -84,5 +84,6 @@ "engines": { "node": ">=16.0.0", "pnpm": "^8.0.0" - } + }, + "packageManager": "pnpm@8.15.7+sha256.50783dd0fa303852de2dd1557cd4b9f07cb5b018154a6e76d0f40635d6cee019" } diff --git a/packages/atomic/package.json b/packages/atomic/package.json index f38a65689..cca3bada0 100644 --- a/packages/atomic/package.json +++ b/packages/atomic/package.json @@ -51,8 +51,8 @@ "dependencies": { "@linaria/core": "workspace:^", "@linaria/react": "workspace:^", - "@wyw-in-js/processor-utils": "^0.4.0", - "@wyw-in-js/shared": "^0.4.0", + "@wyw-in-js/processor-utils": "^0.5.3", + "@wyw-in-js/shared": "^0.5.3", "known-css-properties": "^0.24.0", "postcss": "^8.4.31", "stylis": "^4.3.0", diff --git a/packages/core/package.json b/packages/core/package.json index 9aedf4d94..62b91f2a2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -58,7 +58,7 @@ "watch": "pnpm build:dist --watch & pnpm build:declarations --watch" }, "dependencies": { - "@wyw-in-js/processor-utils": "^0.4.0" + "@wyw-in-js/processor-utils": "^0.5.3" }, "devDependencies": { "@babel/traverse": "^7.23.5", diff --git a/packages/react/package.json b/packages/react/package.json index 1d4909242..fceacbd6f 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -60,10 +60,11 @@ "dependencies": { "@emotion/is-prop-valid": "^1.2.0", "@linaria/core": "workspace:^", - "@wyw-in-js/processor-utils": "^0.4.0", - "@wyw-in-js/shared": "^0.4.0", + "@wyw-in-js/processor-utils": "^0.5.3", + "@wyw-in-js/shared": "^0.5.3", "minimatch": "^9.0.3", "react-html-attributes": "^1.4.6", + "resolve": "^1.22.8", "ts-invariant": "^0.10.3" }, "devDependencies": { diff --git a/packages/react/src/processors/styled.ts b/packages/react/src/processors/styled.ts index e1b1ff780..bbe64de84 100644 --- a/packages/react/src/processors/styled.ts +++ b/packages/react/src/processors/styled.ts @@ -30,6 +30,7 @@ import { } from '@wyw-in-js/shared'; import { minimatch } from 'minimatch'; import html from 'react-html-attributes'; +import { sync as resolveSync } from 'resolve'; const isNotNull = (x: T | null): x is T => x !== null; @@ -100,17 +101,16 @@ export default class StyledProcessor extends TaggedTemplateProcessor { // Check if at least one used identifier is a Linaria component. const isSomeMatched = value.importedFrom.some((importedFrom) => { - const importedPkg = findPackageJSON( - importedFrom, - this.context.filename - ); + const importedPkg = + // If package.json is not found, assume it's a local package + findPackageJSON(importedFrom, this.context.filename) ?? selfPkg; if (importedPkg) { const packageJSON = JSON.parse(readFileSync(importedPkg, 'utf8')); - let mask: string | undefined = packageJSON?.linaria?.components; + const mask: string | undefined = packageJSON?.linaria?.components; if (importedPkg === selfPkg && mask === undefined) { // If mask is not specified for the local package, all components are treated as styled. - mask = '**/*'; + return true; } if (mask) { @@ -120,11 +120,23 @@ export default class StyledProcessor extends TaggedTemplateProcessor { /\\/g, posix.sep ); - const fileWithComponent = require.resolve(importedFrom, { - paths: [dirname(this.context.filename!)], - }); - return minimatch(fileWithComponent, fullMask); + try { + const fileWithComponent = resolveSync(importedFrom, { + basedir: dirname(this.context.filename!), + extensions: this.options.extensions, + }); + + return minimatch(fileWithComponent, fullMask); + } catch (e) { + // It means that resolver can't find the file. + // eslint-disable-next-line no-console + console.warn( + `Can't resolve ${importedFrom} from ${this.context.filename}. If ${value.source} is another styled component, it should be resolvable with default Node.js resolver. If it's not, please exclude it from the linaria.components mask in package.json.` + ); + + return false; + } } } diff --git a/packages/react/src/styled.ts b/packages/react/src/styled.ts index 347b898e0..3f755c7f6 100644 --- a/packages/react/src/styled.ts +++ b/packages/react/src/styled.ts @@ -6,12 +6,13 @@ * - injects CSS variables used to define dynamic styles based on props */ import validAttr from '@emotion/is-prop-valid'; -import type { WYWEvalMeta } from '@wyw-in-js/shared'; import React from 'react'; import { cx } from '@linaria/core'; import type { CSSProperties } from '@linaria/core'; +type WYWEvalMeta = { __wyw_meta: unknown }; // simplified version of WYWEvalMeta from @wyw-in-js/shared + export type NoInfer = [A][A extends any ? 0 : never]; type Component = diff --git a/packages/stylelint/package.json b/packages/stylelint/package.json index c832d88e7..4002682d5 100644 --- a/packages/stylelint/package.json +++ b/packages/stylelint/package.json @@ -30,8 +30,8 @@ "watch": "pnpm build:lib --watch & pnpm build:esm --watch & pnpm build:declarations --watch" }, "dependencies": { - "@wyw-in-js/shared": "^0.4.0", - "@wyw-in-js/transform": "^0.4.0", + "@wyw-in-js/shared": "^0.5.3", + "@wyw-in-js/transform": "^0.5.3", "strip-ansi": "^5.2.0" }, "devDependencies": { diff --git a/packages/testkit/package.json b/packages/testkit/package.json index 6ce116660..4cf63bf34 100644 --- a/packages/testkit/package.json +++ b/packages/testkit/package.json @@ -26,9 +26,9 @@ "@babel/traverse": "^7.23.5", "@linaria/react": "workspace:^", "@swc/core": "^1.3.20", - "@wyw-in-js/processor-utils": "^0.4.0", - "@wyw-in-js/shared": "^0.4.0", - "@wyw-in-js/transform": "^0.4.0", + "@wyw-in-js/processor-utils": "^0.5.3", + "@wyw-in-js/shared": "^0.5.3", + "@wyw-in-js/transform": "^0.5.3", "debug": "^4.3.4", "dedent": "^1.5.1", "esbuild": "^0.15.16", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d20f686be..9a5702273 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,10 +11,6 @@ overrides: importers: .: - dependencies: - git-raw-commits: - specifier: ^2.0.3 - version: 2.0.11 devDependencies: '@babel/cli': specifier: ^7.23.4 @@ -55,6 +51,9 @@ importers: '@types/node': specifier: ^17.0.39 version: 17.0.39 + '@types/resolve': + specifier: ^1.20.6 + version: 1.20.6 '@typescript-eslint/eslint-plugin': specifier: ^6.6.0 version: 6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.54.0)(typescript@5.2.2) @@ -106,6 +105,9 @@ importers: eslint-plugin-react-hooks: specifier: ^4.6.0 version: 4.6.0(eslint@8.54.0) + git-raw-commits: + specifier: ^2.0.3 + version: 2.0.11 husky: specifier: ^1.3.1 version: 1.3.1 @@ -143,8 +145,8 @@ importers: specifier: workspace:^ version: link:../../packages/core '@wyw-in-js/vite': - specifier: ^0.4.0 - version: 0.4.0(vite@3.2.7) + specifier: ^0.5.3 + version: 0.5.3(vite@3.2.7) astro: specifier: ^1.6.10 version: 1.6.10(@types/node@17.0.39) @@ -165,8 +167,8 @@ importers: version: link:../../website devDependencies: '@wyw-in-js/esbuild': - specifier: ^0.4.0 - version: 0.4.0(esbuild@0.15.16) + specifier: ^0.5.3 + version: 0.5.3(esbuild@0.15.16) esbuild: specifier: ^0.15.16 version: 0.15.16 @@ -196,8 +198,8 @@ importers: specifier: ^15.2.1 version: 15.2.1(rollup@3.28.0) '@wyw-in-js/rollup': - specifier: ^0.4.0 - version: 0.4.0(rollup@3.28.0) + specifier: ^0.5.3 + version: 0.5.3(rollup@3.28.0) rollup: specifier: ^3.11.0 version: 3.28.0 @@ -218,8 +220,8 @@ importers: specifier: ^2.1.0 version: 2.1.0(vite@3.2.10) '@wyw-in-js/vite': - specifier: ^0.4.0 - version: 0.4.0(vite@3.2.10) + specifier: ^0.5.3 + version: 0.5.3(vite@3.2.10) vite: specifier: ^3.2.10 version: 3.2.10(@types/node@17.0.39) @@ -231,7 +233,7 @@ importers: version: link:../../packages/core '@wyw-in-js/vite': specifier: ^0.4.0 - version: 0.4.0(vite@3.2.10) + version: 0.4.1(vite@3.2.10) babel-preset-solid: specifier: ^1.6.2 version: 1.6.3(@babel/core@7.23.5) @@ -257,6 +259,8 @@ importers: specifier: ^0.4.54 version: 0.4.54(vite@3.2.10) + examples/vpssr-linaria-solid/dist/server: {} + examples/webpack5: dependencies: linaria-website: @@ -267,8 +271,8 @@ importers: specifier: ^7.23.5 version: 7.23.5 '@wyw-in-js/webpack-loader': - specifier: ^0.4.0 - version: 0.4.0(webpack@5.76.0) + specifier: ^0.5.3 + version: 0.5.3(webpack@5.76.0) babel-loader: specifier: ^9.1.0 version: 9.1.0(@babel/core@7.23.5)(webpack@5.76.0) @@ -303,11 +307,11 @@ importers: specifier: workspace:^ version: link:../react '@wyw-in-js/processor-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/shared': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 known-css-properties: specifier: ^0.24.0 version: 0.24.0 @@ -337,8 +341,8 @@ importers: packages/core: dependencies: '@wyw-in-js/processor-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 devDependencies: '@babel/traverse': specifier: ^7.23.5 @@ -426,17 +430,20 @@ importers: specifier: workspace:^ version: link:../core '@wyw-in-js/processor-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/shared': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 minimatch: specifier: ^9.0.3 version: 9.0.3 react-html-attributes: specifier: ^1.4.6 version: 1.4.6 + resolve: + specifier: ^1.22.8 + version: 1.22.8 ts-invariant: specifier: ^0.10.3 version: 0.10.3 @@ -476,11 +483,11 @@ importers: packages/stylelint: dependencies: '@wyw-in-js/shared': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/transform': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 strip-ansi: specifier: ^5.2.0 version: 5.2.0 @@ -519,14 +526,14 @@ importers: specifier: ^1.3.20 version: 1.3.20 '@wyw-in-js/processor-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/shared': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/transform': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 debug: specifier: ^4.3.4 version: 4.3.4 @@ -659,11 +666,11 @@ importers: specifier: workspace:^ version: link:../packages/stylelint '@wyw-in-js/babel-preset': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.3 + version: 0.5.3 '@wyw-in-js/webpack-loader': - specifier: ^0.4.0 - version: 0.4.0(webpack@5.76.0) + specifier: ^0.5.3 + version: 0.5.3(webpack@5.76.0) babel-loader: specifier: ^8.2.5 version: 8.2.5(@babel/core@7.23.5)(webpack@5.76.0) @@ -3755,6 +3762,10 @@ packages: resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} dev: true + /@types/resolve@1.20.6: + resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==} + dev: true + /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: @@ -4293,54 +4304,75 @@ packages: webpack-cli: 5.0.0(webpack@5.76.0) dev: true - /@wyw-in-js/babel-preset@0.4.0: - resolution: {integrity: sha512-W9C65QgUYBjjALe//U6SVIjHST92iCb7NNelEpC2CPXwMMUxrGRjUa0hOWeFbOoGyfAs9fwDvAP50VzKtSmY7Q==} + /@wyw-in-js/babel-preset@0.5.3: + resolution: {integrity: sha512-qce06y0hp9XTdJ+L/WbcT+MLognK/jqMrCgJaAtwel/TUmyFJXlSAA+MczmAJSR/rmPVwdnRIHw7dMHAyzgjxg==} engines: {node: '>=16.0.0'} dependencies: '@babel/core': 7.23.5 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/transform': 0.5.3 transitivePeerDependencies: - supports-color dev: true - /@wyw-in-js/esbuild@0.4.0(esbuild@0.15.16): - resolution: {integrity: sha512-kYXcsC+oFH1OIxkTLMwqSZh1S25iPrC424VRgMZQYSC6luFq4BS/PUKqV9ExQTXF61B7YSX4tOcCD5+YFsefiA==} + /@wyw-in-js/esbuild@0.5.3(esbuild@0.15.16): + resolution: {integrity: sha512-x6xtW5J0tmEWhFxWdUYBLIAvH7cP7nj39vtoCG1OQ/tMCKmEIWeL4uBLjunu550mQp0FWyO1mJr7GcFMmEoB9g==} engines: {node: '>=16.0.0'} peerDependencies: esbuild: '>=0.12.0' dependencies: - '@wyw-in-js/shared': 0.4.0 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/shared': 0.5.3 + '@wyw-in-js/transform': 0.5.3 esbuild: 0.15.16 transitivePeerDependencies: - supports-color dev: true - /@wyw-in-js/processor-utils@0.4.0: - resolution: {integrity: sha512-Y4285eV+rmZUXnsH1WeoPjey9QalJXmn8/3KvNOlK4ymfyTt9ghveQlYynJ2UmmwXDvbk0rbVEXACG8GTF2GEA==} + /@wyw-in-js/processor-utils@0.4.1: + resolution: {integrity: sha512-0MVgPC3Svplm2WB4G4eSLLfx8n1EaIpClMXqNcTmfyrFcpLjYYcSXDP7aVgQVvy5wQCqqq+EmPbnU6yXq8X19w==} engines: {node: '>=16.0.0'} dependencies: '@babel/generator': 7.23.5 - '@wyw-in-js/shared': 0.4.0 + '@wyw-in-js/shared': 0.4.1 transitivePeerDependencies: - supports-color + dev: false - /@wyw-in-js/rollup@0.4.0(rollup@3.28.0): - resolution: {integrity: sha512-PpYmLHZoh3nlZZzZoJSAlHTBCKxu5LMimfghGnB4ePO+F6NZfkeh+Xz/j5ujZ0VLnjSZqdUlUyydOHNqRIzPgQ==} + /@wyw-in-js/processor-utils@0.5.3: + resolution: {integrity: sha512-DATsRHLqq8cWYkTD8iwEmvWzG2UvmsFN6Poru4NJ1RwjxtcEdnNKCKZBaBdlH5XyhL7jRTcURUMyee3lqGljhg==} + engines: {node: '>=16.0.0'} + dependencies: + '@babel/generator': 7.23.5 + '@wyw-in-js/shared': 0.5.3 + transitivePeerDependencies: + - supports-color + + /@wyw-in-js/rollup@0.5.3(rollup@3.28.0): + resolution: {integrity: sha512-mfYqzrY2177VVuMVizf6dUH+BPMp0V2kr8NIrLy6VhiAbtf6G2Ne44ZcHpQX85xnELxrsgKgtYkCRrW5neVQ5A==} engines: {node: '>=16.0.0'} peerDependencies: rollup: 1.20.0||^2.0.0||^3.0.0 dependencies: '@rollup/pluginutils': 5.0.4(rollup@3.28.0) - '@wyw-in-js/shared': 0.4.0 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/shared': 0.5.3 + '@wyw-in-js/transform': 0.5.3 rollup: 3.28.0 transitivePeerDependencies: - supports-color dev: true - /@wyw-in-js/shared@0.4.0: - resolution: {integrity: sha512-7gER7khdNM6r6zLA428gdQrdSCLWmZmZexBhSTKPmqFFa/WIxL2/vPAceMw8Q5SAm1xctq2OcU4kKnXi29MBgA==} + /@wyw-in-js/shared@0.4.1: + resolution: {integrity: sha512-luKAAP6augn+j7EE9bcVP1chs5RdtmJx1PbRIqT8j12oP2YV32fvhHFX/99XxPujYLxFIexZrhJkNKHnL5uyKA==} + engines: {node: '>=16.0.0'} + dependencies: + debug: 4.3.4 + find-up: 5.0.0 + minimatch: 9.0.3 + transitivePeerDependencies: + - supports-color + dev: false + + /@wyw-in-js/shared@0.5.3: + resolution: {integrity: sha512-sgST/P2QPIz4UwOK5NtpvaLXUsACcHRkd9/wTlNSOM5si2hOoeIRvakyuqK33wShHK3bpEZZOXQ9YztSXK3bwg==} engines: {node: '>=16.0.0'} dependencies: debug: 4.3.4 @@ -4349,8 +4381,31 @@ packages: transitivePeerDependencies: - supports-color - /@wyw-in-js/transform@0.4.0: - resolution: {integrity: sha512-CfODwDOIQ1bEchCNEg0sQRZNXQd1zOtvSKYRWEAJ+j5luE+b13DNja3fJKmngl/qP5VbzZZGfD4QsA+h7QqR9w==} + /@wyw-in-js/transform@0.4.1: + resolution: {integrity: sha512-MhU/A58QJ7SkAjVNgvmoa5kbg7h28u4RkwGxm0/qt49sPMSlY8AsIW4wXX2k0rX5GTKHASVcNKrSywE2acjzxQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@babel/core': 7.23.5 + '@babel/generator': 7.23.5 + '@babel/helper-module-imports': 7.22.15 + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.5) + '@babel/template': 7.22.15 + '@babel/traverse': 7.23.5 + '@babel/types': 7.23.5 + '@wyw-in-js/processor-utils': 0.4.1 + '@wyw-in-js/shared': 0.4.1 + babel-merge: 3.0.0(@babel/core@7.23.5) + cosmiconfig: 8.2.0 + happy-dom: 12.10.3 + source-map: 0.7.4 + stylis: 4.3.0 + ts-invariant: 0.10.3 + transitivePeerDependencies: + - supports-color + dev: false + + /@wyw-in-js/transform@0.5.3: + resolution: {integrity: sha512-Bt1Ey8MN88FzYJekvZBYFT69157UmwURj2N7Dy8yauErcxtpuNe/1P0Jxd56tdFz0f6uooat5ntzvWgej/iBZg==} engines: {node: '>=16.0.0'} dependencies: '@babel/core': 7.23.5 @@ -4360,8 +4415,8 @@ packages: '@babel/template': 7.22.15 '@babel/traverse': 7.23.5 '@babel/types': 7.23.5 - '@wyw-in-js/processor-utils': 0.4.0 - '@wyw-in-js/shared': 0.4.0 + '@wyw-in-js/processor-utils': 0.5.3 + '@wyw-in-js/shared': 0.5.3 babel-merge: 3.0.0(@babel/core@7.23.5) cosmiconfig: 8.2.0 happy-dom: 12.10.3 @@ -4371,43 +4426,55 @@ packages: transitivePeerDependencies: - supports-color - /@wyw-in-js/vite@0.4.0(vite@3.2.10): - resolution: {integrity: sha512-2bgGtWoalsmogI8Mb/0Jf+ptB66aDF2STgw5b68AkqOgReUQvijQ1M3B++4G9Jh5OF278ATU+zfuadIhde9C/A==} + /@wyw-in-js/vite@0.4.1(vite@3.2.10): + resolution: {integrity: sha512-Z29wT+3OGQitSGCceQrvFLUggq6RDjKLChhp4Q9VlISA0nMMDbMGFzryTH3AZOhWYNYiCcFXTi+1fhnIkKXdfQ==} engines: {node: '>=16.0.0'} peerDependencies: vite: '>=3.2.7' dependencies: '@rollup/pluginutils': 5.0.4(rollup@3.28.0) - '@wyw-in-js/shared': 0.4.0 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/shared': 0.4.1 + '@wyw-in-js/transform': 0.4.1 vite: 3.2.10(@types/node@17.0.39) transitivePeerDependencies: - rollup - supports-color + dev: false - /@wyw-in-js/vite@0.4.0(vite@3.2.7): - resolution: {integrity: sha512-2bgGtWoalsmogI8Mb/0Jf+ptB66aDF2STgw5b68AkqOgReUQvijQ1M3B++4G9Jh5OF278ATU+zfuadIhde9C/A==} + /@wyw-in-js/vite@0.5.3(vite@3.2.10): + resolution: {integrity: sha512-rhgsAqototS/LAoe2dcClSO6+fAqElgbaFbzfnfyIJDDH5vXtFvYUHGpz9SojpYUmmzy7JoiFT+8GEE6WZIdwg==} engines: {node: '>=16.0.0'} peerDependencies: vite: '>=3.2.7' dependencies: - '@rollup/pluginutils': 5.0.4(rollup@3.28.0) - '@wyw-in-js/shared': 0.4.0 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/shared': 0.5.3 + '@wyw-in-js/transform': 0.5.3 + vite: 3.2.10(@types/node@17.0.39) + transitivePeerDependencies: + - supports-color + dev: true + + /@wyw-in-js/vite@0.5.3(vite@3.2.7): + resolution: {integrity: sha512-rhgsAqototS/LAoe2dcClSO6+fAqElgbaFbzfnfyIJDDH5vXtFvYUHGpz9SojpYUmmzy7JoiFT+8GEE6WZIdwg==} + engines: {node: '>=16.0.0'} + peerDependencies: + vite: '>=3.2.7' + dependencies: + '@wyw-in-js/shared': 0.5.3 + '@wyw-in-js/transform': 0.5.3 vite: 3.2.7(@types/node@17.0.39) transitivePeerDependencies: - - rollup - supports-color dev: true - /@wyw-in-js/webpack-loader@0.4.0(webpack@5.76.0): - resolution: {integrity: sha512-fM+ROtsMSPXGBJ/k2tSo4Cvj2o0q25ZPTK0y4YkUxc/4aDXMUv9Rx1mVu7T6+soIcRZrNcYYxla5qE/BeHyhAQ==} + /@wyw-in-js/webpack-loader@0.5.3(webpack@5.76.0): + resolution: {integrity: sha512-Irg+e7gTDapvldtp5KXGBTn1WH13Rt9fT+pPYwxZ+2x81sPsw13J1Tit+cR6R91CzqbOb01WXwYFLR9wx6XEbA==} engines: {node: '>=16.0.0'} peerDependencies: webpack: ^5.76.0 dependencies: - '@wyw-in-js/shared': 0.4.0 - '@wyw-in-js/transform': 0.4.0 + '@wyw-in-js/shared': 0.5.3 + '@wyw-in-js/transform': 0.5.3 webpack: 5.76.0(esbuild@0.18.20)(webpack-cli@5.0.0) transitivePeerDependencies: - supports-color @@ -4865,8 +4932,8 @@ packages: typescript: 5.2.2 unist-util-visit: 4.1.1 vfile: 5.3.6 - vite: 3.2.8(@types/node@17.0.39) - vitefu: 0.2.3(vite@3.2.8) + vite: 3.2.7(@types/node@17.0.39) + vitefu: 0.2.3(vite@3.2.7) yargs-parser: 21.1.1 zod: 3.19.1 transitivePeerDependencies: @@ -5850,7 +5917,6 @@ packages: /content-type@1.0.4: resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==} engines: {node: '>= 0.6'} - dev: false /content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} @@ -6101,6 +6167,7 @@ packages: /dargs@7.0.0: resolution: {integrity: sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==} engines: {node: '>=8'} + dev: true /dashdash@1.14.1: resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==} @@ -7521,7 +7588,7 @@ packages: array-flatten: 1.1.1 body-parser: 1.20.2 content-disposition: 0.5.4 - content-type: 1.0.5 + content-type: 1.0.4 cookie: 0.6.0 cookie-signature: 1.0.6 debug: 2.6.9 @@ -8009,6 +8076,7 @@ packages: meow: 8.1.2 split2: 3.2.2 through2: 4.0.2 + dev: true /github-slugger@1.5.0: resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==} @@ -10150,6 +10218,7 @@ packages: /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: true /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} @@ -10525,6 +10594,7 @@ packages: trim-newlines: 3.0.1 type-fest: 0.18.1 yargs-parser: 20.2.9 + dev: true /meow@9.0.0: resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==} @@ -12204,6 +12274,7 @@ packages: inherits: 2.0.4 string_decoder: 1.3.0 util-deprecate: 1.0.2 + dev: true /readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} @@ -13127,6 +13198,7 @@ packages: resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==} dependencies: readable-stream: 3.6.2 + dev: true /sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} @@ -13284,6 +13356,7 @@ packages: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} dependencies: safe-buffer: 5.2.1 + dev: true /stringify-entities@4.0.3: resolution: {integrity: sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==} @@ -13719,6 +13792,7 @@ packages: resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==} dependencies: readable-stream: 3.6.2 + dev: true /through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} @@ -13897,7 +13971,7 @@ packages: resolution: {integrity: sha512-ZHqlstlQF449v8glscGRXzL6l2dZvASPCdXJRWG4gHEZlUVx2Jtmr+a2zeVG4LCsKhDXKRj5R3h0C/98UcVAQg==} dependencies: '@types/json5': 0.0.30 - '@types/resolve': 1.20.2 + '@types/resolve': 1.20.6 json5: 2.2.3 resolve: 1.22.8 strip-bom: 4.0.0 @@ -14615,40 +14689,6 @@ packages: fsevents: 2.3.3 dev: true - /vite@3.2.8(@types/node@17.0.39): - resolution: {integrity: sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 17.0.39 - esbuild: 0.15.16 - postcss: 8.4.31 - resolve: 1.22.8 - rollup: 2.79.1 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /vitefu@0.1.1(vite@3.2.10): resolution: {integrity: sha512-HClD14fjMJ+NQgXBqT3dC3RdO/+Chayil+cCPYZKY3kT+KcJomKzrdgzfCHJkIL2L0OAY+VPvrSW615iPtc7ag==} peerDependencies: @@ -14671,17 +14711,6 @@ packages: vite: 3.2.7(@types/node@17.0.39) dev: true - /vitefu@0.2.3(vite@3.2.8): - resolution: {integrity: sha512-75l7TTuU8isAhz1QFtNKjDkqjxvndfMC1AfIMjJ0ZQ59ZD0Ow9QOIsJJX16Wv9PS8f+zMzp6fHy5cCbKG/yVUQ==} - peerDependencies: - vite: ^3.0.0 || ^4.0.0 - peerDependenciesMeta: - vite: - optional: true - dependencies: - vite: 3.2.8(@types/node@17.0.39) - dev: true - /vscode-css-languageservice@6.1.1: resolution: {integrity: sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA==} dependencies: diff --git a/website/package.json b/website/package.json index 0ef1115e7..451bead3f 100644 --- a/website/package.json +++ b/website/package.json @@ -42,8 +42,8 @@ "@babel/cli": "^7.23.4", "@babel/core": "^7.23.5", "@linaria/stylelint": "workspace:^", - "@wyw-in-js/babel-preset": "^0.4.0", - "@wyw-in-js/webpack-loader": "^0.4.0", + "@wyw-in-js/babel-preset": "^0.5.3", + "@wyw-in-js/webpack-loader": "^0.5.3", "babel-loader": "^8.2.5", "babel-plugin-module-resolver": "^4.1.0", "cross-env": "^7.0.3",