@wavemaker/angular-codegen 11.8.0-next.141680 → 11.8.0-next.141682

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.
Files changed (5) hide show
  1. package/angular-app/package-lock.json +13 -13
  2. package/angular-app/package.json +3 -3
  3. package/build-angular-app.js +12 -10
  4. package/npm-shrinkwrap.json +2 -2
  5. package/package.json +1 -1
package/angular-app/package-lock.json CHANGED
@@ -37,7 +37,7 @@
37
37
  "@metrichor/jmespath": "0.3.1",
38
38
  "@wavemaker/focus-trap": "1.0.1",
39
39
  "@wavemaker/nvd3": "1.8.11",
40
- "@wavemaker/variables": "11.8.0-next.141680",
40
+ "@wavemaker/variables": "11.8.0-next.141682",
41
41
  "@ztree/ztree_v3": "3.5.48",
42
42
  "angular-imask": "^7.6.1",
43
43
  "angular2-websocket": "0.9.7",
@@ -6452,9 +6452,9 @@
6452
6452
  }
6453
6453
  },
6454
6454
  "node_modules/@wavemaker/variables": {
6455
- "version": "11.8.0-next.141680",
6456
- "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-next.141680.tgz",
6457
- "integrity": "sha512-KIrn4wd5nyvpa8LanaX5Jf6Kza8m75924l+FILPC8sv1/zAfrGd4NavD/z5YMzT7sV3lpyYNBAoCqNLOpG2izg==",
6455
+ "version": "11.8.0-next.141682",
6456
+ "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-next.141682.tgz",
6457
+ "integrity": "sha512-vUdjHK3llez+/zxOv1zc0JtHp5x4YgCIO4JknVOjLuqo2j/Xum8bS6QtR/SJKdkS0AatA0rsjhWS7bdvjDVVZg==",
6458
6458
  "hasShrinkwrap": true,
6459
6459
  "dependencies": {
6460
6460
  "@metrichor/jmespath": "^0.3.1",
@@ -6903,9 +6903,9 @@
6903
6903
  "extraneous": true
6904
6904
  },
6905
6905
  "node_modules/@wavemaker/variables/node_modules/caniuse-lite": {
6906
- "version": "1.0.30001642",
6907
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz",
6908
- "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==",
6906
+ "version": "1.0.30001643",
6907
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
6908
+ "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
6909
6909
  "extraneous": true,
6910
6910
  "funding": [
6911
6911
  {
@@ -7026,9 +7026,9 @@
7026
7026
  }
7027
7027
  },
7028
7028
  "node_modules/@wavemaker/variables/node_modules/electron-to-chromium": {
7029
- "version": "1.4.830",
7030
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz",
7031
- "integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==",
7029
+ "version": "1.4.832",
7030
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.832.tgz",
7031
+ "integrity": "sha512-cTen3SB0H2SGU7x467NRe1eVcQgcuS6jckKfWJHia2eo0cHIGOqHoAxevIYZD4eRHcWjkvFzo93bi3vJ9W+1lA==",
7032
7032
  "extraneous": true
7033
7033
  },
7034
7034
  "node_modules/@wavemaker/variables/node_modules/emoji-regex": {
@@ -7623,9 +7623,9 @@
7623
7623
  "extraneous": true
7624
7624
  },
7625
7625
  "node_modules/@wavemaker/variables/node_modules/node-releases": {
7626
- "version": "2.0.17",
7627
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz",
7628
- "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==",
7626
+ "version": "2.0.18",
7627
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
7628
+ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
7629
7629
  "extraneous": true
7630
7630
  },
7631
7631
  "node_modules/@wavemaker/variables/node_modules/npm-run-path": {
package/angular-app/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-app",
3
- "version": "11.8.0-next.141680",
3
+ "version": "11.8.0-next.141682",
4
4
  "scripts": {
5
5
  "ng": "ng",
6
6
  "start": "./node_modules/.bin/ng serve",
@@ -46,7 +46,7 @@
46
46
  "@metrichor/jmespath": "0.3.1",
47
47
  "@wavemaker/focus-trap": "1.0.1",
48
48
  "@wavemaker/nvd3": "1.8.11",
49
- "@wavemaker/variables": "11.8.0-next.141680",
49
+ "@wavemaker/variables": "11.8.0-next.141682",
50
50
  "@ztree/ztree_v3": "3.5.48",
51
51
  "angular-imask": "^7.6.1",
52
52
  "angular2-websocket": "0.9.7",
@@ -71,7 +71,7 @@
71
71
  "tslib": "2.4.1",
72
72
  "x2js": "3.4.4",
73
73
  "zone.js": "0.14.7",
74
- "@wavemaker/app-ng-runtime": "11.8.0-next.141680"
74
+ "@wavemaker/app-ng-runtime": "11.8.0-next.141682"
75
75
  },
76
76
  "devDependencies": {
77
77
  "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
package/build-angular-app.js CHANGED
@@ -17,6 +17,8 @@ const { downloadNPMPackage } = require('./download-packages');
17
17
 
18
18
  const { executeSyncCmd, MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
19
19
 
20
+ const NPM_PACKAGE_SCOPE = '@wavemaker';
21
+
20
22
  /**
21
23
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
22
24
  */
@@ -44,24 +46,24 @@ const updateDeployUrl = (args) => {
44
46
  */
45
47
  const buildAngularApp = (args) => {
46
48
  let packageInfo = {
47
- name: '@wavemaker/angular-app',
49
+ scope: NPM_PACKAGE_SCOPE,
50
+ name: 'angular-app',
48
51
  version: args.runtimeUIVersion,
49
- packageJsonFile: args.codegenPath + '/angular-app/package.json',
50
- packageLockJsonFile: args.codegenPath + '/angular-app/package-lock.json',
52
+ packageJsonFile: '',
51
53
  successMsg: MSG_NG_RUNTIME_SUCCESS,
52
54
  infoMsg: MSG_NG_RUNTIME_LOG
53
55
  }
54
56
 
55
57
  try {
56
- // Symlink to reuse the existing node_modules
58
+ // Download angular-app node_modules
59
+ let pathAngularAppPackage = downloadNPMPackage(packageInfo);
57
60
  if (args.optimizeUIBuild) {
58
- // Download angular-app node_modules
59
- let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
60
- fs.symlinkSync(pathNGRuntimePackage + `/node_modules/${packageInfo.name}/node_modules`, args.appTarget + '/node_modules', 'dir');
61
+ // Symlink to reuse the existing node_modules
62
+ fs.symlinkSync(pathAngularAppPackage + `/node_modules/${packageInfo.scope}/${packageInfo.name}/node_modules`, args.appTarget + '/node_modules', 'dir');
61
63
  } else {
62
- // fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
63
- // fs.copyFileSync(packageInfo.packageLockJsonFile, args.appTarget + '/package-lock.json');
64
- executeSyncCmd('cd ' + args.appTarget + ` && npm install ${packageInfo.name}@${packageInfo.version}`, null, MSG_NG_RUNTIME_LOG);
64
+ fs.copyFileSync(pathAngularAppPackage + `/node_modules/${packageInfo.scope}/${packageInfo.name}/package.json`, args.appTarget + '/package.json');
65
+ fs.copyFileSync(pathAngularAppPackage + `/node_modules/${packageInfo.scope}/${packageInfo.name}/npm-shrinkwrap.json`, args.appTarget + '/npm-shrinkwrap.json');
66
+ executeSyncCmd('cd ' + args.appTarget + ` && npm install `, null, MSG_NG_RUNTIME_LOG);
65
67
  }
66
68
  } catch (err) {
67
69
  console.log(MSG_NG_RUNTIME_LOG + 'FAILED the symlink for the node_modules', err);
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-codegen",
3
- "version": "11.8.0-next.141680",
3
+ "version": "11.8.0-next.141682",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@wavemaker/angular-codegen",
9
- "version": "11.8.0-next.141680",
9
+ "version": "11.8.0-next.141682",
10
10
  "license": "ISC",
11
11
  "dependencies": {
12
12
  "cheerio": "^1.0.0-rc.2",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-codegen",
3
- "version": "11.8.0-next.141680",
3
+ "version": "11.8.0-next.141682",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {