@egis/build-tools 4.0.1-pre.2 → 4.0.1

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 (9) hide show
  1. package/.circleci/config.yml +0 -20
  2. package/README.md +1 -1
  3. package/gulp/dependencies.js +21 -8
  4. package/gulp/gulp-main-bower-files.js +3 -1
  5. package/package.json +8 -16
  6. package/scripts/dont-break-tests.sh +1 -1
  7. package/.dont-break.json +0 -17
  8. package/scripts/install-dont-break.sh +0 -3
  9. package/yarn.lock +0 -10162
package/.circleci/config.yml CHANGED
@@ -15,8 +15,6 @@ test_steps: &test_steps
15
15
  key: dependency-cache-{{ checksum "package.json" }}-{{ checksum ".node-version" }}
16
16
  - restore_cache:
17
17
  key: yarn-cache-v2-{{ checksum "package.json" }}-{{ checksum ".node-version" }}
18
- - restore_cache:
19
- key: dont-break-cache-{{ checksum ".node-version" }}-{{ checksum ".dont-break.json" }}
20
18
  - run:
21
19
  name: initial-steps
22
20
  command: |
@@ -32,12 +30,6 @@ test_steps: &test_steps
32
30
  name: install-deps
33
31
  command: |
34
32
  yarn --frozen-lockfile
35
- if [ "${NPM_TOKEN}" != "" ]; then
36
- ./scripts/install-dont-break.sh
37
- cp -f .circleci/.npmrc ~
38
- yarn global add --ignore-engines "@egis/egis-ui-test-utils@^3.0.0-pre.1"
39
- test-utils-update-chrome
40
- fi
41
33
  - save_cache:
42
34
  key: dependency-cache-{{ checksum "package.json" }}-{{ checksum ".node-version" }}
43
35
  paths:
@@ -56,22 +48,10 @@ test_steps: &test_steps
56
48
  name: test
57
49
  command: |
58
50
  yarn test
59
- if [ "${NPM_TOKEN}" != "" ]; then
60
- cp -f .circleci/.npmrc ~
61
- dont-break --timeout 600
62
- fi
63
51
  - save_cache:
64
52
  key: yarn-cache-v2-{{ checksum "package.json" }}-{{ checksum ".node-version" }}
65
53
  paths:
66
54
  - ~/.cache/yarn
67
- - save_cache:
68
- key: dont-break-cache-{{ checksum ".node-version" }}-{{ checksum ".dont-break.json" }}
69
- paths:
70
- - /tmp/egis-build-tools-v-0-0-0-semantic-release-against-egis-egis-ui
71
- - /tmp/egis-build-tools-v-0-0-0-semantic-release-against-egis-esign
72
- - /tmp/egis-build-tools-v-0-0-0-semantic-release-against-egis-portal-app
73
- - /tmp/egis-build-tools-v-0-0-0-semantic-release-against-egis-bulk-capture
74
-
75
55
  version: 2
76
56
  jobs:
77
57
  test8:
package/README.md CHANGED
@@ -167,4 +167,4 @@ Run the tests:
167
167
  ```
168
168
  # Put your docker's host and port here, spec file(s) mask and the spec name(s) substring.
169
169
  yarn test:e2e -- --baseUrl="http://192.168.99.100:8080" --specFiles="./e2e/**/Guide*Spec.js" --mochaOpts.grep="too early" --maxBrowserInstances=1 --mochaOpts.retries=1
170
- ```
170
+ ```
package/gulp/dependencies.js CHANGED
@@ -2,6 +2,7 @@
2
2
  * Created by Nikolay Glushchenko <nick@nickalie.com> on 08.09.2015.
3
3
  */
4
4
 
5
+ var path = require('path');
5
6
  var gulp = require('gulp');
6
7
  var gutil = require('gulp-util');
7
8
  var filter = require('gulp-filter');
@@ -21,6 +22,7 @@ var mainDepsFiles = require('./gulp-main-bower-files');
21
22
  var dependenciesJson = require('./common').dependenciesJson;
22
23
  var prod = require('./common').prod;
23
24
  var jsonTransform = require('gulp-json-transform');
25
+ const NM = "node_modules";
24
26
 
25
27
  console.log('prod mode=' + prod);
26
28
  module.exports = function(done) {
@@ -37,10 +39,10 @@ module.exports = function(done) {
37
39
  }
38
40
 
39
41
  _.each(dependenciesJson.directories, function(dirs, dep) {
40
- console.log('coping ' + JSON.stringify(dirs) + " for " + dep);
42
+ console.log('copying ' + JSON.stringify(dirs) + " for " + dep);
41
43
 
42
44
  dirs.forEach(function(dir) {
43
- var base = "node_modules/" + dep;
45
+ var base = path.join(NM, dep);
44
46
  if (dir.from) {
45
47
  gulp.src(base + "/" + dir.from, {
46
48
  base: base
@@ -48,15 +50,17 @@ module.exports = function(done) {
48
50
  .pipe(rename(function(file) {
49
51
  file.dirname = dir.to;
50
52
  }))
53
+ .pipe(debug())
51
54
  .pipe(gulp.dest('build/'));
52
55
  return;
53
56
  }
54
57
 
55
58
  gulp.src(base + "/" + dir, {
56
59
  base: base
57
- }).pipe(gulp.dest('build/'));
60
+ })
61
+ .pipe(debug())
62
+ .pipe(gulp.dest('build/'));
58
63
  });
59
-
60
64
  });
61
65
 
62
66
  if (dependenciesJson.excludes.length > 0 || dependenciesJson.standalone.length > 0) {
@@ -99,7 +103,10 @@ function depsConcat(expr, name, _uglify) {
99
103
  }
100
104
 
101
105
  function depsFiles() {
102
- src = gulp.src('./dependencies.json')
106
+ var depIds = _.keys(dependenciesJson.dependencies).map(function(name) {
107
+ return path.join(NM, name);
108
+ });
109
+ var src = gulp.src('./dependencies.json')
103
110
  .pipe(jsonTransform(function() {
104
111
  var res = JSON.stringify(dependenciesJson);
105
112
  // console.log('res', res);
@@ -107,9 +114,15 @@ function depsFiles() {
107
114
  }))
108
115
  .pipe(rename("bower.json"))
109
116
  .pipe(gulp.dest("."));
110
- var options = {};
111
- if (dependenciesJson.overrides.length > 0) {
117
+ var options = {filter: function(filePath) {
118
+ let res = depIds.some(function(depId) {
119
+ return filePath.indexOf(depId) >= 0;
120
+ });
121
+ // console.log('filter', res, filePath);
122
+ return res ? filePath : null;
123
+ }};
124
+ if (dependenciesJson.overrides) {
112
125
  options.overrides = dependenciesJson.overrides;
113
126
  }
114
127
  return src.pipe(mainDepsFiles(options));
115
- }
128
+ }
package/gulp/gulp-main-bower-files.js CHANGED
@@ -1,5 +1,7 @@
1
1
  'use strict';
2
2
 
3
+ // gulp-main-bower-files package code inlined and modified
4
+
3
5
  var through = require('through2');
4
6
  var gutil = require('gulp-util');
5
7
  var PluginError = gutil.PluginError;
@@ -44,7 +46,7 @@ module.exports = function(filter, opts, callback) {
44
46
  }
45
47
 
46
48
  opts = opts || {};
47
- opts.filter = filter;
49
+ opts.filter = opts.filter || filter;
48
50
  opts.paths = opts.path || {};
49
51
  opts.paths.bowerJson = file.path;
50
52
  opts.paths.bowerDirectory = file.base = path.join(file.base, bowerFolder);
package/package.json CHANGED
@@ -15,9 +15,9 @@
15
15
  "@egis/semantic-dependents-updates-github": "1.0.6",
16
16
  "babel": "^6.3.26",
17
17
  "babel-core": "^6.11.4",
18
- "babel-plugin-__coverage__": "^11.0.0",
19
18
  "babel-plugin-check-es2015-constants": "^6.3.13",
20
19
  "babel-plugin-external-helpers-2": "^6.3.13",
20
+ "babel-plugin-istanbul": "5.0.0",
21
21
  "babel-plugin-transform-es2015-arrow-functions": "^6.4.0",
22
22
  "babel-plugin-transform-es2015-block-scoped-functions": "^6.3.13",
23
23
  "babel-plugin-transform-es2015-block-scoping": "^6.4.0",
@@ -69,7 +69,7 @@
69
69
  "gulp-foreach": "^0.1.0",
70
70
  "gulp-glue": "",
71
71
  "gulp-gzip": "^1.2.0",
72
- "gulp-handlebars": "^4.0.0",
72
+ "gulp-handlebars": "4.0.0",
73
73
  "gulp-if": "^2.0.0",
74
74
  "gulp-ignore": "^2.0.1",
75
75
  "gulp-insert": "^0.5.0",
@@ -91,7 +91,7 @@
91
91
  "is_js": "^0.9.0",
92
92
  "jasmine-ajax": "^3.2.0",
93
93
  "jasmine-core": "^2.4.1",
94
- "karma": "^1.7.1",
94
+ "karma": "^2.0.0",
95
95
  "karma-browserify": "^5.0.0",
96
96
  "karma-chrome-launcher": "^0.2.2",
97
97
  "karma-coffee-preprocessor": "^0.3.0",
@@ -103,12 +103,12 @@
103
103
  "karma-json-fixtures-preprocessor": "0.0.5",
104
104
  "karma-junit-reporter": "^1.2.0",
105
105
  "karma-sourcemap-loader": "^0.3.6",
106
- "karma-systemjs": "github:rolaveric/karma-systemjs#28b94c979516cd6eb4514b128d40f3517bb3903b",
106
+ "karma-systemjs": "0.15.0",
107
107
  "karma-testingbot-launcher": "^1.0.1",
108
108
  "karma-verbose-reporter": "^0.0.3",
109
109
  "karma-webdriver-launcher": "^1.0.4",
110
110
  "lazypipe": "^1.0.1",
111
- "lodash": "^4.17.10",
111
+ "lodash": "^4.17.11",
112
112
  "loglevel": "^1.5.1",
113
113
  "main-bower-files": "^2.13.1",
114
114
  "merge-stream": "^1.0.0",
@@ -134,7 +134,8 @@
134
134
  "unzip": "^0.1.11",
135
135
  "vinyl-buffer": "^1.0.0",
136
136
  "vinyl-source-stream": "^1.1.0",
137
- "watchify": "^3.7.0",
137
+ "watchify": "^3.11.1",
138
+ "wd": "^1.11.1",
138
139
  "wdio-mocha-framework": "^0.5.4",
139
140
  "wdio-spec-reporter": "^0.1.4",
140
141
  "webdriverajax": "^2.2.0",
@@ -159,16 +160,7 @@
159
160
  "analyzeCommits": "freeform-semantic-commit-analyzer",
160
161
  "verifyConditions": "condition-circle"
161
162
  },
162
- "semantic-dependents-updates": {
163
- "dependents": {
164
- "@egis/egis-ui": "git@github.com:egis/EgisUI.git",
165
- "@egis/esign": "git@github.com:egis/eSign.git",
166
- "@egis/portal-app": "git@github.com:egis/Portal.git",
167
- "@egis/bulk-capture": "git@github.com:egis/BulkCapture.git"
168
- },
169
- "branchNameBase": "autoupdate-build-tools"
170
- },
171
- "version": "4.0.1-pre.2",
163
+ "version": "4.0.1",
172
164
  "engines": {
173
165
  "node": ">= 4.2.6"
174
166
  }
package/scripts/dont-break-tests.sh CHANGED
@@ -1,2 +1,2 @@
1
1
  # note that this is executed from client project folder, after `npm install`
2
- npm run build && npm run test:build && npm run test -- --browsers=Chrome --reporters=junit,html,verbose
2
+ yarn build && yarn test:build && yarn test -- --browsers=Chrome --reporters=junit,html,verbose
package/.dont-break.json DELETED
@@ -1,17 +0,0 @@
1
- {
2
- "pretest": false,
3
- "install": "$CURRENT_MODULE_DIR/scripts/install-if-not-there.sh",
4
- "postinstall": "yarn --ignore-engines",
5
- "test": "./node_modules/@egis/build-tools/scripts/dont-break-tests.sh",
6
- "currentModuleInstall": "yarn-link",
7
- "projects": [
8
- "@egis/egis-ui@^4.70.5-pre.1",
9
- "@egis/esign@^2.20.2-pre.1",
10
- "@egis/portal-app@^1.17.1-pre.1",
11
- "@egis/bulk-capture@^1.2.6-pre.1",
12
- {
13
- "name": "@egis/egis-ui-test-utils@^3.0.0-pre.1",
14
- "test": "npm run build"
15
- }
16
- ]
17
- }
package/scripts/install-dont-break.sh DELETED
@@ -1,3 +0,0 @@
1
- #!/bin/bash
2
-
3
- npm install -g --ignore-engines @artemv/dont-break@1.13.5-pre.1