Skip to content

Commit 9305abe

Browse files
committed
refactor: Remove Preact v8 support
1 parent ff12b91 commit 9305abe

File tree

14 files changed

+10
-170
lines changed

14 files changed

+10
-170
lines changed

packages/async-loader/async-legacy.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

packages/async-loader/legacy.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

packages/async-loader/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"node": ">=8"
1919
},
2020
"dependencies": {
21-
"kleur": "^4.1.4",
2221
"loader-utils": "^2.0.0"
2322
},
2423
"peerDependencies": {

packages/async-loader/utils.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/cli/lib/lib/webpack/utils.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

packages/cli/lib/lib/webpack/webpack-base-config.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const webpack = require('webpack');
22
const path = require('path');
33
const { resolve, dirname } = require('path');
44
const { readFileSync, existsSync } = require('fs');
5-
const { isInstalledVersionPreactXOrAbove } = require('./utils');
65
const autoprefixer = require('autoprefixer');
76
const browserslist = require('browserslist');
87
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@@ -72,7 +71,6 @@ function getSassConfiguration(...includePaths) {
7271
module.exports = function createBaseConfig(env) {
7372
const { cwd, isProd, isWatch, src, source } = env;
7473
const babelConfigFile = env.babelConfig || '.babelrc';
75-
const IS_SOURCE_PREACT_X_OR_ABOVE = isInstalledVersionPreactXOrAbove(cwd);
7674
// Apply base-level `env` values
7775
env.dest = resolve(cwd, env.dest || 'build');
7876
env.manifest = readJson(source('manifest.json')) || {};
@@ -153,9 +151,9 @@ module.exports = function createBaseConfig(env) {
153151
'react-dom': compat,
154152
'preact-compat': compat,
155153
'react-addons-css-transition-group': 'preact-css-transition-group',
156-
'preact-cli/async-component': IS_SOURCE_PREACT_X_OR_ABOVE
157-
? require.resolve('@preact/async-loader/async')
158-
: require.resolve('@preact/async-loader/async-legacy'),
154+
'preact-cli/async-component': require.resolve(
155+
'@preact/async-loader/async'
156+
),
159157
},
160158
},
161159

packages/cli/lib/lib/webpack/webpack-client-config.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const webpack = require('webpack');
22
const { resolve, join } = require('path');
33
const { existsSync } = require('fs');
4-
const { isInstalledVersionPreactXOrAbove } = require('./utils');
54
const { merge } = require('webpack-merge');
65
const { filter } = require('minimatch');
76
const SizePlugin = require('size-plugin');
@@ -25,12 +24,12 @@ const cleanFilename = name =>
2524
''
2625
);
2726

27+
/**
28+
* @returns {Promise<import('webpack').Configuration>}
29+
*/
2830
async function clientConfig(env) {
29-
const { isProd, source, src, cwd /*, port? */ } = env;
30-
const IS_SOURCE_PREACT_X_OR_ABOVE = isInstalledVersionPreactXOrAbove(cwd);
31-
const asyncLoader = IS_SOURCE_PREACT_X_OR_ABOVE
32-
? require.resolve('@preact/async-loader')
33-
: require.resolve('@preact/async-loader/legacy');
31+
const { isProd, source, src } = env;
32+
const asyncLoader = require.resolve('@preact/async-loader');
3433

3534
let entry = {
3635
bundle: resolve(__dirname, './../entry'),

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
},
5454
"peerDependencies": {
5555
"less-loader": "^7.3.0",
56-
"preact": "*",
57-
"preact-render-to-string": "*",
56+
"preact": "^10.0.0",
57+
"preact-render-to-string": "^5.0.0",
5858
"sass-loader": "^10.2.0",
5959
"stylus-loader": "^4.3.3"
6060
},

packages/cli/tests/client.test.js

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,6 @@ describe('client-side tests', () => {
4747
server.server.close();
4848
});
4949

50-
it('should hydrate routes progressively with preact8.', async () => {
51-
let dir = await subject('progressive-hydration-preact8');
52-
await build(dir, {}, true);
53-
const server = getServer(join(dir, 'build'), PORT);
54-
55-
// let page = await loadPage(chrome, `http://127.0.0.1:${PORT}/`);
56-
const page = await chrome.newPage();
57-
58-
page.on('console', consoleMessage => {
59-
// eslint-disable-next-line
60-
console[consoleMessage.type()](consoleMessage.text());
61-
});
62-
63-
await page.goto(`http://127.0.0.1:${PORT}/`);
64-
65-
// await waitUntilExpression(page, `window.booted`);
66-
await sleep(500);
67-
68-
const mutations = await page.evaluate('window.ROOT_MUTATION_COUNT');
69-
70-
expect(mutations).toEqual(0);
71-
72-
expect(await page.evaluate('window.CHANGED_VAR')).toEqual(undefined);
73-
await page.click('button');
74-
expect(await page.evaluate('window.CHANGED_VAR')).toEqual(1);
75-
76-
server.server.close();
77-
});
78-
7950
it('should hydrate for pre-rendered URLs only', async () => {
8051
let dir = await subject('prerendering-hydration');
8152
await build(dir, {});

packages/cli/tests/subjects/progressive-hydration-preact8/index.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)