@o3r/application 10.3.0-prerelease.64 → 10.3.0-prerelease.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/application",
|
|
3
|
-
"version": "10.3.0-prerelease.
|
|
3
|
+
"version": "10.3.0-prerelease.65",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"@angular-devkit/schematics": "~17.3.0",
|
|
29
29
|
"@angular/common": "~17.3.0",
|
|
30
30
|
"@angular/core": "~17.3.0",
|
|
31
|
-
"@o3r/core": "^10.3.0-prerelease.
|
|
32
|
-
"@o3r/logger": "^10.3.0-prerelease.
|
|
33
|
-
"@o3r/routing": "^10.3.0-prerelease.
|
|
34
|
-
"@o3r/schematics": "^10.3.0-prerelease.
|
|
35
|
-
"@o3r/testing": "^10.3.0-prerelease.
|
|
31
|
+
"@o3r/core": "^10.3.0-prerelease.65",
|
|
32
|
+
"@o3r/logger": "^10.3.0-prerelease.65",
|
|
33
|
+
"@o3r/routing": "^10.3.0-prerelease.65",
|
|
34
|
+
"@o3r/schematics": "^10.3.0-prerelease.65",
|
|
35
|
+
"@o3r/testing": "^10.3.0-prerelease.65",
|
|
36
36
|
"@schematics/angular": "~17.3.0",
|
|
37
37
|
"rxjs": "^7.8.1",
|
|
38
38
|
"typescript": "~5.4.2"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAM/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAoGtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const utility_1 = require("@schematics/angular/utility");
|
|
5
6
|
const path = require("node:path");
|
|
6
|
-
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
7
7
|
const cms_registration_1 = require("./helpers/cms-registration");
|
|
8
|
+
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
8
9
|
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
9
10
|
logger.error(`[ERROR]: Adding @o3r/application has failed.
|
|
10
11
|
If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the o3r application package. Please run 'ng add @o3r/core' .
|
|
@@ -18,15 +19,16 @@ Otherwise, use the error message as guidance.`);
|
|
|
18
19
|
function ngAddFn(options) {
|
|
19
20
|
/* ng add rules */
|
|
20
21
|
return async (tree, context) => {
|
|
21
|
-
const {
|
|
22
|
+
const { getAppModuleFilePath, getWorkspaceConfig, insertImportToModuleFile, setupDependencies, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
22
23
|
const { isImported } = await Promise.resolve().then(() => require('@schematics/angular/utility/ast-utils'));
|
|
23
24
|
const ts = await Promise.resolve().then(() => require('typescript'));
|
|
24
25
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
25
26
|
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
26
27
|
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
27
28
|
const addAngularAnimationPreferences = () => {
|
|
29
|
+
const additionalRules = [];
|
|
28
30
|
const moduleFilePath = getAppModuleFilePath(tree, context, options.projectName);
|
|
29
|
-
if (!moduleFilePath) {
|
|
31
|
+
if (!moduleFilePath || !options.projectName) {
|
|
30
32
|
return tree;
|
|
31
33
|
}
|
|
32
34
|
const sourceFileContent = tree.readText(moduleFilePath);
|
|
@@ -35,12 +37,12 @@ function ngAddFn(options) {
|
|
|
35
37
|
context.logger.info('[LOG]: prefersReducedMotion from @o3r/application is already imported.');
|
|
36
38
|
return tree;
|
|
37
39
|
}
|
|
40
|
+
const importInRootModule = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `\n${external(name, file)}${moduleFunction}`));
|
|
38
41
|
const recorder = tree.beginUpdate(moduleFilePath);
|
|
39
|
-
const { moduleIndex } = getModuleIndex(sourceFile, sourceFileContent);
|
|
40
42
|
insertImportToModuleFile('prefersReducedMotion', '@o3r/application', sourceFile, recorder, moduleFilePath);
|
|
41
|
-
|
|
43
|
+
importInRootModule('BrowserAnimationsModule', '@angular/platform-browser/animations', '.withConfig({disableAnimations: prefersReducedMotion()})');
|
|
42
44
|
tree.commitUpdate(recorder);
|
|
43
|
-
return tree;
|
|
45
|
+
return (0, schematics_1.chain)(additionalRules)(tree, context);
|
|
44
46
|
};
|
|
45
47
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
46
48
|
acc[dep] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AACA,2DAAmD;AACnD,kCAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AACA,2DAAmD;AACnD,yDAA4D;AAC5D,kCAAkC;AAClC,iEAAmE;AACnE,2EAAmE;AAGnE,MAAM,0BAA0B,GAAG,CAAC,MAA2C,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,EAAE;IAClG,MAAM,CAAC,KAAK,CAAC;;8CAE+B,CAAC,CAAC;IAC9C,MAAM,MAAM,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,EACJ,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,EACd,8BAA8B,EAC9B,uBAAuB,EACxB,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QACpC,MAAM,EAAE,UAAU,EAAE,GAAG,2CAAa,uCAAuC,EAAC,CAAC;QAC7E,MAAM,EAAE,GAAG,2CAAa,YAAY,EAAC,CAAC;QACtC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QAEjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnH,MAAM,8BAA8B,GAAS,GAAG,EAAE;YAChD,MAAM,eAAe,GAAW,EAAE,CAAC;YACnC,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAEhF,IAAI,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,cAAc,EACd,iBAAiB,EACjB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YAEF,IAAI,UAAU,CAAC,UAAU,EAAE,sBAAsB,EAAE,kBAAkB,CAAC,EAAE,CAAC;gBACvE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;gBAC9F,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,cAAuB,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CACtG,IAAA,uBAAa,EAAC,OAAO,CAAC,WAAY,EAAE,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAE,EAAE,CAAC,IAAI,CAAA,KAAK,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,cAAc,EAAE,CAAC,CAC5G,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAElD,wBAAwB,CACtB,sBAAsB,EACtB,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACR,cAAc,CACf,CAAC;YAEF,kBAAkB,CAChB,yBAAyB,EACzB,sCAAsC,EACtC,0DAA0D,CAC3D,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC5B,OAAO,IAAA,kBAAK,EAAC,eAAe,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,8BAA8B,CAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAE1G,MAAM,mBAAmB,GAAG,MAAM,IAAA,wCAAgB,EAAC,OAAO,CAAC,CAAC;QAC5D,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,iBAAiB,CAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YACF,8BAA8B;YAC9B,mBAAmB;YACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC;SAC/B,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrF,MAAM,EAAE,qCAAqC,EAAE,GAAG,MAAM,qCAAO,iBAAiB,GAAE,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5H,OAAO,qCAAqC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC,CAAC;AAHW,QAAA,KAAK,SAGhB"}
|