diff --git a/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml b/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml index 02d2697ce..856ca4c50 100644 --- a/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml +++ b/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml @@ -18,21 +18,56 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + name: Checkout + + - uses: actions/setup-node@v1.4.4 + with: + node-version: 'v12.x' + registry-url: 'https://registry.npmjs.org/' + name: Set up Node + + - name: Office Feedback package registry authentication + run: | + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/registry/:username=office + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/registry/:_password=NGh0NmRpY2M0N3B3N3dmM2hiM3plZXBveGRpcHNoeWEzejJjaGx1bGhtN2YyaWsyYnJ6YQ== + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/registry/:email=japethobalak@gmail.com + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/:username=office + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/:_password=NGh0NmRpY2M0N3B3N3dmM2hiM3plZXBveGRpcHNoeWEzejJjaGx1bGhtN2YyaWsyYnJ6YQ== + npm set //office.pkgs.visualstudio.com/_packaging/Office/npm/:email=japethobalak@gmail.com + + - name: Install Office Feedback package + run: | + npm config set registry https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry + npm install -g @ms-ofb/officebrowserfeedbacknpm@1.6.4 + + - name: Set npm package registry + run: | + npm config set always-auth=false + npm config set registry https://registry.npmjs.org + + - name: Config list + run: npm config list + + - name: Npm install + run: npm install + + - name: Build + run: npm run build + - name: Build And Deploy env: REACT_APP_CLIENT_ID: ${{ secrets.REACT_APP_CLIENT_ID }} id: builddeploy - uses: Azure/static-web-apps-deploy@v0.0.1-preview + uses: Azure/static-web-apps-deploy@v1 with: - skip_deploy_on_missing_secrets: true azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_SAND_0AC78C710 }} repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) action: "upload" ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "api" # Api source code path - optional + app_location: "build" # App source code path app_artifact_location: "build" # Built app content directory - optional + skip_app_build: true ###### End of Repository/Build Configurations ###### close_pull_request_job: diff --git a/.npmrc b/.npmrc index c2d7789b6..f10e9120f 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,6 @@ -registry=https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/ +registry=https://registry.npmjs.org/ + +@ms-ofb:registry=https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/ always-auth=true @@ -11,3 +13,4 @@ always-auth=true //office.pkgs.visualstudio.com/_packaging/Office/npm/:_password=NGh0NmRpY2M0N3B3N3dmM2hiM3plZXBveGRpcHNoeWEzejJjaGx1bGhtN2YyaWsyYnJ6YQ== //office.pkgs.visualstudio.com/_packaging/Office/npm/:email=japethobalak@gmail.com ; end auth token + diff --git a/package-lock.json b/package-lock.json index 6eaa476ba..32562d6c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@augloop/types-core": { + "version": "2.16.189", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/@augloop/types-core/-/types-core-2.16.189.tgz", + "integrity": "sha1-Q3NSjqWDemRF12UvkmmUoZ7j194=" + }, "@azure/msal-browser": { "version": "2.12.0", "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.12.0.tgz", @@ -2662,6 +2667,27 @@ "glob-to-regexp": "^0.3.0" } }, + "@ms-ofb/officebrowserfeedbacknpm": { + "version": "1.6.4", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/@ms-ofb/officebrowserfeedbacknpm/-/officebrowserfeedbacknpm-1.6.4.tgz", + "integrity": "sha1-9SbNL5scNhF+fBjWwTXWhZD5KH4=", + "requires": { + "@augloop/types-core": "2.16.189", + "@ms-ofb/officefloodgatecore": "*", + "es6-promise": "4.2.8", + "tslib": "^1.9.3", + "whatwg-fetch": "^3.0.0" + }, + "dependencies": { + "@ms-ofb/officefloodgatecore": { + "version": "0.0.0", + "bundled": true, + "requires": { + "es6-promise": "4.2.8" + } + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", @@ -6701,12 +6727,12 @@ "dependencies": { "array-unique": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "define-property": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" @@ -6714,7 +6740,7 @@ }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -10309,6 +10335,11 @@ "is-symbol": "^1.0.2" } }, + "es6-promise": { + "version": "4.2.8", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo=" + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -11368,7 +11399,7 @@ }, "fill-range": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { "extend-shallow": "^2.0.1", @@ -11379,7 +11410,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -14114,7 +14145,7 @@ }, "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "resolved": "https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "^3.0.2" @@ -15187,29 +15218,6 @@ "object.assign": "^4.1.0" } }, - "jszip": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz", - "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==", - "dev": true, - "requires": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" - }, - "dependencies": { - "lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, - "requires": { - "immediate": "~3.0.5" - } - } - } - }, "jwt-decode": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz", @@ -21100,37 +21108,6 @@ "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, - "selenium-webdriver": { - "version": "4.0.0-alpha.7", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.7.tgz", - "integrity": "sha512-D4qnTsyTr91jT8f7MfN+OwY0IlU5+5FmlO5xlgRUV6hDEV8JyYx2NerdTEqDDkNq7RZDYc4VoPALk8l578RBHw==", - "dev": true, - "requires": { - "jszip": "^3.2.2", - "rimraf": "^2.7.1", - "tmp": "0.0.30" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "tmp": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", - "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.1" - } - } - } - }, "selfsigned": { "version": "1.10.8", "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", @@ -21240,12 +21217,6 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", diff --git a/package.json b/package.json index 96b8ad7ab..d130cc9a2 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "@azure/msal-browser": "2.12.0", + "@augloop/types-core": "2.16.189", "@babel/core": "7.12.13", "@babel/eslint-parser": "7.12.13", "@microsoft/applicationinsights-react-js": "2.3.1", @@ -147,4 +148,4 @@ "tslint-react": "4.0.0", "yargs-parser": "13.1.2" } -} +} \ No newline at end of file