From b59aed1d5229d8e7d4a4c55e1c69f8ed7f8e78ed Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 26 Aug 2021 11:02:56 +0100 Subject: [PATCH 1/5] Create entry page for production deployment. --- .circleci/config.yml | 2 +- apps/remix-ide/ci/copy_resources.sh | 1 + apps/remix-ide/src/production.index.html | 117 +++++++++++++++++++++++ workspace.json | 3 +- 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 apps/remix-ide/src/production.index.html diff --git a/.circleci/config.yml b/.circleci/config.yml index 82aefbe54b..7fba3ed009 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -260,7 +260,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/production.index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: diff --git a/apps/remix-ide/ci/copy_resources.sh b/apps/remix-ide/ci/copy_resources.sh index ab0bf9ccb2..e104498f81 100755 --- a/apps/remix-ide/ci/copy_resources.sh +++ b/apps/remix-ide/ci/copy_resources.sh @@ -5,3 +5,4 @@ rm -rf temp_publish_docker mkdir temp_publish_docker cp -r $FILES_TO_PACKAGE temp_publish_docker ls +mv production.index.html index.html diff --git a/apps/remix-ide/src/production.index.html b/apps/remix-ide/src/production.index.html new file mode 100644 index 0000000000..d521139783 --- /dev/null +++ b/apps/remix-ide/src/production.index.html @@ -0,0 +1,117 @@ + + + + + + + + Remix - Ethereum IDE + + + + + + + + + + + + + + + + + diff --git a/workspace.json b/workspace.json index 9e5f1e4866..c4ac25c6b3 100644 --- a/workspace.json +++ b/workspace.json @@ -18,7 +18,8 @@ "assets": [ "apps/remix-ide/src/assets", "apps/remix-ide/src/index.html", - "apps/remix-ide/src/favicon.ico" + "apps/remix-ide/src/favicon.ico", + "apps/remix-ide/src/production.index.html" ], "styles": [], "scripts": [], From 0c5a382b86c1b1c486befe323fc3dfabebd8a2ed Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 26 Aug 2021 11:20:50 +0100 Subject: [PATCH 2/5] Provide full path --- apps/remix-ide/ci/copy_resources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/ci/copy_resources.sh b/apps/remix-ide/ci/copy_resources.sh index e104498f81..7bf297f4bf 100755 --- a/apps/remix-ide/ci/copy_resources.sh +++ b/apps/remix-ide/ci/copy_resources.sh @@ -5,4 +5,4 @@ rm -rf temp_publish_docker mkdir temp_publish_docker cp -r $FILES_TO_PACKAGE temp_publish_docker ls -mv production.index.html index.html +mv temp_publish_docker/production.index.html temp_publish_docker/index.html From 7ce723feb4beb42cab728490086e0716ecf754bb Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 26 Aug 2021 12:04:14 +0100 Subject: [PATCH 3/5] remove source maps --- apps/debugger/webpack.config.js | 1 - apps/remix-ide/webpack.config.js | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/debugger/webpack.config.js b/apps/debugger/webpack.config.js index 02143af15b..6629609cdf 100644 --- a/apps/debugger/webpack.config.js +++ b/apps/debugger/webpack.config.js @@ -19,7 +19,6 @@ module.exports = config => { return { ...webpackConfig, mode: 'production', - devtool: 'source-map', optimization: { minimize: true, minimizer: [new TerserPlugin()] diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js index 02143af15b..6629609cdf 100644 --- a/apps/remix-ide/webpack.config.js +++ b/apps/remix-ide/webpack.config.js @@ -19,7 +19,6 @@ module.exports = config => { return { ...webpackConfig, mode: 'production', - devtool: 'source-map', optimization: { minimize: true, minimizer: [new TerserPlugin()] From 044793e7bb2e2629e05107f82f242312e5f7a497 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 26 Aug 2021 12:39:03 +0100 Subject: [PATCH 4/5] Restore source maps --- apps/debugger/webpack.config.js | 1 + apps/remix-ide/webpack.config.js | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/debugger/webpack.config.js b/apps/debugger/webpack.config.js index 6629609cdf..02143af15b 100644 --- a/apps/debugger/webpack.config.js +++ b/apps/debugger/webpack.config.js @@ -19,6 +19,7 @@ module.exports = config => { return { ...webpackConfig, mode: 'production', + devtool: 'source-map', optimization: { minimize: true, minimizer: [new TerserPlugin()] diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js index 6629609cdf..02143af15b 100644 --- a/apps/remix-ide/webpack.config.js +++ b/apps/remix-ide/webpack.config.js @@ -19,6 +19,7 @@ module.exports = config => { return { ...webpackConfig, mode: 'production', + devtool: 'source-map', optimization: { minimize: true, minimizer: [new TerserPlugin()] From 42cbd8be4f141e1220076cbb2e48107cb684b506 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 26 Aug 2021 13:11:27 +0100 Subject: [PATCH 5/5] Update alpha beta and live deploy config --- .circleci/config.yml | 6 +++--- apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh | 1 + apps/remix-ide/ci/deploy_from_travis_remix-beta.sh | 1 + apps/remix-ide/ci/deploy_from_travis_remix-live.sh | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fba3ed009..a7cae9785e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -232,7 +232,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/production.index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -286,7 +286,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/production.index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -314,7 +314,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/production.index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh index 7f94dd65a5..93c82585ca 100755 --- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh +++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh @@ -14,6 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md cp -r $FILES_TO_PACKAGE "./" rm -rf dist ls +mv production.index.html index.html FILES_TO_DEPLOY="assets index.html main.js polyfills.js favicon.ico" # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_DEPLOY diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh index 750a340373..c128d3b400 100755 --- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh +++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh @@ -14,6 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md cp -r $FILES_TO_PACKAGE "./" rm -rf dist ls +mv production.index.html index.html FILES_TO_DEPLOY="assets index.html main.js polyfills.js favicon.ico" # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_DEPLOY diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh index ae6da39a5c..c99980d6d3 100755 --- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh +++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh @@ -13,6 +13,8 @@ echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ fo echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md cp -r $FILES_TO_PACKAGE "./" rm -rf dist +ls +mv production.index.html index.html FILES_TO_DEPLOY="assets index.html main.js polyfills.js" # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_DEPLOY