Merge pull request #5784 from alibaba/release/3.0

Release 3.0.6
alibaba · Jan 12, 2023 · 8ef7703 · 8ef7703
2 parents a48d8ce + ccb0d86
commit 8ef7703
Show file tree

Hide file tree

Showing 94 changed files with 1,325 additions and 253 deletions.
diff --git a/examples/basic-project/ice.config.mts b/examples/basic-project/ice.config.mts
@@ -3,6 +3,7 @@ import SpeedMeasurePlugin from 'speed-measure-webpack-plugin';
 import customPlugin from './plugin';
 
 export default defineConfig(() => ({
+  ssr: true,
   publicPath: '/',
   polyfill: 'entry',
   syntaxFeatures: {

diff --git a/examples/memory-router/ice.config.mts b/examples/memory-router/ice.config.mts
@@ -0,0 +1,11 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig(() => ({
+  publicPath: '/',
+  ssr: false,
+  ssg: false,
+  splitChunks: false,
+  routes: {
+    injectInitialEntry: true,
+  }
+}));
diff --git a/examples/memory-router/package.json b/examples/memory-router/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "memory-router",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "ice start",
+    "build": "ice build",
+    "build:optimization": "ice build --config optimization.config.mts"
+  },
+  "description": "",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@ice/app": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0"
+  }
+}
diff --git a/examples/memory-router/src/app.tsx b/examples/memory-router/src/app.tsx
@@ -0,0 +1,7 @@
+import { defineAppConfig } from 'ice';
+
+export default defineAppConfig(() => ({
+  router: {
+    type: 'memory',
+  },
+}));
diff --git a/examples/memory-router/src/document.tsx b/examples/memory-router/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 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/memory-router/src/pages/about.tsx b/examples/memory-router/src/pages/about.tsx
@@ -0,0 +1,11 @@
+import { useState } from 'react';
+
+export default function About() {
+  const [count, setCount] = useState(0);
+  return (
+    <div>
+      <h2>About: {count}</h2>
+      <div onClick={() => { setCount(count + 1); }}>+add</div>
+    </div>
+  );
+}
diff --git a/examples/memory-router/src/pages/dashboard/blog.tsx b/examples/memory-router/src/pages/dashboard/blog.tsx
@@ -0,0 +1,11 @@
+import { useState } from 'react';
+
+export default function Blog() {
+  const [count, setCount] = useState(0);
+  return (
+    <div>
+      <h2>Blog: {count}</h2>
+      <div onClick={() => { setCount(count + 1); }}>+add</div>
+    </div>
+  );
+}
diff --git a/examples/memory-router/src/pages/index.tsx b/examples/memory-router/src/pages/index.tsx
@@ -0,0 +1,11 @@
+import { useState } from 'react';
+
+export default function Home() {
+  const [count, setCount] = useState(0);
+  return (
+    <div>
+      <h2>Home: {count}</h2>
+      <div onClick={() => { setCount(count + 1); }}>+add</div>
+    </div>
+  );
+}
diff --git a/examples/memory-router/tsconfig.json b/examples/memory-router/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/package.json b/examples/miniapp-project/package.json
@@ -3,10 +3,10 @@
   "version": "1.0.0",
   "scripts": {
     "start": "ice start",
-    "start:wechat": "ice start --platform wechat-miniprogram",
-    "start:ali": "ice start --platform ali-miniapp",
+    "start:wechat": "ice start --target wechat-miniprogram",
+    "start:ali": "ice start --target ali-miniapp",
     "build": "ice build",
-    "build:wechat": "ice build --platform wechat-miniprogram"
+    "build:wechat": "ice build --target wechat-miniprogram"
   },
   "description": "",
   "author": "",

diff --git a/examples/multi-target/.browserslistrc b/examples/multi-target/.browserslistrc
@@ -0,0 +1 @@
+chrome 55
diff --git a/examples/multi-target/ice.config.mts b/examples/multi-target/ice.config.mts
@@ -0,0 +1,9 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig(() => ({
+  ssr: true,
+  ssg: true,
+  define: {
+    'process.env.NODE_ENV': JSON.stringify(true),
+  },
+}));
diff --git a/examples/multi-target/package.json b/examples/multi-target/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "multi-entry",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "ice start",
+    "build": "ice build"
+  },
+  "description": "",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@ice/app": "workspace:*",
+    "@ice/plugin-rax-compat": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.2"
+  }
+}
diff --git a/examples/multi-target/public/favicon.ico b/examples/multi-target/public/favicon.ico
diff --git a/examples/multi-target/src/app.tsx b/examples/multi-target/src/app.tsx
@@ -0,0 +1,3 @@
+import { defineAppConfig } from 'ice';
+
+export default defineAppConfig(() => ({ }));
diff --git a/examples/multi-target/src/document.tsx b/examples/multi-target/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 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/multi-target/src/global.css b/examples/multi-target/src/global.css
@@ -0,0 +1,3 @@
+body {
+  font-size: 14px;
+}
diff --git a/examples/multi-target/src/pages/about.tsx b/examples/multi-target/src/pages/about.tsx
@@ -0,0 +1,3 @@
+export default function About() {
+  return (<div id="about">Target={import.meta.target} Renderer={import.meta.renderer}</div>);
+}
diff --git a/examples/multi-target/src/types.ts b/examples/multi-target/src/types.ts
@@ -0,0 +1,4 @@
+export interface AppData {
+  title: string;
+}
+
diff --git a/examples/multi-target/src/typings.d.ts b/examples/multi-target/src/typings.d.ts
@@ -0,0 +1 @@
+/// <reference types="@ice/app/types" />
diff --git a/examples/multi-target/tsconfig.json b/examples/multi-target/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "compileOnSave": false,
+  "buildOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "ESNext",
+    "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": ["build", "public"]
+}
diff --git a/examples/rax-inline-style/src/components/HybridReactComponent/index.tsx b/examples/rax-inline-style/src/components/HybridReactComponent/index.tsx
@@ -0,0 +1,10 @@
+export default function HybridReactComponent() {
+  return (
+    <div style={{
+      width: '400rpx',
+      height: '200rpx',
+      background: 'red',
+    }}
+    >HybridReactComponent in 400rpx * 200rpx red box.</div>
+  );
+}
diff --git a/examples/rax-inline-style/src/document.tsx b/examples/rax-inline-style/src/document.tsx
@@ -1,5 +1,4 @@
 /* @jsx createElement */
-import { createElement } from 'rax';
 import { Meta, Title, Links, Main, Scripts } from 'ice';
 
 function Document() {

diff --git a/examples/rax-inline-style/src/pages/index.jsx b/examples/rax-inline-style/src/pages/index.jsx
@@ -3,6 +3,7 @@ import View from 'rax-view';
 import Text from 'rax-text';
 import Logo from '@/components/Logo';
 import Title from '@/components/Title';
+import HybridReactComponent from '@/components/HybridReactComponent';
 import './index.css';
 
 export default function Home() {
@@ -25,6 +26,7 @@ export default function Home() {
       <Title />
       <Text className="homeInfo">More information about Rax</Text>
       <Text className="homeInfo">Visit https://rax.js.org</Text>
+      <HybridReactComponent />
     </View>
   );
 }
diff --git a/packages/bundles/CHANGELOG.md b/packages/bundles/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.3
+
+- [fix] Bump version of `@ice/swc-plugin-keep-export`(0.1.3 -> 0.1.4), https://github.com/ice-lab/swc-plugins/pull/8
+
 ## 0.1.2
 
 - [fix] add esbuild and esbuild-register

diff --git a/packages/bundles/package.json b/packages/bundles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/bundles",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "author": "ICE",
   "description": "Basic dependencies for ice.",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@swc/core": "1.3.19",
     "@ice/swc-plugin-remove-export": "0.1.2",
-    "@ice/swc-plugin-keep-export": "0.1.3",
+    "@ice/swc-plugin-keep-export": "0.1.4",
     "@ice/swc-plugin-keep-platform": "0.1.2",
     "ansi-html-community": "^0.0.8",
     "html-entities": "^2.3.2",

diff --git a/packages/ice/CHANGELOG.md b/packages/ice/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v3.0.6
+
+- [feat] support `import.meta.target`, `import.meta.renderer` and `import.meta.env`
+- [feat] support config `routes.injectInitialEntry` for memory router
+- [fix] cli option `--platform` change to `--target`
+- [fix] remove code when dead code is `ObjectProperties`
+- [fix] rebuild server entry when document changed
+- [fix] set ssr default value to `false`
+- [fix] server compiler options when bundle server entry
+- [fix] support define expression of basename
+
 ## v3.0.5
 
 - [fix] bump @swc/helpers version (0.4.12-> 0.4.14) for module cannot resolve of `@swc/helpers/src/_object_destructuring_empty.mjs`

diff --git a/packages/ice/bin/checkNodeVersion.mjs b/packages/ice/bin/checkNodeVersion.mjs
diff --git a/packages/ice/bin/copy-dts-to-ice-temp.mjs b/packages/ice/bin/copy-dts-to-ice-temp.mjs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { defineAppConfig } from 'ice';

		export default defineAppConfig(() => ({ }));