Skip to content

Commit

Permalink
merged master into f-self-exclusion
Browse files Browse the repository at this point in the history
  • Loading branch information
Panayot Tolev committed Nov 16, 2023
2 parents 1803439 + 73b9675 commit 8f12e1f
Show file tree
Hide file tree
Showing 10 changed files with 117,723 additions and 2,618 deletions.
1 change: 1 addition & 0 deletions .yarnrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@


yarn-path ".yarn/releases/yarn-1.22.19.js"
--ignore-engines true
7 changes: 4 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
},
"resolutions": {
"webpack": "4.46.0",
"ua-parser-js": "1.0.35"
"ua-parser-js": "1.0.35",
"typesafe-i18n": "5.16.3"
},
"devDependencies": {
"@babel/cli": "7.14.8",
Expand Down Expand Up @@ -89,8 +90,8 @@
"babel-jest": "26.1.0",
"babel-loader": "8.1.0",
"bundlewatch": "0.3.1",
"chromedriver": "119.0.1",
"core-js": "3.26.1",
"chromedriver": "118.0.1",
"core-js": "3.33.2",
"cross-env": "7.0.2",
"css-loader": "1.0.1",
"danger": "11.2.8",
Expand Down
185 changes: 185 additions & 0 deletions package.json.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
{
"name": "root",
"version": "7.54.2",
"private": true,
"scripts": {
"build": "cross-env-shell turbo run build --continue --token=${TURBO_TOKEN}",
"build:changed": "cross-env-shell turbo run build --filter=...[origin/master] --continue --token=${TURBO_TOKEN}",
"bundlewatch": "bundlewatch --config ./bundlewatch.config.js",
"lint": " cross-env-shell turbo run lint --continue --token=${TURBO_TOKEN}",
"lint:fix": "cross-env-shell turbo run lint -- --fix --continue --token=${TURBO_TOKEN}",
"lint:style": "cross-env-shell turbo run lint:style --continue --token=${TURBO_TOKEN}",
"prepublishOnly": "turbo run prepublishOnly --continue",
"release": "turbo publish --continue",
"storybook:build": "cross-env-shell turbo run storybook:build --continue --token=${TURBO_TOKEN}",
"storybook:build-changed": "cross-env-shell CHANGED_ONLY=true turbo run storybook:build --include-dependencies --continue --token=${TURBO_TOKEN}",
"storybook:serve": "turbo run storybook:serve --continue",
"storybook:serve-changed": "cross-env-shell CHANGED_ONLY=true turbo run storybook:serve --continue",
"storybook:serve-static": "turbo run storybook:serve-static --continue",
"storybook:deploy": "turbo run storybook:deploy --continue",
"test": "cross-env-shell turbo run test --continue --token=${TURBO_TOKEN}",
"ci:test:tools": "cross-env-shell turbo run ci:test:tools --continue --token=${TURBO_TOKEN}",
"ci:test:services": "cross-env-shell turbo run ci:test:services --continue --token=${TURBO_TOKEN}",
"ci:test:atoms": "cross-env-shell turbo run ci:test:atoms --continue --token=${TURBO_TOKEN}",
"ci:test:molecules": "cross-env-shell turbo run ci:test:molecules --continue --token=${TURBO_TOKEN}",
"ci:test:organisms": "cross-env-shell turbo run ci:test:organisms --continue --token=${TURBO_TOKEN}",
"ci:test:pages": "cross-env-shell turbo run ci:test:pages --continue --token=${TURBO_TOKEN}",
"ci:test:templates": "cross-env-shell turbo run ci:test:templates --continue --token=${TURBO_TOKEN}",
"ci:test-component:chrome:atoms": "cross-env-shell TEST_TYPE=component turbo run ci:test-component:chrome:atoms --continue --token=${TURBO_TOKEN}",
"ci:test:visual:atoms": "cross-env-shell TEST_TYPE=visual turbo run ci:test:visual:atoms --continue",
"ci:test-a11y:chrome:atoms": "cross-env-shell TEST_TYPE=a11y turbo run ci:test-a11y:chrome:atoms --continue --token=${TURBO_TOKEN}",
"ci:test-component:chrome:molecules": "cross-env-shell TEST_TYPE=component turbo run ci:test-component:chrome:molecules --continue --token=${TURBO_TOKEN}",
"ci:test:visual:molecules": "cross-env-shell TEST_TYPE=visual turbo run ci:test:visual:molecules --continue",
"ci:test-a11y:chrome:molecules": "cross-env-shell TEST_TYPE=a11y turbo run ci:test-a11y:chrome:molecules --continue --token=${TURBO_TOKEN}",
"ci:test-component:chrome:organisms": "cross-env-shell TEST_TYPE=component turbo run ci:test-component:chrome:organisms --continue --token=${TURBO_TOKEN}",
"ci:test:visual:organisms": "cross-env-shell TEST_TYPE=visual turbo run ci:test:visual:organisms --continue",
"ci:test-a11y:chrome:organisms": "cross-env-shell TEST_TYPE=a11y turbo run ci:test-a11y:chrome:organisms --continue --token=${TURBO_TOKEN}",
"ci:test-component:chrome:pages": "cross-env-shell TEST_TYPE=component turbo run ci:test-component:chrome:pages --continue --token=${TURBO_TOKEN}",
"ci:test:visual:pages": "cross-env-shell TEST_TYPE=visual turbo run ci:test:visual:pages --continue",
"ci:test-a11y:chrome:pages": "cross-env-shell TEST_TYPE=a11y turbo run ci:test-a11y:chrome:pages --continue --token=${TURBO_TOKEN}",
"test-component:chrome": "cross-env-shell TEST_TYPE=component turbo run test-component:chrome --continue --token=${TURBO_TOKEN}",
"test:visual": "cross-env-shell TEST_TYPE=visual turbo run test:visual --continue",
"test-a11y:chrome": "cross-env-shell TEST_TYPE=a11y turbo run test-a11y:chrome --continue --token=${TURBO_TOKEN}",
"test:consumer": "turbo run test:consumer",
"test:wait-for-server": "node ./test/infrastructure/healthcheck.js",
"allure:generate": "allure generate ./test/results/allure-results --clean && yarn allure:clean",
"allure:open": "yarn allure:generate && yarn allure open",
"allure:clean": "rimraf test/results/allure-results",
"prepare": "husky install"
},
"resolutions": {
"webpack": "4.46.0",
"ua-parser-js": "1.0.35",
"typesafe-i18n": "5.16.3"
},
"devDependencies": {
"@babel/cli": "7.14.8",
"@babel/core": "7.14.8",
"@babel/eslint-parser": "7.16.5",
"@babel/plugin-proposal-class-properties": "7.14.5",
"@babel/plugin-proposal-optional-chaining": "7.14.5",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.9",
"@babel/register": "7.14.5",
"@faker-js/faker": "7.5.0",
"@justeat/browserslist-config-fozzie": "1.2.0",
"@justeat/eslint-config-fozzie": "5.4.0",
"@justeat/fozzie": "11.x",
"@justeat/pie-design-tokens": "5.0.0",
"@justeat/stylelint-config-fozzie": "2.2.0",
"@percy/cli": "1.0.5",
"@percy/webdriverio": "2.0.1",
"@vercel/ncc": "0.31.1",
"@vue/babel-preset-app": "4.5.16",
"@vue/cli-plugin-babel": "4.5.16",
"@vue/cli-plugin-unit-jest": "4.5.16",
"@vue/cli-service": "4.5.16",
"@vue/eslint-config-standard": "4.0.0",
"@vue/test-utils": "1.3.0",
"@wdio/allure-reporter": "7.19.7",
"@wdio/cli": "7.19.7",
"@wdio/local-runner": "7.19.7",
"@wdio/mocha-framework": "7.19.7",
"@wdio/spec-reporter": "7.19.7",
"allure-commandline": "2.17.2",
"axe-core": "4.3.5",
"axe-reports": "1.1.11",
"axios": "0.21.4",
"axios-mock-adapter": "1.19.0",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "26.1.0",
"babel-loader": "8.1.0",
"bundlewatch": "0.3.1",
<<<<<<< HEAD
"chromedriver": "119.0.1",
"core-js": "3.26.1",
=======
"chromedriver": "118.0.1",
"core-js": "3.33.2",
>>>>>>> origin/master
"cross-env": "7.0.2",
"css-loader": "1.0.1",
"danger": "11.2.8",
"eslint": "8.26.0",
"eslint-import-resolver-webpack": "0.13.2",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-json-schema-validator": "1.0.48",
"eslint-plugin-jsonc": "1.3.1",
"eslint-plugin-vue": "8.7.1",
"eslint-plugin-vuejs-accessibility": "1.1.1",
"eslint-plugin-webdriverio": "1.0.1",
"eyeglass": "3.0.2",
"flush-promises": "1.0.2",
"husky": "6.0.0",
"include-media": "1.4.9",
"jest-extended": "0.11.5",
"js-cookie": "2.2.1",
"lerna": "3.22.1",
"miragejs": "0.1.42",
"mocha-each": "2.0.1",
"mocha-tags": "1.0.1",
"npm-run-all": "4.1.5",
"peer-deps-externals-webpack-plugin": "1.0.4",
"postcss-loader": "3.0.0",
"sass": "1.53.0",
"sass-loader": "10.1.0",
"stylelint": "13.7.2",
"stylelint-scss": "3.18.0",
"turbo": "1.6.0",
"vite": "2.9.16",
"vue": "2.6.10",
"vue-router": "3.5.2",
"vue-svg-loader": "0.16.0",
"vue-template-compiler": "2.6.10",
"vuex": "3.5.1",
"wdio-chromedriver-service": "8.0.0",
"wdio-video-reporter": "3.2.1",
"webdriverio": "7.19.7"
},
"bugs": {
"url": "https://github.com/justeat/fozzie-components/issues"
},
"contributors": [
"Github contributors <https://github.com/justeat/fozzie-components/graphs/contributors>"
],
"engines": {
"node": "^12 || ^14 || ^16"
},
"homepage": "https://github.com/justeat/fozzie-components",
"keywords": [
"fozzie"
],
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "[email protected]:justeat/fozzie-components.git"
},
"stylelint": {
"extends": "@justeat/stylelint-config-fozzie"
},
"workspaces": {
"packages": [
"packages/*",
"packages/components/atoms/*",
"packages/components/molecules/*",
"packages/components/organisms/*",
"packages/components/templates/*",
"packages/components/pages/*",
"packages/services/*",
"packages/tools/*"
],
"nohoist": [
"**/@justeat/fozzie/**"
]
},
"dependencies": {
"deepmerge": "4.2.2"
},
"publishConfig": {
"access": "public"
},
"volta": {
"node": "16.19.1",
"yarn": "1.22.19"
}
}
7 changes: 7 additions & 0 deletions packages/tools/fozzie/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ Future Todo List
------------------------------
- Make typography and utility classes silent extenders (so that they can be extended by components without importing all utility classes).

v11.0.2
------------------------------
*November 8, 2023*

### Changed
- `include-media` reference to released 2.0.0 version.


v11.0.1
------------------------------
Expand Down
12 changes: 6 additions & 6 deletions packages/tools/fozzie/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "@justeat/fozzie",
"title": "Fozzie – Just Eat UI Web Framework",
"description": "UI Web Framework for the Just Eat Global Platform",
"version": "11.0.1",
"version": "11.0.2",
"main": "dist/js/index.js",
"files": [
"dist/js",
"dist/css",
"src/scss",
"src/fonts"
],
"homepage": "https://github.com/justeat/fozzie",
"homepage": "https://github.com/justeattakeaway/fozzie-components/tree/master/packages/tools/fozzie",
"contributors": [
"Ashley Watson-Nolan <[email protected]> (https://ashleynolan.co.uk)",
"Jamie Maguire <[email protected]> (https://www.jamieomaguire.com)",
Expand All @@ -19,23 +19,23 @@
"authors": [
{
"name": "Contributors",
"url": "https://github.com/justeat/fozzie/graphs/contributors"
"url": "https://github.com/justeattakeaway/fozzie-components/graphs/contributors"
}
],
"repository": {
"type": "git",
"url": "[email protected]:justeat/fozzie.git"
"url": "[email protected]:justeattakeaway/fozzie-components.git"
},
"bugs": {
"url": "https://github.com/justeat/fozzie/issues"
"url": "https://github.com/justeattakeaway/fozzie-components/issues"
},
"license": "Apache-2.0",
"engines": {
"node": "^12 || ^14 || ^16"
},
"dependencies": {
"@justeat/pie-design-tokens": "5.0.0",
"include-media": "eduardoboucas/include-media#2.0-release"
"include-media": "2.0.0"
},
"devDependencies": {
"@babel/cli": "7.18.10",
Expand Down
Loading

0 comments on commit 8f12e1f

Please sign in to comment.