520 Commits

Author SHA1 Message Date
igor-dv
25d16d1139 Merge remote-tracking branch 'origin/master' into cli/angular-cli-v7-test-2
# Conflicts:
#	examples/angular-cli/package.json
2018-10-24 02:07:52 +03:00
dependabot[bot]
182bccc86c
Bump @types/jest from 23.3.5 to 23.3.7 (#4510) 2018-10-23 22:36:48 +00:00
Michael Shilman
284fb1b4c2 v4.0.0-rc.3 2018-10-24 00:18:05 +08:00
igor-dv
a78ea9fa10 Bump angular deps 2018-10-23 14:21:09 +03:00
Michael Shilman
8fb0caa37e v4.0.0-rc.2 2018-10-22 21:39:03 +08:00
Michael Shilman
46d89b3e61 v4.0.0-rc.1 2018-10-18 09:54:01 +08:00
dependabot[bot]
a303e15b2d
Bump @types/node from 10.11.7 to 10.12.0
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped) from 10.11.7 to 10.12.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-16 05:40:53 +00:00
Michael Shilman
76b3c817a1 v4.0.0-rc.0 2018-10-15 23:39:49 +08:00
Michael Shilman
155afad695 v4.0.0-alpha.25 2018-10-13 17:36:43 +08:00
Hypnosphi
be532db015 Run yarn upgrade-interactive --latest in root and docs
To reduce dependabot PRs number
2018-10-13 02:31:34 +02:00
dependabot[bot]
dc0431ef4c
Bump @angular/cli from 6.2.4 to 6.2.5
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v6.2.4...v6.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-12 19:39:28 +00:00
Kai Röder
d4dae06c36 Removed types because they break storybook build and need to be updated 2018-10-11 08:49:44 +02:00
Norbert de Langen
faa0e2b68f
ADD missing type definitions 2018-10-10 23:37:36 +02:00
Norbert de Langen
41483e2160
UPGRADES 2018-10-10 22:23:35 +02:00
igor-dv
113bdb8e95 Change .storybook/tsconfig.json to extend the src/tsconfig.json 2018-10-09 15:24:36 +03:00
igor-dv
18daee8a99 Mock environments/environment in jest (it's a workaround) 2018-10-09 15:09:43 +03:00
igor-dv
ffee031c0e Merge remote-tracking branch 'origin/angular/support-base-url' into support-base-url
# Conflicts:
#	app/angular/package.json
#	yarn.lock
2018-10-09 02:33:29 +03:00
Kai Röder
7d36825036 Merge remote-tracking branch 'upstream/angular/support-base-url' into support-base-url 2018-10-08 23:58:37 +02:00
Kai Röder
9260fe4552 Added basePath support 2018-10-08 23:39:45 +02:00
Michael Shilman
bdc8120ab9 v4.0.0-alpha.24 2018-10-04 01:24:20 -07:00
Michael Shilman
2ca9c34c4c v4.0.0-alpha.23 2018-09-25 15:40:49 -07:00
Kai Röder
f969f3c57a Merge branch 'master' into angular-build-time-optimization 2018-09-20 14:41:56 +02:00
Michael Shilman
5112b52004 v4.0.0-alpha.22 2018-09-19 14:00:53 -07:00
Kai Röder
9e3af7961c Merge branch 'master' into angular-build-time-optimization 2018-09-18 17:52:03 +02:00
igor-dv
6bfbb5bb7b Revert testMatch from angular-cli 2018-09-18 16:42:36 +03:00
igor-dv
7ddae80cab Try to fix angular-cli on netlify again 2018-09-18 16:34:08 +03:00
igor-dv
ccd1de0035 Try to fix angular-cli build on netlify 2018-09-18 15:41:29 +03:00
Kai Röder
8a4eeff049 Removed @types/jasmine and @types/jasminewd2 to resolve a type collision with @types/jest 2018-09-18 11:17:36 +02:00
Kai Röder
4b39d0d5dd reverted storybook angular-cli example start script 2018-09-18 10:45:11 +02:00
Kai Röder
b4995424f7 Merge branch 'master' into angular-build-time-optimization 2018-09-18 10:44:32 +02:00
igor-dv
abf3c3c045 Mock addon-jest.testresults.json for storyshots 2018-09-17 18:57:15 +03:00
igor-dv
665ef8448d Add "addon-jest.testresults.json" to .gitignore 2018-09-17 17:59:05 +03:00
igor-dv
000186fd3c Delete "addon-jest.testresults.json" 2018-09-17 17:49:49 +03:00
igor-dv
ccb409166d Fix "addon-jest.testresults.json" generation 2018-09-17 17:44:32 +03:00
Kai Röder
8d7a867a92 Merge branch 'master' into angular-build-time-optimization 2018-09-16 12:30:51 +02:00
Michael Shilman
729607334c v4.0.0-alpha.21 2018-09-07 10:17:06 -07:00
Michael Shilman
620dc75db0 v4.0.0-alpha.20 2018-08-31 15:58:57 -07:00
Michael Shilman
caaf1aa090 v4.0.0-alpha.19 2018-08-31 14:46:16 -07:00
Norbert de Langen
6ecde1b82d
Merge branch 'master' into tech/upgrades4
# Conflicts:
#	lib/cli/test/snapshots/react_static_next/package.json
#	package.json
#	yarn.lock
2018-08-31 14:39:44 +02:00
igor-dv
c92273cb18 Add an example of global scss file + stylePreprocessorOptions option 2018-08-28 19:43:44 +03:00
Norbert de Langen
00bead99ed
UPGRADE dependencies 2018-08-27 09:11:56 +02:00
Michael Shilman
324da43c22 v4.0.0-alpha.18 2018-08-25 13:57:15 -07:00
Michael Shilman
3a470c6ea8 v4.0.0-alpha.17 2018-08-24 11:40:14 -07:00
igor-dv
04f6ef84ba Fix jest-ts-babel.js 2018-08-15 17:26:24 +03:00
Norbert de Langen
1209703ec4
REVERT changes to angular require-context (BROKEN) 2018-08-15 15:31:54 +02:00
Norbert de Langen
850b08391c
FIX angular example with a hack? 2018-08-15 11:51:16 +02:00
Norbert de Langen
e6c055cc4e
FIX snapshots 2018-08-15 02:18:11 +02:00
Norbert de Langen
a039c96426
Merge branch 'master' into babel-7
# Conflicts:
#	MIGRATION.md
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
#	examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
#	examples/polymer-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	jest.config.js
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/codemod/package.json
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/core/src/server/config/webpack.config.prod.js
#	package.json
#	yarn.lock
2018-08-15 00:01:36 +02:00
Michael Shilman
52f0bc687a v4.0.0-alpha.16 2018-08-06 22:25:51 +08:00
Norbert de Langen
1d67415ff3
FIX ts files linting after upgrade 2018-08-05 20:36:28 +02:00