diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c76c69bd5..718bd4e027 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,11 +34,11 @@ jobs: - restore_cache: name: Restore pnpm-lock.yaml keys: - - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-2 + - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-3 - run: {name: 'Install packages', command: 'node common/scripts/install-run-rush.js install'} - save_cache: name: Save NPM cache - key: root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-2 + key: root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-3 paths: - common - packages/assets/node_modules @@ -56,7 +56,7 @@ jobs: - restore_cache: name: Restore NPM Cache keys: - - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-2 + - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-3 - run: { name: 'Build', command: 'cd packages/patternlab/styleguide && node ../../../common/scripts/install-run-rushx.js build'} - persist_to_workspace: root: ~/code @@ -274,12 +274,12 @@ jobs: - *no_host_check - restore_cache: keys: - - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-2 - - run: sudo npm install -g pnpm @microsoft/rush + - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-3 + - run: sudo npm install -g js-yaml@3.13.1 @octokit/rest semver@6.3.0 shelljs@0.8.3 simple-git@1.126.0 # Identify the committer i.e. CircleCI deployment bot - run: git config --global user.email "circleci@example.com" - run: git config --global user.name "CircleCI Deployment Bot" - - run: node common/scripts/install-run-rushx.js release-branch + - run: export NODE_PATH=$(npm root --quiet -g) && node scripts/release-branch.js github_tag: <<: *patternlab_defaults @@ -288,12 +288,12 @@ jobs: - *no_host_check - restore_cache: keys: - - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-2 - - run: sudo npm install -g pnpm @microsoft/rush + - root-npm-v4-{{ checksum "common/config/rush/pnpm-lock.yaml" }}-3 + - run: sudo npm install -g js-yaml@3.13.1 @octokit/rest semver@6.3.0 shelljs@0.8.3 simple-git@1.126.0 # Identify the committer i.e. CircleCI deployment bot - run: git config --global user.email "circleci@example.com" - run: git config --global user.name "CircleCI Deployment Bot" - - run: node common/scripts/install-run-rushx.js release-tag + - run: export NODE_PATH=$(npm root --quiet -g) && node scripts/release-tag.js assets_build: @@ -410,7 +410,7 @@ workflows: requires: [build] triggers: - schedule: - cron: "10 20 * * 1" + cron: "45 14 * * 2" filters: branches: only: diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 17f2e9bca9..8839aa2497 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -10,10 +10,8 @@ dependencies: '@babel/plugin-transform-runtime': 7.11.5_@babel+core@7.11.6 '@babel/preset-env': 7.11.5_@babel+core@7.11.6 '@babel/preset-react': 7.10.4_@babel+core@7.11.6 - '@octokit/rest': 16.43.2 '@proscom/gulp-svgr': 0.1.3 '@rush-temp/mayflower': 'file:projects/mayflower.tgz' - '@rush-temp/mayflower-1': 'file:projects/mayflower-1.tgz' '@rush-temp/mayflower-assets': 'file:projects/mayflower-assets.tgz' '@rush-temp/mayflower-react': 'file:projects/mayflower-react.tgz' '@rush-temp/mayflower-site': 'file:projects/mayflower-site.tgz_jquery@3.5.1+webpack@4.44.2' @@ -97,7 +95,6 @@ dependencies: handlebars: 4.7.6 is: 3.3.0 jquery: 3.5.1 - js-yaml: 3.14.0 jscodeshift: 0.10.0_@babel+preset-env@7.11.5 lazypipe: 1.0.2 markdown-it: 10.0.0 @@ -124,10 +121,7 @@ dependencies: react-virtualized: 9.22.2_react-dom@16.13.1+react@16.13.1 resolve-url-loader: 3.1.1 sass-loader: 8.0.2_webpack@4.44.2 - semver: 6.3.0 - shelljs: 0.8.4 shortid: 2.2.15 - simple-git: 1.132.0 smoothscroll-polyfill: 0.4.4 style-loader: 1.2.1_webpack@4.44.2 stylelint: 13.7.1 @@ -2392,101 +2386,6 @@ packages: node: '>=10' resolution: integrity: sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== - /@octokit/auth-token/2.4.2: - dependencies: - '@octokit/types': 5.5.0 - dev: false - resolution: - integrity: sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ== - /@octokit/endpoint/6.0.8: - dependencies: - '@octokit/types': 5.5.0 - is-plain-object: 5.0.0 - universal-user-agent: 6.0.0 - dev: false - resolution: - integrity: sha512-MuRrgv+bM4Q+e9uEvxAB/Kf+Sj0O2JAOBA131uo1o6lgdq1iS8ejKwtqHgdfY91V3rN9R/hdGKFiQYMzVzVBEQ== - /@octokit/plugin-paginate-rest/1.1.2: - dependencies: - '@octokit/types': 2.16.2 - dev: false - resolution: - integrity: sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q== - /@octokit/plugin-request-log/1.0.2: - dev: false - peerDependencies: - '@octokit/core': '>=3' - resolution: - integrity: sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg== - /@octokit/plugin-rest-endpoint-methods/2.4.0: - dependencies: - '@octokit/types': 2.16.2 - deprecation: 2.3.1 - dev: false - resolution: - integrity: sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ== - /@octokit/request-error/1.2.1: - dependencies: - '@octokit/types': 2.16.2 - deprecation: 2.3.1 - once: 1.4.0 - dev: false - resolution: - integrity: sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA== - /@octokit/request-error/2.0.2: - dependencies: - '@octokit/types': 5.5.0 - deprecation: 2.3.1 - once: 1.4.0 - dev: false - resolution: - integrity: sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw== - /@octokit/request/5.4.9: - dependencies: - '@octokit/endpoint': 6.0.8 - '@octokit/request-error': 2.0.2 - '@octokit/types': 5.5.0 - deprecation: 2.3.1 - is-plain-object: 5.0.0 - node-fetch: 2.6.1 - once: 1.4.0 - universal-user-agent: 6.0.0 - dev: false - resolution: - integrity: sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA== - /@octokit/rest/16.43.2: - dependencies: - '@octokit/auth-token': 2.4.2 - '@octokit/plugin-paginate-rest': 1.1.2 - '@octokit/plugin-request-log': 1.0.2 - '@octokit/plugin-rest-endpoint-methods': 2.4.0 - '@octokit/request': 5.4.9 - '@octokit/request-error': 1.2.1 - atob-lite: 2.0.0 - before-after-hook: 2.1.0 - btoa-lite: 1.0.0 - deprecation: 2.3.1 - lodash.get: 4.4.2 - lodash.set: 4.3.2 - lodash.uniq: 4.5.0 - octokit-pagination-methods: 1.1.0 - once: 1.4.0 - universal-user-agent: 4.0.1 - dev: false - resolution: - integrity: sha512-ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ== - /@octokit/types/2.16.2: - dependencies: - '@types/node': 14.11.1 - dev: false - resolution: - integrity: sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q== - /@octokit/types/5.5.0: - dependencies: - '@types/node': 14.11.1 - dev: false - resolution: - integrity: sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ== /@pieh/friendly-errors-webpack-plugin/1.7.0-chalk-2_webpack@4.44.2: dependencies: chalk: 2.4.2 @@ -5241,10 +5140,6 @@ packages: node: '>= 4.0.0' resolution: integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - /atob-lite/2.0.0: - dev: false - resolution: - integrity: sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= /atob/2.1.2: dev: false engines: @@ -6354,10 +6249,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak= - /before-after-hook/2.1.0: - dev: false - resolution: - integrity: sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== /better-assert/1.0.2: dependencies: callsite: 1.0.0 @@ -6877,10 +6768,6 @@ packages: dev: false resolution: integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== - /btoa-lite/1.0.0: - dev: false - resolution: - integrity: sha1-M3dm2hWAEhD92VbCLpxokaudAzc= /buble-jsx-only/0.19.8: dependencies: acorn: 6.4.1 @@ -8971,10 +8858,6 @@ packages: node: '>= 0.6' resolution: integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - /deprecation/2.3.1: - dev: false - resolution: - integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== /deps-sort/2.0.1: dependencies: JSONStream: 1.3.5 @@ -14725,12 +14608,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg== - /is-plain-object/5.0.0: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== /is-png/2.0.0: dev: false engines: @@ -15912,10 +15789,6 @@ packages: dev: false resolution: integrity: sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= - /lodash.get/4.4.2: - dev: false - resolution: - integrity: sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= /lodash.isarguments/3.1.0: dev: false resolution: @@ -15960,10 +15833,6 @@ packages: dev: false resolution: integrity: sha1-XkKRsMdT+hq+sKq4+ynfG2bwf20= - /lodash.set/4.3.2: - dev: false - resolution: - integrity: sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= /lodash.sortby/4.7.0: dev: false resolution: @@ -16187,12 +16056,6 @@ packages: dev: false resolution: integrity: sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM= - /macos-release/2.4.1: - dev: false - engines: - node: '>=6' - resolution: - integrity: sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg== /magic-string/0.25.7: dependencies: sourcemap-codec: 1.4.8 @@ -17556,10 +17419,6 @@ packages: dev: false resolution: integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - /octokit-pagination-methods/1.1.0: - dev: false - resolution: - integrity: sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== /omggif/1.0.10: dev: false resolution: @@ -17737,15 +17596,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - /os-name/3.1.0: - dependencies: - macos-release: 2.4.1 - windows-release: 3.3.3 - dev: false - engines: - node: '>=6' - resolution: - integrity: sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== /os-tmpdir/1.0.2: dev: false engines: @@ -21807,12 +21657,6 @@ packages: dev: false resolution: integrity: sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== - /simple-git/1.132.0: - dependencies: - debug: 4.2.0 - dev: false - resolution: - integrity: sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg== /simple-swizzle/0.2.2: dependencies: is-arrayish: 0.3.2 @@ -24004,16 +23848,6 @@ packages: dev: false resolution: integrity: sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== - /universal-user-agent/4.0.1: - dependencies: - os-name: 3.1.0 - dev: false - resolution: - integrity: sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg== - /universal-user-agent/6.0.0: - dev: false - resolution: - integrity: sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w== /universalify/0.1.2: dev: false engines: @@ -24835,14 +24669,6 @@ packages: node: '>=8' resolution: integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - /windows-release/3.3.3: - dependencies: - execa: 1.0.0 - dev: false - engines: - node: '>=6' - resolution: - integrity: sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg== /with-open-file/0.1.7: dependencies: p-finally: 1.0.0 @@ -25348,19 +25174,6 @@ packages: dev: false resolution: integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== - 'file:projects/mayflower-1.tgz': - dependencies: - '@octokit/rest': 16.43.2 - js-yaml: 3.14.0 - semver: 6.3.0 - shelljs: 0.8.4 - simple-git: 1.132.0 - dev: false - name: '@rush-temp/mayflower-1' - resolution: - integrity: sha512-p908IlqCdhZQGvB3oX4/AhgKSGkqlXiwz/lldJ+Ec8dTJAs6Gqau8MkRubaHDD3L5aDsmMpntX0HLzgb5IFMVg== - tarball: 'file:projects/mayflower-1.tgz' - version: 0.0.0 'file:projects/mayflower-assets.tgz': dependencies: sass: 1.26.11 @@ -25596,10 +25409,8 @@ specifiers: '@babel/plugin-transform-runtime': ^7.10.1 '@babel/preset-env': ^7.10.1 '@babel/preset-react': ^7.10.1 - '@octokit/rest': ^16.35.0 '@proscom/gulp-svgr': ^0.1.3 '@rush-temp/mayflower': 'file:./projects/mayflower.tgz' - '@rush-temp/mayflower-1': 'file:./projects/mayflower-1.tgz' '@rush-temp/mayflower-assets': 'file:./projects/mayflower-assets.tgz' '@rush-temp/mayflower-react': 'file:./projects/mayflower-react.tgz' '@rush-temp/mayflower-site': 'file:./projects/mayflower-site.tgz' @@ -25683,7 +25494,6 @@ specifiers: handlebars: ^4.7.6 is: ^3.3.0 jquery: ^3.5.1 - js-yaml: ^3.13.1 jscodeshift: ^0.10.0 lazypipe: ^1.0.1 markdown-it: ^10.0.0 @@ -25710,10 +25520,7 @@ specifiers: react-virtualized: ~9.22.2 resolve-url-loader: ^3.1.1 sass-loader: ^8.0.2 - semver: ^6.3.0 - shelljs: ^0.8.3 shortid: ^2.2.8 - simple-git: ^1.126.0 smoothscroll-polyfill: ^0.4.4 style-loader: ^1.2.1 stylelint: ^13.3.3 diff --git a/package.json b/package.json deleted file mode 100644 index 7d392b38b2..0000000000 --- a/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "mayflower", - "version": "1.0.0", - "repository": "https://github.com/massgov/mayflower.git", - "license": "GPL-2.0-only", - "private": true, - "devDependencies": { - "js-yaml": "^3.13.1", - "@octokit/rest": "^16.35.0", - "semver": "^6.3.0", - "shelljs": "^0.8.3", - "simple-git": "^1.126.0", - "@octokit/rest": "^16.35.0" - }, - "scripts": { - "release-branch": "node scripts/release-branch.js", - "release-tag": "node scripts/release-tag.js" - } -} diff --git a/rush.json b/rush.json index 2115e2ad3d..e9f8eb0859 100644 --- a/rush.json +++ b/rush.json @@ -392,12 +392,7 @@ { "packageName": "mayflower-site", "projectFolder": "packages/site" - }, - { - "packageName": "mayflower", - "projectFolder": "." } - // { // /** // * The NPM package name of the project (must match package.json)