Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade webpack to v5 #7540

Merged
merged 7 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion config/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

const path = require('path');
const webpack = require('webpack');
const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');

/**
* A regular expression used to replace Firestore's and Storage's platform-
Expand All @@ -28,6 +29,11 @@ const PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
module.exports = {
mode: 'development',
devtool: 'source-map',
optimization: {
runtimeChunk: false,
splitChunks: false,
minimize: false
},
module: {
rules: [
{
Expand Down Expand Up @@ -98,7 +104,7 @@ module.exports = {
modules: ['node_modules', path.resolve(__dirname, '../../node_modules')],
mainFields: ['browser', 'module', 'main'],
extensions: ['.js', '.ts'],
symlinks: false
symlinks: true
},
plugins: [
new webpack.NormalModuleReplacementPlugin(PLATFORM_RE, resource => {
Expand All @@ -108,6 +114,7 @@ module.exports = {
`$1/platform/${targetPlatform}/$2.ts`
);
}),
new NodePolyfillPlugin(),
new webpack.EnvironmentPlugin([
'RTDB_EMULATOR_PORT',
'RTDB_EMULATOR_NAMESPACE'
Expand Down
6 changes: 5 additions & 1 deletion integration/firebase/test/namespace.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
* limitations under the License.
*/

import firebase from 'firebase/compat';
import firebase from 'firebase/compat/app';
import 'firebase/compat/auth';
import 'firebase/compat/database';
import 'firebase/compat/storage';
import 'firebase/compat/messaging';
import * as namespaceDefinition from './namespaceDefinition.json';
import validateNamespace from './validator';

Expand Down
2 changes: 1 addition & 1 deletion integration/firestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"mocha": "9.2.2",
"ts-loader": "8.4.0",
"typescript": "4.2.2",
"webpack": "4.46.0",
"webpack": "5.76.0",
"webpack-stream": "6.1.2"
}
}
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"size-report": "ts-node-script scripts/size_report/report_binary_size.ts",
"modular-export-size-report": "ts-node-script scripts/size_report/report_modular_export_binary_size.ts",
"api-report": "lerna run --scope @firebase/* api-report",
"postinstall": "yarn --cwd repo-scripts/changelog-generator build",
"postinstall": "patch-package && yarn --cwd repo-scripts/changelog-generator build",
"sa": "ts-node-script repo-scripts/size-analysis/cli.ts",
"api-documenter-devsite": "ts-node-script repo-scripts/api-documenter/src/start.ts",
"format": "ts-node ./scripts/format/format.ts"
Expand Down Expand Up @@ -122,7 +122,7 @@
"karma-sourcemap-loader": "0.4.0",
"karma-spec-reporter": "0.0.34",
"karma-summary-reporter": "3.1.1",
"karma-webpack": "4.0.2",
"karma-webpack": "5.0.0",
"lcov-result-merger": "3.1.0",
"lerna": "4.0.0",
"listr": "0.14.3",
Expand All @@ -132,9 +132,12 @@
"mkdirp": "1.0.4",
"mocha": "9.2.2",
"mz": "2.7.0",
"node-polyfill-webpack-plugin": "2.0.1",
"npm-run-all": "4.1.5",
"nyc": "15.1.0",
"ora": "5.4.1",
"patch-package": "7.0.0",
"postinstall-postinstall": "2.1.0",
"prettier": "2.8.7",
"protractor": "5.4.2",
"request": "2.88.2",
Expand All @@ -151,7 +154,7 @@
"typedoc": "0.16.11",
"typescript": "4.7.4",
"watch": "1.0.2",
"webpack": "4.46.0",
"webpack": "5.76.0",
"yargs": "17.7.1"
}
}
1 change: 1 addition & 0 deletions packages/auth-compat/test/helpers/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import * as sinon from 'sinon';
import firebase from '@firebase/app-compat';
import '@firebase/auth-compat';
import { Provider } from '@firebase/component';
import '../..';

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/test/helpers/integration/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import * as sinon from 'sinon';
import { deleteApp, initializeApp } from '@firebase/app';
import { Auth, User } from '../../../src/model/public_types';
renkelvin marked this conversation as resolved.
Show resolved Hide resolved
import { Auth, User } from '@firebase/auth';

import { getAuth, connectAuthEmulator } from '../../../'; // Use browser OR node dist entrypoint depending on test env.
import { _generateEventId } from '../../../src/core/util/event_id';
Expand Down
23 changes: 23 additions & 0 deletions patches/karma-webpack+5.0.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/node_modules/karma-webpack/lib/webpack/plugin.js b/node_modules/karma-webpack/lib/webpack/plugin.js
index 47b993c..3b75a9e 100644
--- a/node_modules/karma-webpack/lib/webpack/plugin.js
+++ b/node_modules/karma-webpack/lib/webpack/plugin.js
@@ -1,4 +1,5 @@
const fs = require('fs');
+const path = require('path');

class KW_WebpackPlugin {
constructor(options) {
@@ -14,9 +15,10 @@ class KW_WebpackPlugin {
// read generated file content and store for karma preprocessor
this.controller.bundlesContent = {};
stats.toJson().assets.forEach((webpackFileObj) => {
- const filePath = `${compiler.options.output.path}/${
+ const filePath = path.resolve(
+ compiler.options.output.path,
webpackFileObj.name
- }`;
+ );
this.controller.bundlesContent[webpackFileObj.name] = fs.readFileSync(
filePath,
'utf-8'
2 changes: 1 addition & 1 deletion repo-scripts/size-analysis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-typescript2": "0.31.2",
"@rollup/plugin-virtual": "2.1.0",
"webpack": "4.46.0",
"webpack": "5.76.0",
"@types/webpack": "5.28.0",
"webpack-virtual-modules": "0.5.0",
"child-process-promise": "2.2.1",
Expand Down
Loading
Loading