@wavemaker/angular-codegen 11.8.0-rc.5665 → 11.8.0-rc.5666

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 (6) hide show
  1. package/angular-app/package-lock.json +4 -4
  2. package/angular-app/package.json +3 -3
  3. package/build-angular-app.js +12 -10
  4. package/download-packages.js +1 -1
  5. package/npm-shrinkwrap.json +2 -2
  6. 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-rc.5665",
40
+ "@wavemaker/variables": "11.8.0-rc.5666",
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-rc.5665",
6456
- "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5665.tgz",
6457
- "integrity": "sha512-CNrRgSOmXserFkoHXMJNB1HOty3HitNO52sQoGT7tPwtoeF1+tMHziZ4mjCz+HK1ZYlwLYGU339D16bQRSSuQg==",
6455
+ "version": "11.8.0-rc.5666",
6456
+ "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5666.tgz",
6457
+ "integrity": "sha512-1FzIp1SdR5oEEIGLw51c0vm1F2HPv2Z7TcSS8yUVtiWRXPmApgi4N2Su4Hex3ldddQEjlU9BadXbI7Wq6KAW3A==",
6458
6458
  "hasShrinkwrap": true,
6459
6459
  "dependencies": {
6460
6460
  "@metrichor/jmespath": "^0.3.1",
package/angular-app/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-app",
3
- "version": "11.8.0-rc.5665",
3
+ "version": "11.8.0-rc.5666",
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-rc.5665",
49
+ "@wavemaker/variables": "11.8.0-rc.5666",
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-rc.5665"
74
+ "@wavemaker/app-ng-runtime": "11.8.0-rc.5666"
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/download-packages.js CHANGED
@@ -41,7 +41,7 @@ const downloadNPMPackage = (packageInfo) => {
41
41
  if (packageInfo.packageJsonFile && fs.existsSync(packageInfo.packageJsonFile)) {
42
42
  fs.copyFileSync(packageInfo.packageJsonFile, PATH_NPM_PACKAGE + '/package.json');
43
43
  } else {
44
- npmInstallCMD = 'npm init -y && ' + npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
44
+ npmInstallCMD = npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
45
45
  }
46
46
 
47
47
  executeSyncCmd('cd ' + PATH_NPM_PACKAGE + ' && ' + npmInstallCMD, (errMsg) => {
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-codegen",
3
- "version": "11.8.0-rc.5665",
3
+ "version": "11.8.0-rc.5666",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@wavemaker/angular-codegen",
9
- "version": "11.8.0-rc.5665",
9
+ "version": "11.8.0-rc.5666",
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-rc.5665",
3
+ "version": "11.8.0-rc.5666",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {