Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add initial support for new env handling #10525

Merged
merged 41 commits into from Mar 26, 2020
Merged

Add initial support for new env handling #10525

merged 41 commits into from Mar 26, 2020

Commits on Feb 13, 2020

  1. Add initial support for new env config file

    @ijjk
    ijjk committed Feb 13, 2020
    Copy the full SHA
    fb4c0de View commit details
    Browse the repository at this point in the history

  2. Fix serverless processEnv call when no env is provided

    @ijjk
    ijjk committed Feb 13, 2020
    Copy the full SHA
    f369d2d View commit details
    Browse the repository at this point in the history

  3. Add missing await for test method

    @ijjk
    ijjk committed Feb 13, 2020
    Copy the full SHA
    f12ac4c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 13, 2020
    Copy the full SHA
    3e3878a View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 14, 2020
    Copy the full SHA
    455dc35 View commit details
    Browse the repository at this point in the history

  2. Update env config to .env.json and add dotenv loading

    @ijjk
    ijjk committed Feb 14, 2020
    Copy the full SHA
    f0d817a View commit details
    Browse the repository at this point in the history

  3. ncc dotenv package

    @ijjk
    ijjk committed Feb 14, 2020
    Copy the full SHA
    97f7e56 View commit details
    Browse the repository at this point in the history

  4. Update type

    @ijjk
    ijjk committed Feb 14, 2020
    Copy the full SHA
    444c401 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 17, 2020
    Copy the full SHA
    8ee3eab View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 20, 2020
    Copy the full SHA
    e5b4ee0 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. Update with new discussed behavior removing .env.json

    @ijjk
    ijjk committed Feb 21, 2020
    Copy the full SHA
    31953f7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 21, 2020
    Copy the full SHA
    30f1a52 View commit details
    Browse the repository at this point in the history

  3. Update hot-reloader createEntrypoints

    @ijjk
    ijjk committed Feb 21, 2020
    Copy the full SHA
    266d095 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. Make sure .env is loaded before next.config.js

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    9a6cd9e View commit details
    Browse the repository at this point in the history

  2. Add tests for all separate .env files

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    66bf869 View commit details
    Browse the repository at this point in the history

  3. Remove comments

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    78cb909 View commit details
    Browse the repository at this point in the history

  4. Add override tests

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    cfb627e View commit details
    Browse the repository at this point in the history

  5. Add test for overriding env vars based on local environment

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    1c1b604 View commit details
    Browse the repository at this point in the history

  6. Add support for .env.test

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    25cf95c View commit details
    Browse the repository at this point in the history

  7. Apply suggestions from code review 

    Co-Authored-By: Joe Haddad <joe.haddad@zeit.co>
    @ijjk @Timer
    ijjk and Timer committed Feb 24, 2020
    Copy the full SHA
    6929e28 View commit details
    Browse the repository at this point in the history

  8. Use chalk for env loaded message

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    e2f1877 View commit details
    Browse the repository at this point in the history

  9. Remove constant as it’s not needed

    @timneutkens
    timneutkens committed Feb 24, 2020
    Copy the full SHA
    d28de35 View commit details
    Browse the repository at this point in the history

  10. Update test

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    ac16529 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'add/new-env' of github.com:ijjk/next.js into add/new-env

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    129801e View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    5a1580a View commit details
    Browse the repository at this point in the history

  13. Update errsh, taskr, and CNA template ignores

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    a0c709a View commit details
    Browse the repository at this point in the history

  14. Make sure to only consider undefined missing

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    f7a0030 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    ab97e46 View commit details
    Browse the repository at this point in the history

  16. Remove old .env ignore

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    e9401b3 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'canary' into add/new-env

    @ijjk
    ijjk committed Feb 24, 2020
    Copy the full SHA
    cd0452d View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 25, 2020
    Copy the full SHA
    bdd50e3 View commit details
    Browse the repository at this point in the history

  2. Update to not populate process.env with loaded env

    @ijjk
    ijjk committed Feb 25, 2020
    Copy the full SHA
    69340a3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'add/new-env' of github.com:ijjk/next.js into add/new-env

    @ijjk
    ijjk committed Feb 25, 2020
    Copy the full SHA
    dea3ac5 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Feb 27, 2020
    Copy the full SHA
    0b67f2f View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env 

    # Conflicts:
#	packages/next/next-server/server/load-components.ts
#	packages/next/next-server/server/render.tsx
    @ijjk
    ijjk committed Feb 28, 2020
    Copy the full SHA
    350a451 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env 

    # Conflicts:
#	packages/next/next-server/server/next-server.ts
#	packages/next/next-server/server/render.tsx
    @ijjk
    ijjk committed Mar 3, 2020
    Copy the full SHA
    9d086c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env 

    # Conflicts:
#	packages/next/next-server/server/render.tsx
#	packages/next/types/index.d.ts
    @ijjk
    ijjk committed Mar 5, 2020
    Copy the full SHA
    2eb53f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Mar 20, 2020
    Copy the full SHA
    b2dee6e View commit details
    Browse the repository at this point in the history

  2. Add experimental flag and add loading of global env values

    @ijjk
    ijjk committed Mar 20, 2020
    Copy the full SHA
    1eb2d2b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/canary' into add/new-env

    @ijjk
    ijjk committed Mar 20, 2020
    Copy the full SHA
    4bceac7 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Merge branch 'canary' of github.com:zeit/next.js into ijjk-add/new-env 

    # Conflicts:
#	packages/next/next-server/server/render.tsx
    @timneutkens
    timneutkens committed Mar 26, 2020
    Copy the full SHA
    67cf471 View commit details
    Browse the repository at this point in the history