Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ const create = async(appName, options) => {
'--import-alias "@/*"',
];

await runCommand('npx', commandArguments);
await runCommand('npx', commandArguments, {
env: { ...process.env, npm_config_ignore_scripts: 'true' }
});

const appPath = path.join(process.cwd(), appName);

Expand Down
21 changes: 13 additions & 8 deletions packages/devextreme-cli/src/utility/package-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ const packageManagers = {
installCommand: 'install',
lockFileName: 'package-lock.json',
getLockFile: (cwd) => getLock(cwd, 'package-lock.json', JSON),
getDependencies: (obj) => obj.dependencies
getDependencies: (obj) => obj.dependencies,
defaultInstallationOptions: ['--ignore-scripts']
},
yarn: {
installCommand: 'add',
lockFileName: 'yarn.lock',
getLockFile: (cwd) => getLock(cwd, 'yarn.lock', yarnLockfile),
getDependencies: (obj) => obj.object
getDependencies: (obj) => obj.object,
defaultInstallationOptions: ['--ignore-scripts']
}
};

Expand Down Expand Up @@ -51,12 +53,10 @@ const getDependencies = (evaluatingOptions = {}) => {

const installPackage = (packageName, evaluatingOptions = {}, options = {}) => {
const packageManager = getPackageManager(evaluatingOptions.cwd);
const instalationOptions = options[packageManager];
const defaultInstallationOptions = packageManagers[packageManager].defaultInstallationOptions || [];
const instalationOptions = options[packageManager] || [];
const commandArguments = [packageManagers[packageManager].installCommand];

if(instalationOptions) {
commandArguments.push(...instalationOptions);
}
commandArguments.push(...defaultInstallationOptions, ...instalationOptions);

commandArguments.push(packageName);

Expand All @@ -65,7 +65,12 @@ const installPackage = (packageName, evaluatingOptions = {}, options = {}) => {

const run = (commands, evaluatingOptions = {}) => runCommand(getPackageManager(evaluatingOptions.cwd), commands, evaluatingOptions);

const runInstall = (evaluatingOptions = {}) => run(['install'], evaluatingOptions);
const runInstall = (evaluatingOptions = {}) => {
const packageManager = getPackageManager(evaluatingOptions.cwd);
const defaultInstallationOptions = packageManagers[packageManager].defaultInstallationOptions || [];

return runCommand(packageManager, ['install', ...defaultInstallationOptions], evaluatingOptions);
};

const hasPackageScript = (scriptName, evaluatingOptions = {}) => {
const cwd = evaluatingOptions.cwd;
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-cli/testing/themebuilder/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ module.exports.buildPackage = async() => {
module.exports.prepareDirectory = async(devextremeVersion, themeBuilderVersion, workDirectory) => {
await runCommand('npm', ['init', '--yes'], { cwd: workDirectory });
if(devextremeVersion) {
await runCommand('npm', ['install', `devextreme@${devextremeVersion}`, '--save-exact'], { cwd: workDirectory });
await runCommand('npm', ['install', `devextreme@${devextremeVersion}`, '--save-exact', '--ignore-scripts'], { cwd: workDirectory });
}
if(themeBuilderVersion) {
await runCommand('npm', ['install', `devextreme-themebuilder@${themeBuilderVersion}`, '--save-exact'], { cwd: workDirectory });
await runCommand('npm', ['install', `devextreme-themebuilder@${themeBuilderVersion}`, '--save-exact', '--ignore-scripts'], { cwd: workDirectory });
}
// we need to install cli as tgz (regular install for folder make symlink and require works in wrong way)
await runCommand('npm', ['install', `../../../devextreme-cli-${cliVersion}.tgz`, '--save-exact'], { cwd: workDirectory });
await runCommand('npm', ['install', `../../../devextreme-cli-${cliVersion}.tgz`, '--save-exact', '--ignore-scripts'], { cwd: workDirectory });
};

module.exports.parseDetectedVersion = (output) => {
Expand Down
30 changes: 2 additions & 28 deletions packages/devextreme-schematics/src/add-app-template/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import {
Rule,
chain,
schematic,
Tree,
schematic
} from '@angular-devkit/schematics';

import { existsSync } from 'fs';
import { resolve, join } from 'path';

import { spawnSync } from 'child_process';

export default function(options: any): Rule {
const rules = [
schematic('install', {
Expand All @@ -23,13 +17,7 @@ export default function(options: any): Rule {
skipInstall: true,
updateBudgets: options.updateBudgets,
globalNgCliVersion: options.globalNgCliVersion
}),
// schematics installed packages with flag --ignore-scripts
// @angular/cli@14 add option allowScript to NodePackageInstallTask
(host: Tree) => {
postinstallScripts();
return host;
}
})
];

if (!options.empty) {
Expand All @@ -40,17 +28,3 @@ export default function(options: any): Rule {

return chain(rules);
}

const postinstallScripts = () => {
const isWin = /^win/.test(process.platform);

const sassEmbeddedPath = resolve('node_modules', 'sass-embedded');
const sassVendorPath = join(sassEmbeddedPath, 'dist', 'lib', 'src', 'vendor', 'dart-sass-embedded');
if (!existsSync(sassVendorPath)) {
spawnSync('npm', ['run', 'postinstall'], {
cwd: resolve(join('node_modules', 'sass-embedded')),
windowsVerbatimArguments: true,
shell: isWin ? false : true
});
}
};
5 changes: 2 additions & 3 deletions packages/devextreme-schematics/src/add-layout/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ import { insertImport } from '@schematics/angular/utility/ast-utils';
import { getWorkspace } from '@schematics/angular/utility/workspace';
import { Change } from '@schematics/angular/utility/change';

import { PatchNodePackageInstallTask } from '../utility/patch';
import { isAngularVersionHigherThan } from '../utility/angular-version';
import { RunSchematicTask } from '@angular-devkit/schematics/tasks';
import { NodePackageInstallTask, RunSchematicTask } from '@angular-devkit/schematics/tasks';

const routes = [
{
Expand Down Expand Up @@ -438,7 +437,7 @@ export default function(options: any): Rule {

if (!options.skipInstall) {
rules.push((_: Tree, context: SchematicContext) => {
const installTaskId = context.addTask(new PatchNodePackageInstallTask());
const installTaskId = context.addTask(new NodePackageInstallTask());
context.addTask(new RunSchematicTask('build-themes', {}), [installTaskId]);
});
}
Expand Down
5 changes: 2 additions & 3 deletions packages/devextreme-schematics/src/install/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import { latestVersions } from '../utility/latest-versions';
import { modifyJSONFile } from '../utility/modify-json-file';
import { getProjectName } from '../utility/project';

import { PatchNodePackageInstallTask } from '../utility/patch';
import { RunSchematicTask } from '@angular-devkit/schematics/tasks';
import { NodePackageInstallTask, RunSchematicTask } from '@angular-devkit/schematics/tasks';

export default function(options: any): Rule {

Expand All @@ -27,7 +26,7 @@ export default function(options: any): Rule {
(host: Tree) => addDevExtremeCSS(host, { project: options.project }),
(host: Tree) => reqisterJSZip(host),
(_, context: SchematicContext) => {
const installTaskId = context.addTask(new PatchNodePackageInstallTask());
const installTaskId = context.addTask(new NodePackageInstallTask());
context.addTask(new RunSchematicTask('build-themes', {}), [installTaskId]);
},
]);
Expand Down
14 changes: 0 additions & 14 deletions packages/devextreme-schematics/src/utility/patch.ts

This file was deleted.

Loading