@wavemaker/angular-codegen 11.8.0-rc.5687 → 11.8.0-rc.5689

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 +4 -4
  2. package/angular-app/package.json +3 -3
  3. package/build-angular-app.js +24 -9
  4. package/package-lock.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-rc.5687",
40
+ "@wavemaker/variables": "11.8.0-rc.5689",
41
41
  "@ztree/ztree_v3": "3.5.48",
42
42
  "angular-imask": "^7.6.1",
43
43
  "angular2-websocket": "0.9.7",
@@ -6453,9 +6453,9 @@
6453
6453
  }
6454
6454
  },
6455
6455
  "node_modules/@wavemaker/variables": {
6456
- "version": "11.8.0-rc.5687",
6457
- "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5687.tgz",
6458
- "integrity": "sha512-QxvjgSCrQDHx/0RquEw6GFNenN0Ws6b354E0NNm1XbMGFXnLyDW8EOdDlMYrBfsR5Aab4PRVWEta9pDOZdbUcQ==",
6456
+ "version": "11.8.0-rc.5689",
6457
+ "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5689.tgz",
6458
+ "integrity": "sha512-1bLc+DwATKHJF5XLCYCZwWwfixuyzh53AeF66f/CTr45tICWhVCgzSu65OEzTKFgKTyJanEFh+lRt7vIpC0QLw==",
6459
6459
  "dependencies": {
6460
6460
  "@metrichor/jmespath": "^0.3.1",
6461
6461
  "he": "^1.2.0",
package/angular-app/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-app",
3
- "version": "11.8.0-rc.5687",
3
+ "version": "11.8.0-rc.5689",
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.5687",
49
+ "@wavemaker/variables": "11.8.0-rc.5689",
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.5687"
74
+ "@wavemaker/app-ng-runtime": "11.8.0-rc.5689"
75
75
  },
76
76
  "devDependencies": {
77
77
  "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
package/build-angular-app.js CHANGED
@@ -13,9 +13,8 @@
13
13
  * optimizeUIBuild : By default this flag will be true. If it's windows platform we are making the flag to false, it means no optimisation for windows.
14
14
  */
15
15
  const fs = require('fs');
16
- const { downloadNPMPackage } = require('./download-packages');
17
-
18
16
  const { executeSyncCmd, MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
17
+ const os = require("os");
19
18
 
20
19
  const NPM_PACKAGE_SCOPE = '@wavemaker';
21
20
 
@@ -45,24 +44,40 @@ const updateDeployUrl = (args) => {
45
44
  * Run the ng build and post build for the project
46
45
  */
47
46
  const buildAngularApp = (args) => {
47
+ const HOME_DIR = os.homedir(), APP_NAME = "angular-app";
48
+ const TARBALL_DOWNLOAD_PATH = (HOME_DIR + '/.wm/node_modules') + '/' + APP_NAME + '/' + args.runtimeUIVersion;
49
+ const PACKAGE_NAME = NPM_PACKAGE_SCOPE + '/' + APP_NAME + '@' + args.runtimeUIVersion;
50
+ const TARBALL_NAME = 'wavemaker' + '-' + APP_NAME + '-' + args.runtimeUIVersion + '.tgz';
51
+
52
+ fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
53
+ executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && npm pack ${PACKAGE_NAME}`, null, `Downloading tarball - ${PACKAGE_NAME} to the location - ${TARBALL_DOWNLOAD_PATH}`);
54
+ executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && tar -xvf ${TARBALL_NAME}`, null, `Unzipping the tarball - ${TARBALL_NAME}`);
55
+
48
56
  let packageInfo = {
49
57
  scope: NPM_PACKAGE_SCOPE,
50
- name: 'angular-app',
58
+ name: APP_NAME,
51
59
  version: args.runtimeUIVersion,
52
- packageJsonFile: '',
60
+ packageJsonFile: `${TARBALL_DOWNLOAD_PATH}/package/package.json`,
61
+ packageJsonLockFile: `${TARBALL_DOWNLOAD_PATH}/package/package-lock.json`,
53
62
  successMsg: MSG_NG_RUNTIME_SUCCESS,
54
63
  infoMsg: MSG_NG_RUNTIME_LOG
55
64
  }
56
65
 
57
66
  try {
58
- // Download angular-app node_modules
59
- let pathAngularAppPackage = downloadNPMPackage(packageInfo);
60
67
  if (args.optimizeUIBuild) {
68
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package.json`, TARBALL_DOWNLOAD_PATH + '/package.json');
69
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, TARBALL_DOWNLOAD_PATH + '/package-lock.json');
70
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, TARBALL_DOWNLOAD_PATH + '/.npmrc');
71
+
72
+ // Download angular-app node_modules
73
+ executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ' && npm install ', null, "Installing app dependencies...");
74
+
61
75
  // Symlink to reuse the existing node_modules
62
- fs.symlinkSync(pathAngularAppPackage + `/node_modules`, args.appTarget + '/node_modules', 'dir');
76
+ fs.symlinkSync(TARBALL_DOWNLOAD_PATH + `/node_modules`, args.appTarget + '/node_modules', 'dir');
63
77
  } else {
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}/package-lock.json`, args.appTarget + '/package-lock.json');
78
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package/package.json`, args.appTarget + '/package.json');
79
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, args.appTarget + '/package-lock.json');
80
+ fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, args.appTarget + '/.npmrc');
66
81
  executeSyncCmd('cd ' + args.appTarget + ` && npm install `, null, MSG_NG_RUNTIME_LOG);
67
82
  }
68
83
  } catch (err) {
package/package-lock.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@wavemaker/angular-codegen",
3
- "version": "11.8.0-rc.5687",
3
+ "version": "11.8.0-rc.5689",
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.5687",
9
+ "version": "11.8.0-rc.5689",
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.5687",
3
+ "version": "11.8.0-rc.5689",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {