Skip to content

Commit

Permalink
chore: upgrade dependencies for nodejs v12 (#838)
Browse files Browse the repository at this point in the history
- replace cpx with copy-and-watch
- update jsdoc and postcss-cli

fixes: #828
  • Loading branch information
pskelin authored Oct 14, 2019
1 parent fd3b690 commit 49d9a97
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 204 deletions.
2 changes: 1 addition & 1 deletion packages/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"array-uniq": "^2.0.0",
"copy-and-watch": "^0.1.2",
"copy-and-watch": "^0.1.4",
"eslint": "^5.13.0",
"eslint-config-airbnb-base": "^13.1.0",
"npm-run-all": "^4.1.5"
Expand Down
14 changes: 7 additions & 7 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
"directory": "packages/core"
},
"scripts": {
"build:copy-node-module": "cpx \"../../node_modules/@openui5/sap.ui.core/src/**/*\" temp/",
"build:copy-resources": "cpx \"temp/**/*.js\" dist/ && cpx \"temp/**/*.json\" dist/",
"build:copy-node-module": "copy-and-watch \"../../node_modules/@openui5/sap.ui.core/src/**/*\" temp/",
"build:copy-resources": "copy-and-watch \"temp/**/*.js\" dist/ && copy-and-watch \"temp/**/*.json\" dist/",
"build:cleanup": "rimraf dist/sap/ui/core/library.support.js dist/sap/ui/core/RenderManager.js dist/sap/ui/core/XMLCompositeMetadata.js dist/sap/ui/core/Core.js dist/sap/ui/core/cache dist/sap/ui/core/rules dist/sap/ui/core/support dist/sap/ui/core/util dist/sap/ui/model dist/sap/ui/qunit dist/sap/ui/test dist/sap/ui/thirdparty",
"build:copy-overlay": "cpx \"overlay/**/*.js\" dist/",
"build:copy-overlay": "copy-and-watch \"overlay/**/*.js\" dist/",
"build:replace-amd": "replace-in-file sap.ui.define define dist/**/*.js",
"build:replace-export-true": "replace-in-file \", /* bExport= */ true\" \"\" dist/**/*.js",
"build:replace-export-false": "replace-in-file \", /* bExport= */ false\" \"\" dist/**/*.js",
"build:replace-global-core-usage": "replace-in-file /sap\\.ui\\.getCore/g sap.ui.getWCCore dist/**/*.js --isRegex",
"build:uri-js": "prepend dist/sap/ui/thirdparty/URI.js \"define([], function () {\" && node -e \"console.log('return window.URI;});')\" >> dist/sap/ui/thirdparty/URI.js",
"build:amd-to-es6": "amdtoes6 --src=dist --replace --glob=**/*.js",
"build:esm-abs-to-rel": "node ./lib/esm-abs-to-rel/index.js dist/",
"build:esm-stubs": "cpx esm/Core.js dist/sap/ui/core && cpx esm/jquery.js dist/sap/ui/thirdparty && cpx esm/URI.js dist/sap/ui/thirdparty",
"build:copy-icon-font-assets": "cpx \"temp/sap/ui/core/themes/base/fonts/*.{ttf,woff,woff2}\" dist/sap/ui/core/themes/base/fonts",
"build:copy-belize-fonts": "cpx \"../../node_modules/@openui5/themelib_sap_belize/src/sap/ui/core/themes/sap_belize/fonts/*.{ttf,woff,woff2}\" dist/sap/ui/core/themes/sap_belize/fonts",
"build:esm-stubs": "copy-and-watch esm/Core.js dist/sap/ui/core && copy-and-watch esm/jquery.js dist/sap/ui/thirdparty && copy-and-watch esm/URI.js dist/sap/ui/thirdparty",
"build:copy-icon-font-assets": "copy-and-watch \"temp/sap/ui/core/themes/base/fonts/*.{ttf,woff,woff2}\" dist/sap/ui/core/themes/base/fonts",
"build:copy-belize-fonts": "copy-and-watch \"../../node_modules/@openui5/themelib_sap_belize/src/sap/ui/core/themes/sap_belize/fonts/*.{ttf,woff,woff2}\" dist/sap/ui/core/themes/sap_belize/fonts",
"build": "npm-run-all --sequential clean build:copy-node-module build:copy-resources build:cleanup build:copy-overlay build:replace-amd build:replace-export-true build:replace-export-false build:replace-global-core-usage build:uri-js build:amd-to-es6 build:esm-abs-to-rel build:esm-stubs build:copy-icon-font-assets build:copy-belize-fonts",
"clean": "rimraf temp && rimraf dist",
"prepublishOnly": "npm run clean && npm run build"
Expand All @@ -37,7 +37,7 @@
"@buxlabs/amd-to-es6": "^0.13.2",
"@openui5/sap.ui.core": "1.60.2",
"abstract-syntax-tree": "1.0.3",
"cpx": "^1.5.0",
"copy-and-watch": "^0.1.4",
"escodegen": "^1.11.0",
"esprima": "^4.0.1",
"glob": "^7.1.3",
Expand Down
19 changes: 9 additions & 10 deletions packages/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
"build:styles-components": "postcss src/themes/*.css --config config/postcss.components --base src --dir dist/css/",
"clean": "rimraf dist",
"copy:src": "copy-and-watch \"src/**/*.js\" dist/",
"copy:test": "cpx \"test/**/*.*\" dist/test-resources",
"copy:pages": "cpx \"test/**/pages/*.*\" dist/test-resources",
"copy:qunit": "cpx \"test/**/qunit/*.*\" dist/test-resources",
"copy:webcomponents-polyfill": "cpx \"../../node_modules/@webcomponents/webcomponentsjs/**/*.*\" dist/webcomponentsjs/",
"copy:test": "copy-and-watch \"test/**/*.*\" dist/test-resources",
"copy:pages": "copy-and-watch \"test/**/pages/*.*\" dist/test-resources",
"copy:qunit": "copy-and-watch \"test/**/qunit/*.*\" dist/test-resources",
"copy:webcomponents-polyfill": "copy-and-watch \"../../node_modules/@webcomponents/webcomponentsjs/**/*.*\" dist/webcomponentsjs/",
"generate-new-component": "node ./lib/create-new-component/index.js",
"lint": "eslint .",
"start": "npm-run-all --parallel serve:static start:prepare",
"start:prepare": "npm-run-all --sequential build:i18n watch:all",
"serve:static-prepare": "cpx \"serve.json\" dist/",
"serve:static-prepare": "copy-and-watch \"serve.json\" dist/",
"serve:static-run": "serve --no-clipboard -l 8080 dist",
"serve:static": "npm-run-all --sequential serve:static-prepare serve:static-run",
"test:wdio": "npm-run-all --parallel --race serve:static test:wdio-run",
Expand Down Expand Up @@ -111,8 +111,7 @@
"chai": "^4.2.0",
"chromedriver": "^77.0.0",
"clean-css": "^4.2.1",
"copy-and-watch": "^0.1.2",
"cpx": "^1.5.0",
"copy-and-watch": "^0.1.4",
"cross-env": "^5.2.0",
"cssnano": "^4.1.10",
"escodegen": "^1.11.0",
Expand All @@ -125,12 +124,12 @@
"handlebars": "^4.1.2",
"jest": "^23.6.0",
"jest-puppeteer": "^3.7.0",
"jsdoc": "^3.5.5",
"jsdoc": "^3.6.3",
"mkdirp": "^0.5.1",
"npm-run-all": "^4.1.3",
"npm-watch": "^0.4.0",
"postcss": "^7.0.14",
"postcss-cli": "^6.1.1",
"postcss": "^7.0.18",
"postcss-cli": "^6.1.3",
"postcss-combine-duplicated-selectors": "^7.0.0",
"postcss-import": "^12.0.1",
"properties-reader": "^0.3.1",
Expand Down
24 changes: 12 additions & 12 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
"clean": "rimraf dist",
"build": "run-s clean build:self-contained build:fix-rewrite build:copy-webcomponents build:generate-static-index",
"build:self-contained": "ui5 build self-contained",
"build:fix-rewrite": "cpx \"webapp/index.html\" dist/",
"build:fix-rewrite": "copy-and-watch \"webapp/index.html\" dist/",
"build:copy-webcomponents": "npm-run-all --sequential copy:main-resources copy:main-samples copy:main-playground-static copy:main-pages copy:main-webcomponentsjs copy:core-fonts",
"build:generate-static-index": "node ./lib/static-index ../main/dist/test-resources/**/samples/*.sample.html",
"copy:core-fonts": "cpx \"../core/dist/**/*.{ttf,woff,woff2}\" dist/resources/",
"copy:main-resources": "cpx \"../main/dist/resources/**/*.*\" dist/resources/",
"copy:main-samples": "cpx \"../main/dist/test-resources/**/*.sample.html\" dist/test-resources/",
"copy:main-playground-static": "cpx \"../main/test/playground/**/*.*\" dist/test-resources/playground/",
"copy:main-pages": "cpx \"../main/test/**/pages/*.*\" dist/test-resources/",
"copy:main-webcomponentsjs": "cpx \"../main/dist/webcomponentsjs/**/*.*\" dist/webcomponentsjs/",
"watch:main-resources": "cpx \"../main/dist/resources/**/*.*\" dist/resources/ --watch",
"watch:main-samples": "cpx \"../main/dist/test-resources/**/*.sample.html\" dist/test-resources/ --watch",
"watch:main-playground-static": "cpx \"../main/test/playground/**/*.*\" dist/test-resources/playground/ --watch",
"watch:main-pages": "cpx \"../main/test/**/pages/*.*\" dist/test-resources/ --watch",
"copy:core-fonts": "copy-and-watch \"../core/dist/**/*.{ttf,woff,woff2}\" dist/resources/",
"copy:main-resources": "copy-and-watch \"../main/dist/resources/**/*.*\" dist/resources/",
"copy:main-samples": "copy-and-watch \"../main/dist/test-resources/**/*.sample.html\" dist/test-resources/",
"copy:main-playground-static": "copy-and-watch \"../main/test/playground/**/*.*\" dist/test-resources/playground/",
"copy:main-pages": "copy-and-watch \"../main/test/**/pages/*.*\" dist/test-resources/",
"copy:main-webcomponentsjs": "copy-and-watch \"../main/dist/webcomponentsjs/**/*.*\" dist/webcomponentsjs/",
"watch:main-resources": "copy-and-watch \"../main/dist/resources/**/*.*\" dist/resources/ --watch",
"watch:main-samples": "copy-and-watch \"../main/dist/test-resources/**/*.sample.html\" dist/test-resources/ --watch",
"watch:main-playground-static": "copy-and-watch \"../main/test/playground/**/*.*\" dist/test-resources/playground/ --watch",
"watch:main-pages": "copy-and-watch \"../main/test/**/pages/*.*\" dist/test-resources/ --watch",
"open:browser": "wait-on http://localhost:8080/ && opn http://localhost:8080/",
"serve": "npm-run-all --sequential build --parallel watch:* serve:static open:browser",
"serve:static": "serve dist/ -p 8080"
Expand All @@ -45,7 +45,7 @@
},
"devDependencies": {
"@ui5/cli": "^1.2.0",
"cpx": "^1.5.0",
"copy-and-watch": "^0.1.4",
"ejs": "^2.6.1",
"glob": "^7.1.3",
"mkdirp": "^0.5.1",
Expand Down
Loading

0 comments on commit 49d9a97

Please sign in to comment.