javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 18:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: detect core version before including inspector_modules on android (#10520)

Browse Source
This commit is contained in:
Igor Randjelovic
2024-04-16 14:20:14 +02:00
committed by GitHub
parent e234ca6052
commit ccee8e8166
12 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
View File

@ -435,9 +435,6 @@ exports[`angular configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

3
packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
View File

@ -323,9 +323,6 @@ exports[`base configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

3
packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
View File

@ -322,9 +322,6 @@ exports[`javascript configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

6
packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
View File

@ -352,9 +352,6 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"
@ -683,9 +680,6 @@ exports[`react configuration > android > base config 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

3
packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
View File

@ -344,9 +344,6 @@ exports[`svelte configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

3
packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap
View File

@ -322,9 +322,6 @@ exports[`typescript configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

3
packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
View File

@ -357,9 +357,6 @@ exports[`vue configuration for android 1`] = `
'__jest__/src/app.js',
'@nativescript/core/ui/frame',
'@nativescript/core/ui/frame/activity'
],
'tns_modules/inspector_modules': [
'@nativescript/core/inspector_modules'
]
}
}"

27
packages/webpack5/__tests__/configuration/base.spec.ts
View File

@ -4,6 +4,7 @@ import fs from 'fs';
import base from '../../src/configuration/base';
import { init } from '../../src';
import { applyFileReplacements } from '../../src/helpers/fileReplacements';
import * as dependenciesHelpers from '../../src/helpers/dependencies';
import { additionalCopyRules } from '../../src/helpers/copyRules';
describe('base configuration', () => {
@ -221,4 +222,30 @@ describe('base configuration', () => {
expect(config.output.get('sourceMapFilename')).toMatchSnapshot();
expect(config.get('devtool')).toBe('hidden-source-map');
});
it('includes inspector_modules on android when @nativescript/core version is >= 8.7.0', () => {
const getDependencyVersionSpy = jest.spyOn(
dependenciesHelpers,
'getDependencyVersion'
);
getDependencyVersionSpy.withImplementation(
(name) => {
if (name === '@nativescript/core') {
return '8.7.0';
}
return null;
},
() => {
init({
android: true,
});
const config = base(new Config());
const entry = config.entryPoints.get('tns_modules/inspector_modules');
expect(entry).toBeDefined();
expect(entry.values().length).toBe(1);
}
);
});
});

1
packages/webpack5/package.json
View File

@ -41,6 +41,7 @@
"sass": "^1.0.0",
"sass-loader": "^13.0.0",
"sax": "^1.0.0",
"semver": "^7.0.0 || ^6.0.0",
"source-map": "^0.7.0",
"terser-webpack-plugin": "^5.0.0",
"ts-dedent": "^2.0.0",

37
packages/webpack5/src/configuration/angular.ts
View File

@ -1,9 +1,10 @@
import { extname, resolve } from 'path';
import Config from 'webpack-chain';
import { satisfies } from 'semver';
import { existsSync } from 'fs';
import { getTypescript, readTsConfig } from '../helpers/typescript';
import { getDependencyPath } from '../helpers/dependencies';
import { getDependencyVersion } from '../helpers/dependencies';
import { getProjectTSConfigPath } from '../helpers/project';
import { env as _env, IWebpackEnv } from '../index';
import { warnOnce } from '../helpers/log';
@ -187,13 +188,16 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
.loader('angular-hot-loader');
});
const buildAngularMajorVersion = getBuildAngularMajorVersion();
if (buildAngularMajorVersion) {
const buildAngularVersion = getDependencyVersion(
'@angular-devkit/build-angular'
);
if (buildAngularVersion) {
const buildAngularOptions: any = {
aot: !disableAOT,
};
if (buildAngularMajorVersion < 15) {
if (satisfies(buildAngularVersion, '<15.0.0')) {
const tsConfig = readTsConfig(tsConfigPath);
const { ScriptTarget } = getTypescript();
buildAngularOptions.scriptTarget =
@ -315,27 +319,6 @@ function getAngularWebpackPlugin(): any {
return AngularWebpackPlugin;
}
const MAJOR_VER_RE = /^(\d+)\./;
function getBuildAngularMajorVersion() {
const buildAngularPath = getDependencyPath('@angular-devkit/build-angular');
if (!buildAngularPath) {
return null;
}
try {
const buildAngularVersion =
require(`${buildAngularPath}/package.json`).version;
const [_, majorStr] = buildAngularVersion.match(MAJOR_VER_RE);
return Number(majorStr);
} catch (err) {
// ignore
}
return null;
}
function tryRequireResolve(path: string) {
try {
return require.resolve(path);
@ -348,10 +331,10 @@ function getWebpackLoaderPath() {
return (
tryRequireResolve(
'@angular-devkit/build-angular/src/babel/webpack-loader'
) ||
) ??
tryRequireResolve(
'@angular-devkit/build-angular/src/tools/babel/webpack-loader'
) ||
) ??
// fallback to angular 16.1+
'@angular-devkit/build-angular/src/tools/babel/webpack-loader'
);

15
packages/webpack5/src/configuration/base.ts
View File

@ -5,6 +5,7 @@ import {
HotModuleReplacementPlugin,
} from 'webpack';
import Config from 'webpack-chain';
import { satisfies } from 'semver';
import { existsSync } from 'fs';
import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
@ -12,11 +13,11 @@ import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import TerserPlugin from 'terser-webpack-plugin';
import { getProjectFilePath, getProjectTSConfigPath } from '../helpers/project';
import { getDependencyVersion, hasDependency } from '../helpers/dependencies';
import { PlatformSuffixPlugin } from '../plugins/PlatformSuffixPlugin';
import { applyFileReplacements } from '../helpers/fileReplacements';
import { addCopyRule, applyCopyRules } from '../helpers/copyRules';
import { WatchStatePlugin } from '../plugins/WatchStatePlugin';
import { hasDependency } from '../helpers/dependencies';
import { applyDotEnvPlugin } from '../helpers/dotEnv';
import { env as _env, IWebpackEnv } from '../index';
import { getValue } from '../helpers/config';
@ -86,7 +87,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
const sourceMapAbsolutePath = getProjectFilePath(
`./${
env.buildPath ?? 'platforms'
}/${platform}-sourceMaps/[file].map[query]`,
}/${platform}-sourceMaps/[file].map[query]`
);
const sourceMapRelativePath = relative(outputPath, sourceMapAbsolutePath);
config.output.sourceMapFilename(sourceMapRelativePath);
@ -451,7 +452,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
* +-----------------------------------------------------------------------------------------+
*/
/System.import\(\) is deprecated/,
]),
])
);
// todo: refine defaults
@ -516,7 +517,11 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
function shouldIncludeInspectorModules(): boolean {
const platform = getPlatformName();
// todo: check if core modules are external
// todo: check if we are testing
const coreVersion = getDependencyVersion('@nativescript/core');
if (coreVersion && satisfies(coreVersion, '>=8.7.0')) {
return platform === 'ios' || platform === 'android';
}
return platform === 'ios';
}

20
packages/webpack5/src/helpers/dependencies.ts
View File

@ -47,3 +47,23 @@ export function getDependencyPath(dependencyName: string): string | null {
return null;
}
}
/**
* Utility to get the version of a dependency.
*
* @param dependencyName
* @returns string | null - version of the dependency or null if not found
*/
export function getDependencyVersion(dependencyName: string): string | null {
const dependencyPath = getDependencyPath(dependencyName);
if (!dependencyPath) {
return null;
}
try {
return require(`${dependencyPath}/package.json`).version;
} catch (err) {
// ignore
}
return null;
}