Merge pull request #657 from ice-lab/release-next

Release-rc.6

Author: ClarkXia

examples/basic-project/ice.config.mts

@@ -1,6 +1,5 @@
 import { defineConfig } from '@ice/app';
 import SpeedMeasurePlugin from 'speed-measure-webpack-plugin';
-import auth from '@ice/plugin-auth';
 import custom from './plugin';
 
 export default defineConfig({
@@ -23,7 +22,6 @@ export default defineConfig({
   },
   dropLogLevel: 'warn',
   plugins: [
-    auth(),
     custom,
   ],
   eslint: true,

examples/basic-project/package.json

@@ -11,7 +11,6 @@
   "license": "MIT",
   "dependencies": {
     "@ice/app": "workspace:*",
-    "@ice/plugin-auth": "workspace:*",
     "@ice/plugin-rax-compat": "workspace:*",
     "@ice/runtime": "workspace:*",
     "@uni/env": "^1.1.0",

examples/basic-project/src/app.tsx

@@ -1,5 +1,4 @@
 import { defineAppConfig } from 'ice';
-import { defineAuthConfig } from '@ice/plugin-auth/esm/types';
 import { isWeb, isNode } from '@uni/env';
 import type { GetAppData } from 'ice';
 
@@ -11,6 +10,7 @@ console.log('__LOG__');
 console.warn('__WARN__');
 console.error('__ERROR__');
 console.log('process.env.HAHA', process.env.HAHA);
+console.log('process.env.undefinedEnv', process.env.undefinedEnv);
 
 if (isWeb) {
   console.error('__IS_WEB__');
@@ -20,15 +20,6 @@ if (isNode) {
   console.error('__IS_NODE__');
 }
 
-export const auth = defineAuthConfig((data) => {
-  // fetch auth data
-  return {
-    initialAuth: {
-      admin: data?.auth?.admin,
-    },
-  };
-});
-
 export default defineAppConfig({
   app: {
     rootId: 'app',
@@ -39,9 +30,6 @@ export const getAppData: GetAppData = () => {
   return new Promise((resolve) => {
     resolve({
       title: 'gogogogo',
-      auth: {
-        admin: true,
-      },
     });
   });
 };

examples/basic-project/src/pages/about.tsx

@@ -41,7 +41,6 @@ export function getConfig(): RouteConfig {
     scripts: [{
       src: 'https://cdn.jsdelivr.net/npm/lodash@2.4.1/dist/lodash.min.js',
     }],
-    auth: ['admin'],
   };
 }
 

examples/basic-project/src/pages/blog.tsx

@@ -17,6 +17,5 @@ export default function Blog() {
 export const getConfig = defineGetConfig(() => {
   return {
     title: 'Blog',
-    auth: ['guest'],
   };
 });

examples/basic-project/src/pages/index.tsx

@@ -1,5 +1,5 @@
 import { Suspense, lazy } from 'react';
-import { Link, useData, useAppData, useConfig, ClientOnly, useMounted } from 'ice';
+import { Link, useData, useAppData, useConfig } from 'ice';
 // not recommended but works
 import { useAppContext } from '@ice/runtime';
 import { useRequest } from 'ahooks';
@@ -16,8 +16,6 @@ export default function Home(props) {
   const appData = useAppData<AppData>();
   const data = useData();
   const config = useConfig();
-  const mounted = useMounted();
-
   if (typeof window !== 'undefined') {
     console.log('render Home', props);
     console.log('get AppData', appData);
@@ -42,19 +40,6 @@ export default function Home(props) {
         <div>userInfo: {JSON.stringify(userInfo)}</div>
         <div>data from: <span id="data-from">{data.from}</span></div>
       </div>
-      <p>
-        <div>{mounted ? 'Client' : 'Server'}</div>
-        <ClientOnly>
-          {() => {
-            const PageUrl = lazy(() => import('@/components/PageUrl'));
-            return (
-              <Suspense>
-                <PageUrl />
-              </Suspense>
-            );
-          }}
-        </ClientOnly>
-      </p>
     </>
   );
 }
@@ -72,7 +57,6 @@ export function getConfig() {
         content: '#f00',
       },
     ],
-    auth: ['admin'],
   };
 }
 

examples/basic-project/src/pages/layout.tsx

@@ -1,6 +1,6 @@
 import { Outlet, useData, useConfig } from 'ice';
 
-export default () => {
+export default function Layout() {
   const data = useData();
   const config = useConfig();
 
@@ -12,7 +12,7 @@ export default () => {
       <Outlet />
     </div>
   );
-};
+}
 
 export function getConfig() {
   return {
@@ -23,7 +23,6 @@ export function getConfig() {
         content: '#f00',
       },
     ],
-    auth: ['admin'],
   };
 }
 

examples/miniapp-project/package.json

@@ -14,6 +14,7 @@
   "dependencies": {
     "@ice/app": "workspace:*",
     "@ice/runtime": "workspace:*",
+    "@ice/miniapp-html-styles": "workspace:*",
     "@ice/plugin-miniapp": "workspace:*",
     "@ice/miniapp-runtime": "workspace:*",
     "ahooks": "^3.3.8",

examples/miniapp-project/src/global.less

@@ -1,3 +1,5 @@
+@import '@ice/miniapp-html-styles/html';
+
 .global {
   font-size: 14px;
 }

examples/with-auth/ice.config.mts

@@ -0,0 +1,8 @@
+import { defineConfig } from '@ice/app';
+import auth from '@ice/plugin-auth';
+
+export default defineConfig({
+  plugins: [
+    auth(),
+  ],
+});