Skip to content

Commit bead3d7

Browse files
XXXMrGXXXMrG
committed
chore: merge master
2 parents e492022 + 3e52e5d commit bead3d7

Some content is hidden

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

62 files changed

+2678
-1905
lines changed

‎.changeset/breezy-days-press.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@ice/app': major
3+
'@ice/runtime': minor
4+
'@ice/webpack-config': patch
5+
'@ice/rspack-config': patch
6+
'@ice/shared-config': patch
7+
'@ice/runtime-kit': patch
8+
'@ice/bundles': patch
9+
---
10+
11+
feat: new api and structure for release 4.0

‎examples/basic-project/compatHtml.config.mts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineConfig } from '@ice/app';
2+
import defaultConfig from './ice.config.mjs';
3+
4+
export default defineConfig(() => ({
5+
...defaultConfig,
6+
htmlGenerating: {
7+
mode: 'compat'
8+
}
9+
}));

‎examples/with-suspense-ssr/src/document.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ function Document() {
1313
</head>
1414
<body>
1515
<Main />
16-
<script dangerouslySetInnerHTML={{ __html: 'window.addEventListener(\'suspense\', (d) => console.log(\'suspence event=\', d))' }} />
16+
<script
17+
defer
18+
dangerouslySetInnerHTML={{
19+
__html: "window.addEventListener('ice-suspense', (e) => console.log('ice-suspense', e));",
20+
}}
21+
/>
1722
<Scripts async />
1823
</body>
1924
</html>

‎examples/with-suspense-ssr/src/pages/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function Home() {
1111
<h2>Home Page</h2>
1212
<Counter />
1313
<Comments id="comments" fallback={<div>loading...</div>} />
14-
<Footer id="comments" fallback={<div>loading...</div>} />
14+
<Footer id="comments-2" fallback={<div>loading...</div>} />
1515
</div>
1616
);
1717
}

‎package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,5 @@
7575
"[email protected]": "patches/[email protected]",
7676
"@rspack/[email protected]": "patches/@[email protected]"
7777
}
78-
},
79-
"workspaces": [
80-
"packages/runtime-kit"
81-
]
78+
}
8279
}

‎packages/bundles/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 0.2.8
4+
5+
### Patch Changes
6+
7+
- 97cb2046: @ice/app: align the output result with the former esbuild
8+
@ice/bundles: export more webpack internal modules
9+
- 97cb2046: @ice/app: remove unused deps and import them from @ice/bundles
10+
@ice/bundles: compile tsconfig-paths-webpack-plugin
11+
- a0099df5: fix: update es-module-lexer
12+
313
## 0.2.7
414

515
### Patch Changes

‎packages/bundles/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ice/bundles",
3-
"version": "0.2.7",
3+
"version": "0.2.8",
44
"license": "MIT",
55
"author": "ICE",
66
"description": "Basic dependencies for ice.",
@@ -63,7 +63,7 @@
6363
"css-loader": "6.7.1",
6464
"css-minimizer-webpack-plugin": "3.4.1",
6565
"cssnano": "^5.1.7",
66-
"es-module-lexer": "0.10.5",
66+
"es-module-lexer": "1.6.0",
6767
"esbuild-register": "3.4.1",
6868
"eslint": "^8.14.0",
6969
"eslint-webpack-plugin": "3.1.1",

‎packages/bundles/webpack/bundle.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ module.exports = {
1010
SingleEntryPlugin: require('webpack/lib/SingleEntryPlugin'),
1111
FetchCompileAsyncWasmPlugin: require('webpack/lib/web/FetchCompileAsyncWasmPlugin'),
1212
FetchCompileWasmPlugin: require('webpack/lib/web/FetchCompileWasmPlugin'),
13+
JavascriptModulesPlugin: require('webpack/lib/javascript/JavascriptModulesPlugin'),
14+
StartupChunkDependenciesPlugin: require('webpack/lib/runtime/StartupChunkDependenciesPlugin'),
15+
StartupHelpers: require('webpack/lib/javascript/StartupHelpers'),
16+
compileBooleanMatcher: require('webpack/lib/util/compileBooleanMatcher'),
17+
identifier: require('webpack/lib/util/identifier'),
1318
StringXor: require('webpack/lib/util/StringXor'),
1419
NormalModule: require('webpack/lib/NormalModule'),
1520
EntryDependency: require('webpack/lib/dependencies/EntryDependency'),

‎packages/bundles/webpack/packages/JavascriptModulesPlugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./bundle').JavascriptModulesPlugin;

‎packages/bundles/webpack/packages/StartupChunkDependenciesPlugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./bundle').StartupChunkDependenciesPlugin;

0 commit comments

Comments
 (0)