From b4667523fd56a8ecfffefa201b63d1f0bdb24f3e Mon Sep 17 00:00:00 2001 From: Infoxicator Date: Fri, 27 Mar 2020 11:27:43 +0000 Subject: [PATCH 1/7] feat(scripts): generate one-app-statics package --- one-app-statics/LICENSE.txt | 202 +++++++++++++++++++++++ one-app-statics/README.md | 66 ++++++++ one-app-statics/index.js | 1 + one-app-statics/package.json | 21 +++ one-app-statics/postinstall.js | 2 + scripts/generate-statics-package-json.js | 45 +++++ 6 files changed, 337 insertions(+) create mode 100644 one-app-statics/LICENSE.txt create mode 100644 one-app-statics/README.md create mode 100644 one-app-statics/index.js create mode 100644 one-app-statics/package.json create mode 100644 one-app-statics/postinstall.js create mode 100644 scripts/generate-statics-package-json.js diff --git a/one-app-statics/LICENSE.txt b/one-app-statics/LICENSE.txt new file mode 100644 index 00000000..c02dd73a --- /dev/null +++ b/one-app-statics/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2019 American Express Travel Related Services Company, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/one-app-statics/README.md b/one-app-statics/README.md new file mode 100644 index 00000000..05988e04 --- /dev/null +++ b/one-app-statics/README.md @@ -0,0 +1,66 @@ +

+ One App - One Amex +

+ +# One App Client Assets and CDN + +## ๐Ÿšจ Important ๐Ÿšจ + +This Package is not meant to be installed using npm, it only serves as the CDN for the static client assets for `one-app`, +if you are looking for `one-app` follow this link: [https://github.com/americanexpress/one-app](https://github.com/americanexpress/one-app) + + +## ๐Ÿ‘ฉโ€๐Ÿ’ป Hiring ๐Ÿ‘จโ€๐Ÿ’ป + +Want to get paid for your contributions to `one-app`? +> Send your resume to oneamex.careers@aexp.com + +## ๐Ÿ“– Table of Contents + +* [Features](#-features) +* [Usage](#-usage) +* [License](#-license) +* [Code Of Conduct](#-code-of-conduct) +* [Contributing](#-contributing) + +## โœจ Features + +- Improved performance by serving the one app client static assets from a CDN +- Enhanced security with [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) + +## ๐Ÿคนโ€ Usage with JSDelivr and Docker + +Static assets are created for the correct docker image version in Docker Hub: + +[//]: # (TODO: point at the live docker image once pushed) +[One App Production Docker Image](https://hub.docker.com/r/infoxicator/one-app-test) + +Configure your `ONE_CLIENT_URL` environment variable to point at the correct version of the assets in JSDelivr + +Example: + +`ONE_CLIENT_CDN_URL=https://cdn.jsdelivr.net/npm/one-app-statics@5.0.1/build/` + + + +## ๐Ÿ† Contributing + +We welcome Your interest in the American Express Open Source Community on Github. +Any Contributor to any Open Source Project managed by the American Express Open +Source Community must accept and sign an Agreement indicating agreement to the +terms below. Except for the rights granted in this Agreement to American Express +and to recipients of software distributed by American Express, You reserve all +right, title, and interest, if any, in and to Your Contributions. Please [fill +out the Agreement](https://cla-assistant.io/americanexpress/one-app). + +Please see our [CONTRIBUTING.md](https://github.com/americanexpress/one-app/blob/master/CONTRIBUTING.md). + +## ๐Ÿ—๏ธ License + +Any contributions made under this project will be governed by the [Apache License +2.0](./LICENSE.txt). + +## ๐Ÿ—ฃ๏ธ Code of Conduct + +This project adheres to the [American Express Community Guidelines](https://github.com/americanexpress/one-app/blob/master/CODE_OF_CONDUCT.md). +By participating, you are expected to honor these guidelines. diff --git a/one-app-statics/index.js b/one-app-statics/index.js new file mode 100644 index 00000000..0f986ffb --- /dev/null +++ b/one-app-statics/index.js @@ -0,0 +1 @@ +throw new Error('one-app-statics is not intended to be installed using npm, please refer to the README for more details'); diff --git a/one-app-statics/package.json b/one-app-statics/package.json new file mode 100644 index 00000000..847eaf8e --- /dev/null +++ b/one-app-statics/package.json @@ -0,0 +1,21 @@ +{ + "name": "@americanexpress/one-app-statics", + "version": "5.0.0-rc1", + "description": "One App Static Assets", + "main": "index.js", + "scripts": { + "postinstall": "node postinstall.js" + }, + "license": "Apache-2.0", + "contributors": [ + "Andres Escobar (https://github.com/anescobar1991)", + "James Singleton (https://github.com/JamesSingleton)", + "Jimmy King (https://github.com/10xLaCroixDrinker)", + "Jonathan Adshead (https://github.com/JAdshead)", + "Michael Tobia (https://github.com/Francois-Esquire)", + "Michael Tomcal (https://github.com/mtomcal)", + "Stephanie Coates (https://github.com/stephaniecoates)", + "Nelly Kiboi (https://github.com/nellyk)", + "Nickolas Oliver (https://github.com/PixnBits)" + ] +} \ No newline at end of file diff --git a/one-app-statics/postinstall.js b/one-app-statics/postinstall.js new file mode 100644 index 00000000..3033809b --- /dev/null +++ b/one-app-statics/postinstall.js @@ -0,0 +1,2 @@ +// eslint-disable-next-line no-console +console.log('๐Ÿšจ ๐Ÿšจ ๐Ÿšจ one-app-statics is not intended to be installed using npm, please refer to the README for more details!๐Ÿšจ ๐Ÿšจ ๐Ÿšจ '); diff --git a/scripts/generate-statics-package-json.js b/scripts/generate-statics-package-json.js new file mode 100644 index 00000000..4f5f6846 --- /dev/null +++ b/scripts/generate-statics-package-json.js @@ -0,0 +1,45 @@ +#!/usr/bin/env node + +/* + * Copyright 2019 American Express Travel Related Services Company, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +const fs = require('fs-extra'); +const path = require('path'); +const { oneAppStaticsDir } = require('./utils'); +const { version, contributors, license } = require('../package.json'); + +const pathToStaticsPackageJson = path.resolve(oneAppStaticsDir, 'package.json'); + +const doWork = async () => { + const staticsPackageJson = { + name: '@americanexpress/one-app-statics', + version, + description: 'One App Static Assets', + main: 'index.js', + scripts: { + postinstall: 'node postinstall.js', + }, + license, + contributors, + }; + await fs.writeFile(pathToStaticsPackageJson, JSON.stringify(staticsPackageJson, null, 2) + ); +}; + +doWork().catch((e) => { + console.error(e); + process.exit(1); +}); From 57c9a7164eb97eaf8a12dc5c5c8c0eb92f1dbb14 Mon Sep 17 00:00:00 2001 From: infoxicator Date: Fri, 27 Mar 2020 12:05:39 +0000 Subject: [PATCH 2/7] fix(one-app-statics): add missing license to files --- one-app-statics/index.js | 16 ++++++++++++++++ one-app-statics/postinstall.js | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/one-app-statics/index.js b/one-app-statics/index.js index 0f986ffb..5fe46f17 100644 --- a/one-app-statics/index.js +++ b/one-app-statics/index.js @@ -1 +1,17 @@ +/* + * Copyright 2019 American Express Travel Related Services Company, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + throw new Error('one-app-statics is not intended to be installed using npm, please refer to the README for more details'); diff --git a/one-app-statics/postinstall.js b/one-app-statics/postinstall.js index 3033809b..580536e3 100644 --- a/one-app-statics/postinstall.js +++ b/one-app-statics/postinstall.js @@ -1,2 +1,18 @@ +/* + * Copyright 2019 American Express Travel Related Services Company, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + // eslint-disable-next-line no-console console.log('๐Ÿšจ ๐Ÿšจ ๐Ÿšจ one-app-statics is not intended to be installed using npm, please refer to the README for more details!๐Ÿšจ ๐Ÿšจ ๐Ÿšจ '); From 5e58ea8329a861217abc2229b151ab416e474508 Mon Sep 17 00:00:00 2001 From: infoxicator Date: Fri, 27 Mar 2020 12:26:13 +0000 Subject: [PATCH 3/7] fix(utils): add oneAppStaticsDir --- scripts/utils.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/utils.js b/scripts/utils.js index a4957309..e07348dd 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -20,6 +20,7 @@ const { spawn } = require('child_process'); const sampleProdDir = resolve('./prod-sample/'); const sampleModulesDir = resolve(sampleProdDir, 'sample-modules'); const nginxOriginStaticsRootDir = resolve(sampleProdDir, 'nginx', 'origin-statics'); +const oneAppStaticsDir = resolve('./one-app-statics'); const sanitizeEnvVars = () => { const sanitizedEnvVars = {}; @@ -58,6 +59,7 @@ module.exports = { sampleProdDir, sampleModulesDir, nginxOriginStaticsRootDir, + oneAppStaticsDir, sanitizeEnvVars, promisifySpawn, }; From c1a342fdcce24b54234c888f32a36cd35c555c35 Mon Sep 17 00:00:00 2001 From: infoxicator Date: Fri, 27 Mar 2020 17:46:49 +0000 Subject: [PATCH 4/7] fix(license): update year --- one-app-statics/README.md | 5 ++--- one-app-statics/index.js | 2 +- one-app-statics/postinstall.js | 2 +- scripts/generate-statics-package-json.js | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/one-app-statics/README.md b/one-app-statics/README.md index 05988e04..b54365ca 100644 --- a/one-app-statics/README.md +++ b/one-app-statics/README.md @@ -6,7 +6,7 @@ ## ๐Ÿšจ Important ๐Ÿšจ -This Package is not meant to be installed using npm, it only serves as the CDN for the static client assets for `one-app`, +This Package is not meant to be installed using npm, it only serves as the origin for the CDN for the static client assets for `one-app` once published to npm, if you are looking for `one-app` follow this link: [https://github.com/americanexpress/one-app](https://github.com/americanexpress/one-app) @@ -32,8 +32,7 @@ Want to get paid for your contributions to `one-app`? Static assets are created for the correct docker image version in Docker Hub: -[//]: # (TODO: point at the live docker image once pushed) -[One App Production Docker Image](https://hub.docker.com/r/infoxicator/one-app-test) +[One App Production Docker Image](https://hub.docker.com/r/oneamex/one-app) Configure your `ONE_CLIENT_URL` environment variable to point at the correct version of the assets in JSDelivr diff --git a/one-app-statics/index.js b/one-app-statics/index.js index 5fe46f17..94dc7c86 100644 --- a/one-app-statics/index.js +++ b/one-app-statics/index.js @@ -1,5 +1,5 @@ /* - * Copyright 2019 American Express Travel Related Services Company, Inc. + * Copyright 2020 American Express Travel Related Services Company, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/one-app-statics/postinstall.js b/one-app-statics/postinstall.js index 580536e3..7c24f488 100644 --- a/one-app-statics/postinstall.js +++ b/one-app-statics/postinstall.js @@ -1,5 +1,5 @@ /* - * Copyright 2019 American Express Travel Related Services Company, Inc. + * Copyright 2020 American Express Travel Related Services Company, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/scripts/generate-statics-package-json.js b/scripts/generate-statics-package-json.js index 4f5f6846..1fca3b01 100644 --- a/scripts/generate-statics-package-json.js +++ b/scripts/generate-statics-package-json.js @@ -1,7 +1,7 @@ #!/usr/bin/env node /* - * Copyright 2019 American Express Travel Related Services Company, Inc. + * Copyright 2020 American Express Travel Related Services Company, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From ce07063c7697294362f05b74e4fbbd7328eb1c93 Mon Sep 17 00:00:00 2001 From: Ruben Casas Date: Mon, 30 Mar 2020 10:00:29 +0100 Subject: [PATCH 5/7] fix(one-app-statics): update message on index.js Co-Authored-By: Jonny Adshead --- one-app-statics/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/one-app-statics/index.js b/one-app-statics/index.js index 94dc7c86..e7bfb8ed 100644 --- a/one-app-statics/index.js +++ b/one-app-statics/index.js @@ -14,4 +14,4 @@ * permissions and limitations under the License. */ -throw new Error('one-app-statics is not intended to be installed using npm, please refer to the README for more details'); +throw new Error('one-app-statics is not intended to be required, please refer to the README for more details'); From 9362f2af5c8e3e249064eb2d6f46ae2814cce5a1 Mon Sep 17 00:00:00 2001 From: infoxicator Date: Mon, 30 Mar 2020 10:15:55 +0100 Subject: [PATCH 6/7] fix(scripts): change function name --- .gitignore | 1 + one-app-statics/package.json | 21 --------------------- package.json | 5 +++-- scripts/generate-statics-package-json.js | 8 +++++--- 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 one-app-statics/package.json diff --git a/.gitignore b/.gitignore index e2142b18..20ed0d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ stats.json .build-meta.json bundle.integrity.manifest.json *.tgz +one-app-statics/package.json # test test-results diff --git a/one-app-statics/package.json b/one-app-statics/package.json deleted file mode 100644 index 847eaf8e..00000000 --- a/one-app-statics/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "@americanexpress/one-app-statics", - "version": "5.0.0-rc1", - "description": "One App Static Assets", - "main": "index.js", - "scripts": { - "postinstall": "node postinstall.js" - }, - "license": "Apache-2.0", - "contributors": [ - "Andres Escobar (https://github.com/anescobar1991)", - "James Singleton (https://github.com/JamesSingleton)", - "Jimmy King (https://github.com/10xLaCroixDrinker)", - "Jonathan Adshead (https://github.com/JAdshead)", - "Michael Tobia (https://github.com/Francois-Esquire)", - "Michael Tomcal (https://github.com/mtomcal)", - "Stephanie Coates (https://github.com/stephaniecoates)", - "Nelly Kiboi (https://github.com/nellyk)", - "Nickolas Oliver (https://github.com/PixnBits)" - ] -} \ No newline at end of file diff --git a/package.json b/package.json index ddbd73df..815777e9 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "homepage": "https://github.com/americanexpress/one-app", "bugs": { - "url": "https://github.com/americanexpress/one-app" + "url": "https://github.com/americanexpress/one-app/issues" }, "contributors": [ "Andres Escobar (https://github.com/anescobar1991)", @@ -54,7 +54,8 @@ "Michael Tomcal (https://github.com/mtomcal)", "Stephanie Coates (https://github.com/stephaniecoates)", "Nelly Kiboi (https://github.com/nellyk)", - "Nickolas Oliver (https://github.com/PixnBits)" + "Nickolas Oliver (https://github.com/PixnBits)", + "Ruben Casas (https://github.com/infoxicator)" ], "license": "Apache-2.0", "keywords": [ diff --git a/scripts/generate-statics-package-json.js b/scripts/generate-statics-package-json.js index 1fca3b01..48e6d295 100644 --- a/scripts/generate-statics-package-json.js +++ b/scripts/generate-statics-package-json.js @@ -23,7 +23,7 @@ const { version, contributors, license } = require('../package.json'); const pathToStaticsPackageJson = path.resolve(oneAppStaticsDir, 'package.json'); -const doWork = async () => { +const writeStaticPackageJson = async () => { const staticsPackageJson = { name: '@americanexpress/one-app-statics', version, @@ -34,12 +34,14 @@ const doWork = async () => { }, license, contributors, + homepage: 'https://github.com/americanexpress/one-app', + bugs: { url: 'https://github.com/americanexpress/one-app/issues' }, }; await fs.writeFile(pathToStaticsPackageJson, JSON.stringify(staticsPackageJson, null, 2) ); }; -doWork().catch((e) => { - console.error(e); +writeStaticPackageJson().catch((e) => { + console.error(`Error generating statics package.json: ${e}`); process.exit(1); }); From 64a7f25e9612ed60b355e55f9fb9c43bc9b981a4 Mon Sep 17 00:00:00 2001 From: infoxicator Date: Wed, 1 Apr 2020 16:13:54 +0100 Subject: [PATCH 7/7] feat(statics): remove package.json script --- .gitignore | 1 - one-app-statics/package.json | 26 +++++++++++++ scripts/generate-statics-package-json.js | 47 ------------------------ scripts/utils.js | 2 - 4 files changed, 26 insertions(+), 50 deletions(-) create mode 100644 one-app-statics/package.json delete mode 100644 scripts/generate-statics-package-json.js diff --git a/.gitignore b/.gitignore index 20ed0d6e..e2142b18 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ stats.json .build-meta.json bundle.integrity.manifest.json *.tgz -one-app-statics/package.json # test test-results diff --git a/one-app-statics/package.json b/one-app-statics/package.json new file mode 100644 index 00000000..9d56a1bd --- /dev/null +++ b/one-app-statics/package.json @@ -0,0 +1,26 @@ +{ + "name": "@americanexpress/one-app-statics", + "version": "5.0.0-rc1", + "description": "One App Static Assets", + "main": "index.js", + "scripts": { + "postinstall": "node postinstall.js" + }, + "license": "Apache-2.0", + "contributors": [ + "Andres Escobar (https://github.com/anescobar1991)", + "James Singleton (https://github.com/JamesSingleton)", + "Jimmy King (https://github.com/10xLaCroixDrinker)", + "Jonathan Adshead (https://github.com/JAdshead)", + "Michael Tobia (https://github.com/Francois-Esquire)", + "Michael Tomcal (https://github.com/mtomcal)", + "Stephanie Coates (https://github.com/stephaniecoates)", + "Nelly Kiboi (https://github.com/nellyk)", + "Nickolas Oliver (https://github.com/PixnBits)", + "Ruben Casas (https://github.com/infoxicator)" + ], + "homepage": "https://github.com/americanexpress/one-app", + "bugs": { + "url": "https://github.com/americanexpress/one-app/issues" + } +} diff --git a/scripts/generate-statics-package-json.js b/scripts/generate-statics-package-json.js deleted file mode 100644 index 48e6d295..00000000 --- a/scripts/generate-statics-package-json.js +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env node - -/* - * Copyright 2020 American Express Travel Related Services Company, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -const fs = require('fs-extra'); -const path = require('path'); -const { oneAppStaticsDir } = require('./utils'); -const { version, contributors, license } = require('../package.json'); - -const pathToStaticsPackageJson = path.resolve(oneAppStaticsDir, 'package.json'); - -const writeStaticPackageJson = async () => { - const staticsPackageJson = { - name: '@americanexpress/one-app-statics', - version, - description: 'One App Static Assets', - main: 'index.js', - scripts: { - postinstall: 'node postinstall.js', - }, - license, - contributors, - homepage: 'https://github.com/americanexpress/one-app', - bugs: { url: 'https://github.com/americanexpress/one-app/issues' }, - }; - await fs.writeFile(pathToStaticsPackageJson, JSON.stringify(staticsPackageJson, null, 2) - ); -}; - -writeStaticPackageJson().catch((e) => { - console.error(`Error generating statics package.json: ${e}`); - process.exit(1); -}); diff --git a/scripts/utils.js b/scripts/utils.js index e07348dd..a4957309 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -20,7 +20,6 @@ const { spawn } = require('child_process'); const sampleProdDir = resolve('./prod-sample/'); const sampleModulesDir = resolve(sampleProdDir, 'sample-modules'); const nginxOriginStaticsRootDir = resolve(sampleProdDir, 'nginx', 'origin-statics'); -const oneAppStaticsDir = resolve('./one-app-statics'); const sanitizeEnvVars = () => { const sanitizedEnvVars = {}; @@ -59,7 +58,6 @@ module.exports = { sampleProdDir, sampleModulesDir, nginxOriginStaticsRootDir, - oneAppStaticsDir, sanitizeEnvVars, promisifySpawn, };