fix: conflict

ice-lab · Sep 26, 2022 · 7bd7a01 · 7bd7a01
2 parents b761f58 + 34a83a6
commit 7bd7a01
Show file tree

Hide file tree

Showing 243 changed files with 14,536 additions and 537 deletions.
diff --git a/examples/app-config/src/typings.d.ts b/examples/app-config/src/typings.d.ts
@@ -1,14 +1 @@
-declare module '*.module.less' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.css' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.scss' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
+/// <reference types="@ice/app/types" />
diff --git a/examples/app-config/tsconfig.json b/examples/app-config/tsconfig.json
@@ -28,5 +28,5 @@
     }
   },
   "include": ["src", ".ice", "ice.config.*"],
-  "exclude": ["node_modules", "build", "public"]
+  "exclude": ["build", "public"]
 }
diff --git a/examples/basic-project/src/pages/about.tsx b/examples/basic-project/src/pages/about.tsx
@@ -1,6 +1,5 @@
 import { Link, useData, useConfig, history } from 'ice';
 import { isWeb } from '@uni/env';
-// @ts-expect-error
 import url from './ice.png';
 
 interface Data {

diff --git a/examples/basic-project/src/pages/index.tsx b/examples/basic-project/src/pages/index.tsx
@@ -89,4 +89,4 @@ export function getStaticData() {
     count: 100,
     from: 'getStaticData',
   };
-}
+}
diff --git a/examples/basic-project/src/typings.d.ts b/examples/basic-project/src/typings.d.ts
@@ -1,14 +1 @@
-declare module '*.module.less' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.css' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.scss' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
+/// <reference types="@ice/app/types" />
diff --git a/examples/basic-project/tsconfig.json b/examples/basic-project/tsconfig.json
@@ -28,5 +28,5 @@
     }
   },
   "include": ["src", ".ice", "ice.config.*"],
-  "exclude": ["node_modules", "build", "public"]
+  "exclude": ["build", "public"]
 }
diff --git a/examples/csr-project/src/typings.d.ts b/examples/csr-project/src/typings.d.ts
@@ -1,14 +1 @@
-declare module '*.module.less' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.css' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
-declare module '*.module.scss' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
+/// <reference types="@ice/app/types" />
diff --git a/examples/csr-project/tsconfig.json b/examples/csr-project/tsconfig.json
@@ -28,5 +28,5 @@
     }
   },
   "include": ["src", ".ice", "ice.config.*"],
-  "exclude": ["node_modules", "build", "public"]
+  "exclude": ["build", "public"]
 }
diff --git a/examples/disable-data-loader/ice.config.mts b/examples/disable-data-loader/ice.config.mts
@@ -0,0 +1,5 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig({
+  dataLoader: false,
+});
diff --git a/examples/disable-data-loader/package.json b/examples/disable-data-loader/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "disable-data-loader",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "ice start",
+    "build": "ice build",
+    "build:splitChunks": "ice build --config splitChunks.config.mts"
+  },
+  "description": "",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@ice/app": "workspace:*",
+    "@ice/plugin-auth": "workspace:*",
+    "@ice/plugin-rax-compat": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "@uni/env": "^1.1.0",
+    "ahooks": "^3.3.8",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.2",
+    "speed-measure-webpack-plugin": "^1.5.0",
+    "webpack": "^5.73.0"
+  }
+}
diff --git a/examples/disable-data-loader/src/app.tsx b/examples/disable-data-loader/src/app.tsx
@@ -0,0 +1,19 @@
+import { defineAppConfig } from 'ice';
+import type { GetAppData } from 'ice';
+
+export default defineAppConfig({
+  app: {
+    rootId: 'app',
+  },
+});
+
+export const getAppData: GetAppData = () => {
+  return new Promise((resolve) => {
+    resolve({
+      title: 'gogogogo',
+      auth: {
+        admin: true,
+      },
+    });
+  });
+};
diff --git a/examples/disable-data-loader/src/document.tsx b/examples/disable-data-loader/src/document.tsx
@@ -0,0 +1,22 @@
+import { Meta, Title, Links, Main, Scripts } from 'ice';
+
+function Document() {
+  return (
+    <html>
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="description" content="ICE 3.0 Demo" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Title />
+        <Links />
+      </head>
+      <body>
+        <Main />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default Document;
diff --git a/examples/disable-data-loader/src/pages/index.tsx b/examples/disable-data-loader/src/pages/index.tsx
@@ -0,0 +1,37 @@
+export default function Home() {
+  return (
+    <>
+      <h2 className="title">Home Page</h2>
+    </>
+  );
+}
+
+export function getConfig() {
+  return {
+    title: 'Home',
+    meta: [
+      {
+        name: 'theme-color',
+        content: '#000',
+      },
+      {
+        name: 'title-color',
+        content: '#f00',
+      },
+    ],
+    auth: ['admin'],
+  };
+}
+
+export function getData({ pathname, query }) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve({
+        name: 'Home',
+        count: 100,
+        pathname,
+        query,
+      });
+    }, 1 * 100);
+  });
+}
diff --git a/examples/disable-data-loader/tsconfig.json b/examples/disable-data-loader/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "compileOnSave": false,
+  "buildOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "es6",
+    "jsx": "react-jsx",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
+    "allowJs": true,
+    "rootDir": "./",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noImplicitAny": false,
+    "importHelpers": true,
+    "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@/*": ["./src/*"],
+      "ice": [".ice"]
+    }
+  },
+  "include": ["src", ".ice", "ice.config.*"],
+  "exclude": ["node_modules", "build", "public"]
+}
diff --git a/examples/miniapp-project/.browserslistrc b/examples/miniapp-project/.browserslistrc
@@ -0,0 +1 @@
+chrome 55
diff --git a/examples/miniapp-project/ice.config.mts b/examples/miniapp-project/ice.config.mts
@@ -0,0 +1,11 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig({
+  alias: {
+    components: './src/components',
+  },
+  // TODO:
+  // proxy: {}
+  sourceMap: false,
+  // eslint: false,
+});
diff --git a/examples/miniapp-project/mock/foo.ts b/examples/miniapp-project/mock/foo.ts
@@ -0,0 +1,3 @@
+export default {
+  '/api/foo': { foo: 'foo' },
+};
diff --git a/examples/miniapp-project/mock/user.ts b/examples/miniapp-project/mock/user.ts
@@ -0,0 +1,9 @@
+import type { Request, Response } from 'express';
+
+export default {
+  'GET /api/users': ['a', 'b'],
+  'POST /api/users/:id': (req: Request, res: Response) => {
+    const { id } = req.params;
+    res.send({ id: id });
+  },
+};
diff --git a/examples/miniapp-project/package.json b/examples/miniapp-project/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "miniapp-project",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "ice start",
+    "start:wechat": "ice start --platform wechat-miniprogram",
+    "start:ali": "ice start --platform ali-miniapp",
+    "build": "ice build",
+    "build:wechat": "ice build --platform wechat-miniprogram"
+  },
+  "description": "",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@ice/app": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "ahooks": "^3.3.8",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.2",
+    "browserslist": "^4.19.3",
+    "speed-measure-webpack-plugin": "^1.5.0",
+    "webpack": "^5.73.0"
+  }
+}
diff --git a/examples/miniapp-project/public/favicon.ico b/examples/miniapp-project/public/favicon.ico
diff --git a/examples/miniapp-project/src/app.tsx b/examples/miniapp-project/src/app.tsx
@@ -0,0 +1,26 @@
+import { defineAppConfig, type GetAppData } from 'ice';
+
+export const getAppData: GetAppData = () => {
+  return new Promise((resolve) => {
+    resolve({
+      success: true,
+      id: 34293,
+    });
+  });
+};
+
+
+export const miniappManifest = {
+  title: 'miniapp test',
+  routes: [
+    'index',
+    'about',
+    'second/profile',
+  ],
+};
+
+export default defineAppConfig({
+  app: {
+    rootId: 'app',
+  },
+});
diff --git a/examples/miniapp-project/src/components/Logo/index.css b/examples/miniapp-project/src/components/Logo/index.css
@@ -0,0 +1,5 @@
+.logo {
+  width: 200rpx;
+  height: 180rpx;
+  margin-bottom: 20rpx;
+}
diff --git a/examples/miniapp-project/src/components/bar.tsx b/examples/miniapp-project/src/components/bar.tsx
@@ -0,0 +1,7 @@
+export default function Bar() {
+  return (
+    <view>
+      bar
+    </view>
+  );
+}
diff --git a/examples/miniapp-project/src/document.tsx b/examples/miniapp-project/src/document.tsx
@@ -0,0 +1,22 @@
+import { Meta, Title, Links, Main, Scripts } from 'ice';
+
+function Document() {
+  return (
+    <html>
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="description" content="ICE 3.0 Demo" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Title />
+        <Links />
+      </head>
+      <body>
+        <Main />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default Document;
diff --git a/examples/miniapp-project/src/global.less b/examples/miniapp-project/src/global.less
@@ -0,0 +1,3 @@
+.global {
+  font-size: 14px;
+}
diff --git a/examples/miniapp-project/src/pages/about.tsx b/examples/miniapp-project/src/pages/about.tsx
@@ -0,0 +1,15 @@
+// import './index.css';
+
+export default function Home() {
+  return (
+    <>
+      <view className="title">About</view>
+    </>
+  );
+}
+
+export function getConfig() {
+  return {
+    title: 'About',
+  };
+}
diff --git a/examples/miniapp-project/src/pages/ice.png b/examples/miniapp-project/src/pages/ice.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,4 +89,4 @@ export function getStaticData() { @@
         count: 100,
         from: 'getStaticData',
       };
-    }
+    }