Merge pull request #5046 from NativeScript/tachev/fix-webpack-check · NativeScript/nativescript-cli@3ab06aa · GitHub

NativeScript / nativescript-cli Public

• Notifications You must be signed in to change notification settings
• Fork 205
• Star 1.1k

• Code
• Issues 356
• Pull requests 22
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 3ab06aa

Browse filesBrowse the repository at this point in the historyBrowse files

Dimitar Tachev

authored

Merge pull request #5046 from NativeScript/tachev/fix-webpack-check

fix: allow pre-release versions of Webpack plugin 1.3.0

2 parents 4c560c6 + 5afd794 commit 3ab06aa
Copy full SHA for 3ab06aa

1 file changed

+3-3Lines changed: 3 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/services/webpack
  • webpack-compiler-service.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/services/webpack/webpack-compiler-service.ts‎

Copy file name to clipboardExpand all lines: lib/services/webpack/webpack-compiler-service.ts

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -42,14 +42,14 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
42	42	if (message.emittedFiles) {
43	43	if (isFirstWebpackWatchCompilation) {
44	44	isFirstWebpackWatchCompilation = false;
45		- this.expectedHash = message.hash;
	45	+ this.expectedHash = message.hash;
46	46	return;
47	47	}
48	48
49	49	let result;
50	50
51	51	if (prepareData.hmr) {
52		- result = this.getUpdatedEmittedFiles(message.emittedFiles, message.chunkFiles, message.hash);
	52	+ result = this.getUpdatedEmittedFiles(message.emittedFiles, message.chunkFiles, message.hash);
53	53	} else {
54	54	result = { emittedFiles: message.emittedFiles, fallbackFiles: <string[]>[], hash: "" };
55	55	}
@@ -219,7 +219,7 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
219	219	} else if (this.$hostInfo.isWindows) {
220	220	const minWebpackPluginWithWinSnapshotsVersion = "1.3.0";
221	221	const installedWebpackPluginVersion = await this.$packageInstallationManager.getInstalledDependencyVersion(WEBPACK_PLUGIN_NAME, projectData.projectDir);
222		- const hasWebpackPluginWithWinSnapshotsSupport = !!installedWebpackPluginVersion ? semver.gte(installedWebpackPluginVersion, minWebpackPluginWithWinSnapshotsVersion) : true;
	222	+ const hasWebpackPluginWithWinSnapshotsSupport = !!installedWebpackPluginVersion ? semver.gte(semver.coerce(installedWebpackPluginVersion), minWebpackPluginWithWinSnapshotsVersion) : true;
223	223	if (!hasWebpackPluginWithWinSnapshotsSupport) {
224	224	this.$errors.fail(`In order to generate Snapshots on Windows, please upgrade your Webpack plugin version (npm i nativescript-dev-webpack@latest).`);
225	225	}

0 commit comments

Comments

0 (0)