Merge pull request #175 from airbnb/fix-linaria-deps

Upgrade deps & fix missing linaria issue in create CLI template
airbnb · Nov 21, 2022 · 1b10f19 · 1b10f19
2 parents e963a6e + 0a07177
commit 1b10f19
Show file tree

Hide file tree

Showing 5 changed files with 2,877 additions and 2,990 deletions.
diff --git a/packages/cli/src/config/webpack.config.ts b/packages/cli/src/config/webpack.config.ts
@@ -270,6 +270,7 @@ export const getWebpackConfig = ({
         },
       ],
     },
+    // @ts-ignore
     plugins: [
       new MiniCssExtractPlugin({
         filename: `[name].${CSS_FILE_EXT[target] ?? 'wxss'}`,

diff --git a/packages/core/src/render.ts b/packages/core/src/render.ts
@@ -2,10 +2,19 @@ import { ReactElement } from 'react';
 import { Container } from './container';
 import { reconciler } from './reconciler';
 
-export function renderIntoContainer(rootElement: ReactElement | null, container: Container) {
+export function renderIntoContainer(rootElement: ReactElement, container: Container) {
   // Create a root Container if it doesn't exist
   if (!container.fiberRootContainer) {
-    container.fiberRootContainer = reconciler.createContainer(container, 0, false, null);
+    container.fiberRootContainer = reconciler.createContainer(
+      container,
+      0,
+      null,
+      false,
+      null,
+      '',
+      () => {},
+      null,
+    );
   }
 
   reconciler.updateContainer(rootElement, container.fiberRootContainer, null, () => {});

diff --git a/packages/create-goji-app/templates/package.json b/packages/create-goji-app/templates/package.json
@@ -23,6 +23,7 @@
     "@types/css-modules": "^1.0.0",
     "@types/react": "^16.9.35",
     "@types/weixin-app": "^2.9.3",
+    "linaria": "^2.3.0",
     "typescript": "^4.0.3"
   }
 }
diff --git a/packages/webpack-plugin/src/plugins/projectConfig.ts b/packages/webpack-plugin/src/plugins/projectConfig.ts
@@ -9,7 +9,10 @@ import { GojiBasedWebpackPlugin } from './based';
 type CopyPluginPatterns = Array<{
   from: string;
   to: string;
-  transform?: (content: Buffer, path: string) => string | Buffer | Promise<string | Buffer>;
+  transform?: (
+    content: Buffer,
+    path: string,
+  ) => string | Buffer | Promise<string> | Promise<Buffer>;
 }>;
 
 export class GojiProjectConfigPlugin extends GojiBasedWebpackPlugin {