Skip to content
This repository was archived by the owner on Nov 17, 2022. It is now read-only.

Commit 2ad98a0

Browse files
authored
Merge pull request #553 from ice-lab/release-next
Release-rc.4
2 parents 854b7b3 + 22d9b21 commit 2ad98a0

File tree

287 files changed

+18075
-6018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+18075
-6018
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const { getESLintConfig } = require('@applint/spec');
22

33
const commonRules = {
44
'react/jsx-filename-extension': 0,
5+
'react/no-unknown-property': 0,
56
'no-underscore-dangle': 0,
67
'class-methods-use-this': 0,
78
'no-param-reassign': 0,
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
declare module '*.module.less' {
2-
const classes: { [key: string]: string };
3-
export default classes;
4-
}
5-
6-
declare module '*.module.css' {
7-
const classes: { [key: string]: string };
8-
export default classes;
9-
}
10-
11-
declare module '*.module.scss' {
12-
const classes: { [key: string]: string };
13-
export default classes;
14-
}
1+
/// <reference types="@ice/app/types" />

examples/app-config/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
}
2929
},
3030
"include": ["src", ".ice", "ice.config.*"],
31-
"exclude": ["node_modules", "build", "public"]
31+
"exclude": ["build", "public"]
3232
}

examples/basic-project/ice.config.mts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ export default defineConfig({
2424
dropLogLevel: 'warn',
2525
plugins: [
2626
auth(),
27-
{
28-
name: 'runtime-donot-exsist',
29-
setup() {},
30-
runtime: './test',
31-
},
3227
custom,
3328
],
3429
eslint: true,

examples/basic-project/src/components/bar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import style from './cssWithEscapedSymbols.module.css';
22

3-
console.log('style', style);
3+
console.log('style', style.test);
44

55
export default function Bar() {
66
return (

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Link, useData, useConfig, history } from 'ice';
22
import { isWeb } from '@uni/env';
3-
// @ts-expect-error
43
import url from './ice.png';
54

65
interface Data {
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
export default function Downgrade() {
2+
const isNode = typeof process !== 'undefined' && !!(process.versions && process.versions.node);
3+
4+
if (isNode) {
5+
throw new Error('Downgrade to CSR.');
6+
}
7+
8+
return (
9+
<>
10+
<h2>Page Downgrade to CSR.</h2>
11+
</>
12+
);
13+
}
14+
15+
export function getConfig() {
16+
return {
17+
title: 'hello',
18+
};
19+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ export function getStaticData() {
8989
count: 100,
9090
from: 'getStaticData',
9191
};
92-
}
92+
}
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
declare module '*.module.less' {
2-
const classes: { [key: string]: string };
3-
export default classes;
4-
}
5-
6-
declare module '*.module.css' {
7-
const classes: { [key: string]: string };
8-
export default classes;
9-
}
10-
11-
declare module '*.module.scss' {
12-
const classes: { [key: string]: string };
13-
export default classes;
14-
}
1+
/// <reference types="@ice/app/types" />

examples/basic-project/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"baseUrl": ".",
66
"outDir": "build",
77
"module": "esnext",
8-
"target": "es6",
8+
"target": "ESNext",
99
"jsx": "react-jsx",
1010
"moduleResolution": "node",
1111
"allowSyntheticDefaultImports": true,
@@ -28,5 +28,5 @@
2828
}
2929
},
3030
"include": ["src", ".ice", "ice.config.*"],
31-
"exclude": ["node_modules", "build", "public"]
31+
"exclude": ["build", "public"]
3232
}

0 commit comments

Comments
 (0)